diff options
| -rw-r--r-- | shell/source/win32/shlxthandler/propsheets/propsheets.cxx | 12 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx | 2 | ||||
| -rw-r--r-- | winaccessibility/source/UAccCOM/AccRelation.cxx | 6 |
3 files changed, 10 insertions, 10 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)); 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: */ |