[Libreoffice-commits] core.git: setup_native/source

[skswales]

 setup_native/source/win32/customactions/sellang/sellang.cxx  |    8 +++---
 setup_native/source/win32/customactions/sellang/sorttree.cxx |   14 +++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 68502698d29e577a7a451f1a796677128901cfe3
Author: skswales <stuart.swales.croftnuisk at gmail.com>
Date:   Thu May 19 15:18:36 2016 +0100

    Work towards tdf#72606 EasyHack _tstring/TCHAR elimination
    
    win32/customactions/sellang use A/W suffixed functions as appropriate
    
    Change-Id: Ic609a6dfb8033585cd2043a77985578abfdae893
    Reviewed-on: https://gerrit.libreoffice.org/25167
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index e72fe09..4f2827d 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -37,15 +37,15 @@
 
 #include "spellchecker_selection.hxx"
 
-BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
+BOOL GetMsiPropA( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
 {
     DWORD sz = 0;
-    if ( MsiGetProperty( hMSI, pPropName, const_cast<char *>(""), &sz ) == ERROR_MORE_DATA ) {
+    if ( MsiGetPropertyA( hMSI, pPropName, const_cast<char *>(""), &sz ) == ERROR_MORE_DATA ) {
         sz++;
         DWORD nbytes = sz * sizeof( char );
         char* buff = reinterpret_cast<char*>( malloc( nbytes ) );
         ZeroMemory( buff, nbytes );
-        MsiGetProperty( hMSI, pPropName, buff, &sz );
+        MsiGetPropertyA( hMSI, pPropName, buff, &sz );
         *ppValue = buff;
         return ( strlen(buff) > 0 );
     }
@@ -309,7 +309,7 @@ extern "C" UINT __stdcall SelectLanguage( MSIHANDLE handle )
      * requested with the UI_LANGS property, or all available on the system:
      */
     char* pVal = NULL;
-    if ( (GetMsiProp( handle, "UI_LANGS", &pVal )) && pVal ) {
+    if ( (GetMsiPropA( handle, "UI_LANGS", &pVal )) && pVal ) {
         char *str_ptr;
         str_ptr = strtok(pVal, ",");
         for(; str_ptr != NULL ;) {
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx b/setup_native/source/win32/customactions/sellang/sorttree.cxx
index 6781036..68bbb35 100644
--- a/setup_native/source/win32/customactions/sellang/sorttree.cxx
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -22,35 +22,35 @@ extern "C" UINT __stdcall SortTree(MSIHANDLE)
 {
     // Sort items (languages) in SelectionTree control, fdo#46355
 
-    HWND hwndMSI = FindWindow(TEXT("MsiDialogCloseClass"), NULL);
+    HWND hwndMSI = FindWindowW(L"MsiDialogCloseClass", NULL);
     if (hwndMSI == NULL)
     {
-        OutputDebugString("SortTree: MsiDialogCloseClass not found\n");
+        OutputDebugStringA("SortTree: MsiDialogCloseClass not found\n");
         return ERROR_SUCCESS;
     }
-    HWND hwndTV = FindWindowEx(hwndMSI, NULL, TEXT("SysTreeView32"), NULL);
+    HWND hwndTV = FindWindowExW(hwndMSI, NULL, L"SysTreeView32", NULL);
     if (hwndTV == NULL)
     {
-        OutputDebugString("SortTree: SysTreeView32 not found\n");
+        OutputDebugStringA("SortTree: SysTreeView32 not found\n");
         return ERROR_SUCCESS;
     }
     HTREEITEM optional = TreeView_GetRoot(hwndTV);
     if (optional == NULL)
     {
-        OutputDebugString("SortTree: Optional Components branch not found\n");
+        OutputDebugStringA("SortTree: Optional Components branch not found\n");
         return ERROR_SUCCESS;
     }
     HTREEITEM dicts = TreeView_GetChild(hwndTV, optional);
     if (dicts == NULL)
     {
-        OutputDebugString("SortTree: Dictionaries branch not found\n");
+        OutputDebugStringA("SortTree: Dictionaries branch not found\n");
         return ERROR_SUCCESS;
     }
     TreeView_SortChildren(hwndTV, dicts, TRUE);
     HTREEITEM langs = TreeView_GetNextSibling(hwndTV, optional);
     if (langs == NULL)
     {
-        OutputDebugString("SortTree: Additional UI Languages branch not found\n");
+        OutputDebugStringA("SortTree: Additional UI Languages branch not found\n");
         return ERROR_SUCCESS;
     }
     TreeView_SortChildren(hwndTV, langs, TRUE);