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>

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)
     {

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));

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: */