diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-03 12:01:52 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-03 16:58:26 +0200 |
| commit | 649854544e28f388774492f27eb1b75485202148 (patch) | |
| tree | f455c77fcba0438c641b2b436f62099ba75b8271 /shell | |
| parent | c31734d0e49a778cffb1fdc3cd04adb45270e1da (diff) | |
WinAPI: Fix some leftovers having UNICODE-define-dependency
Change-Id: I21b4df5b595c3814a5a3fb85d9da531729447b7e
Reviewed-on: https://gerrit.libreoffice.org/70193
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/propsheets/propsheets.cxx | 12 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index bea4566fdba6..603495de817e 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -163,26 +163,26 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNSVADDPROPSHEETPAGE lpfnAd { std::wstring proppage_header; - PROPSHEETPAGE psp; - ZeroMemory(&psp, sizeof(PROPSHEETPAGEA)); + PROPSHEETPAGEW psp; + ZeroMemory(&psp, sizeof(psp)); // add the summary property page - psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwSize = sizeof(psp); psp.dwFlags = PSP_DEFAULT | PSP_USETITLE | PSP_USECALLBACK; psp.hInstance = GetModuleHandleW(MODULE_NAME); psp.lParam = reinterpret_cast<LPARAM>(this); - psp.pfnCallback = reinterpret_cast<LPFNPSPCALLBACK>(CPropertySheet::PropPageSummaryCallback); + psp.pfnCallback = reinterpret_cast<LPFNPSPCALLBACKW>(CPropertySheet::PropPageSummaryCallback); HPROPSHEETPAGE hPage = nullptr; // add the statistics property page proppage_header = GetResString(IDS_PROPPAGE_STATISTICS_TITLE); - psp.pszTemplate = MAKEINTRESOURCE(IDD_PROPPAGE_STATISTICS); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_PROPPAGE_STATISTICS); psp.pszTitle = proppage_header.c_str(); psp.pfnDlgProc = reinterpret_cast<DLGPROC>(CPropertySheet::PropPageStatisticsProc); - hPage = CreatePropertySheetPage(&psp); + hPage = CreatePropertySheetPageW(&psp); if (hPage) { diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index df3a63d7fd66..4ea6f7e06577 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -47,7 +47,7 @@ namespace internal id is 2000 */ static void LoadSignetImageFromResource(ZipFile::ZipContentBuffer_t& buffer) { - HRSRC hrc = FindResourceW(g_hModule, L"#2000", RT_RCDATA); + HRSRC hrc = FindResourceW(g_hModule, L"#2000", MAKEINTRESOURCEW(RT_RCDATA)); DWORD size = SizeofResource(g_hModule, hrc); HGLOBAL hglob = LoadResource(g_hModule, hrc); char* data = static_cast<char*>(LockResource(hglob)); |