Author: akhaldi Date: Mon Dec 2 22:40:06 2013 New Revision: 61199
URL: http://svn.reactos.org/svn/reactos?rev=61199&view=rev Log: [APPWIZ][COMCTL32][UXTHEME] * Use explicit casts to pass __WINESRC__ strictness. CORE-7669
Modified: trunk/reactos/dll/cpl/appwiz/createlink.c trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/uxtheme/nonclient.c
Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.c... ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Mon Dec 2 22:40:06 2013 @@ -362,14 +362,14 @@ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.hInstance = hApplet; psp.pfnDlgProc = WelcomeDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_LOCATION); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_SHORTCUT_LOCATION); psp.lParam = (LPARAM)pContext; ahpsp[nPages++] = CreatePropertySheetPage(&psp);
/* Create the Finish page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.pfnDlgProc = FinishDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_FINISH); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_SHORTCUT_FINISH); ahpsp[nPages++] = CreatePropertySheetPage(&psp);
@@ -381,7 +381,7 @@ psh.nPages = nPages; psh.nStartPage = 0; psh.phpage = ahpsp; - psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); + psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_WATERMARK);
/* Display the wizard */ PropertySheet(&psh);
Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctrl... ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Mon Dec 2 22:40:06 2013 @@ -119,7 +119,7 @@ HANDLE hFile; BOOL bRet = FALSE;
- hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", RT_MANIFEST); + hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", (LPWSTR)RT_MANIFEST); if (!hResInfo) return FALSE;
Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclient... ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Dec 2 22:40:06 2013 @@ -87,7 +87,7 @@ hIcon = (HICON)GetClassLong(hwnd, GCL_HICON);
if(!hIcon) - hIcon = LoadIcon(NULL, IDI_WINLOGO); + hIcon = LoadIconW(NULL, (LPCWSTR)IDI_WINLOGO);
return hIcon; }