[Libreoffice-commits] .: vcl/win

[Jesús Corrius]

 vcl/win/source/app/saldata.cxx |   10 +++++-----
 vcl/win/source/app/salinfo.cxx |    8 ++++----
 vcl/win/source/app/salinst.cxx |   16 ++++++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 37c198cf098976d4b6814017f3ac1a81b53d2fb5
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Thu Feb 2 09:54:00 2012 +0100

    Revert "Win32 API calls use the Unicode versions by default"
    
    This reverts commit 157a32f0dc2eaa195ff60e8b60902554e73e999f. The patch is good but it breaks the MinGW build because the compiler is misconfigured and by default the API calls there are ANSI.

diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 617b03f..4445315 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -93,35 +93,35 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 )
 
 BOOL ImplPostMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
 {
-    return PostMessage( hWnd, nMsg, wParam, lParam );
+    return PostMessageW( hWnd, nMsg, wParam, lParam );
 }
 
 // -----------------------------------------------------------------------
 
 BOOL ImplSendMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
 {
-    return SendMessage( hWnd, nMsg, wParam, lParam );
+    return SendMessageW( hWnd, nMsg, wParam, lParam );
 }
 
 // -----------------------------------------------------------------------
 
 BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax )
 {
-    return GetMessage( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
+    return GetMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
 }
 
 // -----------------------------------------------------------------------
 
 BOOL ImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg )
 {
-    return PeekMessage( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg );
+    return PeekMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg );
 }
 
 // -----------------------------------------------------------------------
 
 LONG ImplDispatchMessage( CONST MSG *lpMsg )
 {
-    return DispatchMessage( lpMsg );
+    return DispatchMessageW( lpMsg );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index d370589..efd4d08 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -67,9 +67,9 @@ static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor,
 
 sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr, sal_IntPtr )
 {
-    MONITORINFOEX aInfo;
+    MONITORINFOEXW aInfo;
     aInfo.cbSize = sizeof( aInfo );
-    if( GetMonitorInfo( reinterpret_cast<HMONITOR>(hMonitor), &aInfo ) )
+    if( GetMonitorInfoW( reinterpret_cast<HMONITOR>(hMonitor), &aInfo ) )
     {
         aInfo.szDevice[CCHDEVICENAME-1] = 0;
         rtl::OUString aDeviceName( reinterpret_cast<const sal_Unicode *>(aInfo.szDevice) );
@@ -127,7 +127,7 @@ bool WinSalSystem::initMonitors()
         aDev.cb = sizeof( aDev );
         DWORD nDevice = 0;
         boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount;
-        while( EnumDisplayDevices( NULL, nDevice++, &aDev, 0 ) )
+        while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) )
         {
             if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE)
                 && !(aDev.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) ) // sort out non/disabled monitors
@@ -236,7 +236,7 @@ int WinSalSystem::ShowNativeMessageBox(const rtl::OUString& rTitle, const rtl::O
         nFlags |= DEFAULT_BTN_MAPPING_TABLE[nButtonCombination][nDefaultButton];
 
     ImplHideSplash();
-    return MessageBox(
+    return MessageBoxW(
         0,
         reinterpret_cast<LPCWSTR>(rMessage.getStr()),
         reinterpret_cast<LPCWSTR>(rTitle.getStr()),
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index c75ee06..d491404 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -89,13 +89,13 @@ void SalAbort( const rtl::OUString& rErrorText, bool )
     {
         // make sure crash reporter is triggered
         RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-        FatalAppExit( 0, L"Application Error" );
+        FatalAppExitW( 0, L"Application Error" );
     }
     else
     {
         // make sure crash reporter is triggered
         RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-        FatalAppExit( 0, rErrorText.getStr() );
+        FatalAppExitW( 0, rErrorText.getStr() );
     }
 }
 
@@ -521,32 +521,32 @@ SalInstance* CreateSalInstance()
         aWndClassEx.lpszMenuName    = 0;
         aWndClassEx.lpszClassName   = SAL_FRAME_CLASSNAMEW;
         ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon, aWndClassEx.hIconSm );
-        if ( !RegisterClassEx( &aWndClassEx ) )
+        if ( !RegisterClassExW( &aWndClassEx ) )
             return NULL;
 
         aWndClassEx.hIcon           = 0;
         aWndClassEx.hIconSm         = 0;
         aWndClassEx.style          |= CS_SAVEBITS;
         aWndClassEx.lpszClassName   = SAL_SUBFRAME_CLASSNAMEW;
-        if ( !RegisterClassEx( &aWndClassEx ) )
+        if ( !RegisterClassExW( &aWndClassEx ) )
             return NULL;
 
         // shadow effect for popups on XP
         if( aSalShlData.mbWXP )
             aWndClassEx.style       |= CS_DROPSHADOW;
         aWndClassEx.lpszClassName   = SAL_TMPSUBFRAME_CLASSNAMEW;
-        if ( !RegisterClassEx( &aWndClassEx ) )
+        if ( !RegisterClassExW( &aWndClassEx ) )
             return NULL;
 
         aWndClassEx.style           = 0;
         aWndClassEx.lpfnWndProc     = SalComWndProcW;
         aWndClassEx.cbWndExtra      = 0;
         aWndClassEx.lpszClassName   = SAL_COM_CLASSNAMEW;
-        if ( !RegisterClassEx( &aWndClassEx ) )
+        if ( !RegisterClassExW( &aWndClassEx ) )
             return NULL;
     }
 
-    HWND hComWnd = CreateWindowEx( WS_EX_TOOLWINDOW, SAL_COM_CLASSNAMEW,
+    HWND hComWnd = CreateWindowExW( WS_EX_TOOLWINDOW, SAL_COM_CLASSNAMEW,
                                L"", WS_POPUP, 0, 0, 0, 0, 0, 0,
                                pSalData->mhInst, NULL );
     if ( !hComWnd )
@@ -870,7 +870,7 @@ LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa
     if ( bDef )
     {
         if ( !ImplHandleGlobalMsg( hWnd, nMsg, wParam, lParam, nRet ) )
-            nRet = DefWindowProc( hWnd, nMsg, wParam, lParam );
+            nRet = DefWindowProcW( hWnd, nMsg, wParam, lParam );
     }
     return nRet;
 }