shell/source/win32/shlxthandler/propsheets/propsheets.cxx | 12 ++++++------
shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx | 2 +-
winaccessibility/source/UAccCOM/AccRelation.cxx | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 649854544e28f388774492f27eb1b75485202148
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Apr 3 12:01:52 2019 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Apr 3 16:58:26 2019 +0200
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.kagan...@collabora.com>
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));
diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx
b/winaccessibility/source/UAccCOM/AccRelation.cxx
index 6da0cf0acebf..052bd8785204 100644
--- a/winaccessibility/source/UAccCOM/AccRelation.cxx
+++ b/winaccessibility/source/UAccCOM/AccRelation.cxx
@@ -195,9 +195,9 @@ STDMETHODIMP CAccRelation::put_XSubInterface(hyper
pXSubInterface)
*/
BSTR CAccRelation::getRelationTypeBSTR(int type)
{
- static LPCTSTR map[] =
+ static LPCWSTR map[] =
{
- _T("INVALID"), // AccessibleRelationType::INVALID
+ L"INVALID", // AccessibleRelationType::INVALID
IA2_RELATION_FLOWS_FROM, //
AccessibleRelationType::CONTENT_FLOWS_FROM
IA2_RELATION_FLOWS_TO, //
AccessibleRelationType::CONTENT_FLOWS_TO
IA2_RELATION_CONTROLLED_BY, //
AccessibleRelationType::CONTROLLED_BY
@@ -211,7 +211,7 @@ BSTR CAccRelation::getRelationTypeBSTR(int type)
};
return ::SysAllocString( (type >= AccessibleRelationType::INVALID && type
<= AccessibleRelationType::DESCRIBED_BY)
- ? map[type] : _T(""));
+ ? map[type] : L"");
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
