diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-26 11:28:57 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-30 11:23:41 +0200 |
commit | 362a21d3a129b90149f6ef645c127f5e86e0ba61 (patch) | |
tree | 8583cb29b33de56e4489cb8950d2714a1fb2957e /embedserv/source/embed/tracker.cxx | |
parent | 81ce629c9e8a4fc26ded9d49157e3f3263991e03 (diff) |
Use explicit function names for fooA/fooW WinAPI; prefer fooW
We should only use generic foo function name when it takes params
that are also dependent on UNICODE define, like
LoadCursor( nullptr, IDC_ARROW )
where IDC_ARROW is defined in MSVC headers synchronised with
LoadCursor definition.
We should always use Unicode API for any file paths operations,
because otherwise we will get "?" for any character in path that
is not in current non-unicode codepage, which will result in failed
file operations.
Change-Id: I3a7f453ca0f893002d8a9764318919709fd8b633
Reviewed-on: https://gerrit.libreoffice.org/42935
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'embedserv/source/embed/tracker.cxx')
-rw-r--r-- | embedserv/source/embed/tracker.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx index b39f5499d53f..ae30e630f709 100644 --- a/embedserv/source/embed/tracker.cxx +++ b/embedserv/source/embed/tracker.cxx @@ -255,10 +255,9 @@ void Tracker::Construct() } // get default handle size from Windows profile setting - static const TCHAR szWindows[] = TEXT("windows"); - static const TCHAR szInplaceBorderWidth[] = - TEXT("oleinplaceborderwidth"); - afxHandleSize = GetProfileInt(szWindows, szInplaceBorderWidth, 4); + static const WCHAR szWindows[] = L"windows"; + static const WCHAR szInplaceBorderWidth[] = L"oleinplaceborderwidth"; + afxHandleSize = GetProfileIntW(szWindows, szInplaceBorderWidth, 4); bInitialized = TRUE; afxCursors[0] = afxCursors[2] = LoadCursor(nullptr,IDC_SIZENWSE); @@ -396,7 +395,7 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo) for (;;) { MSG msg; - GetMessage(&msg, nullptr, 0, 0); + GetMessageW(&msg, nullptr, 0, 0); if (GetCapture() != hWnd) break; @@ -461,7 +460,7 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo) // just dispatch rest of the messages default: - DispatchMessage(&msg); + DispatchMessageW(&msg); break; } } |