mirror of
https://github.com/reactos/reactos.git
synced 2024-10-06 01:13:38 +00:00
[APPWIZ][COMCTL32][UXTHEME]
* Use explicit casts to pass __WINESRC__ strictness. CORE-7669 svn path=/trunk/; revision=61199
This commit is contained in:
parent
829ee94ddd
commit
b46c4ec2b9
|
@ -362,14 +362,14 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath)
|
||||||
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
|
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
|
||||||
psp.hInstance = hApplet;
|
psp.hInstance = hApplet;
|
||||||
psp.pfnDlgProc = WelcomeDlgProc;
|
psp.pfnDlgProc = WelcomeDlgProc;
|
||||||
psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_LOCATION);
|
psp.pszTemplate = MAKEINTRESOURCEW(IDD_SHORTCUT_LOCATION);
|
||||||
psp.lParam = (LPARAM)pContext;
|
psp.lParam = (LPARAM)pContext;
|
||||||
ahpsp[nPages++] = CreatePropertySheetPage(&psp);
|
ahpsp[nPages++] = CreatePropertySheetPage(&psp);
|
||||||
|
|
||||||
/* Create the Finish page */
|
/* Create the Finish page */
|
||||||
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
|
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
|
||||||
psp.pfnDlgProc = FinishDlgProc;
|
psp.pfnDlgProc = FinishDlgProc;
|
||||||
psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_FINISH);
|
psp.pszTemplate = MAKEINTRESOURCEW(IDD_SHORTCUT_FINISH);
|
||||||
ahpsp[nPages++] = CreatePropertySheetPage(&psp);
|
ahpsp[nPages++] = CreatePropertySheetPage(&psp);
|
||||||
|
|
||||||
|
|
||||||
|
@ -381,7 +381,7 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath)
|
||||||
psh.nPages = nPages;
|
psh.nPages = nPages;
|
||||||
psh.nStartPage = 0;
|
psh.nStartPage = 0;
|
||||||
psh.phpage = ahpsp;
|
psh.phpage = ahpsp;
|
||||||
psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK);
|
psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_WATERMARK);
|
||||||
|
|
||||||
/* Display the wizard */
|
/* Display the wizard */
|
||||||
PropertySheet(&psh);
|
PropertySheet(&psh);
|
||||||
|
|
|
@ -119,7 +119,7 @@ static BOOL create_manifest(BOOL install)
|
||||||
HANDLE hFile;
|
HANDLE hFile;
|
||||||
BOOL bRet = FALSE;
|
BOOL bRet = FALSE;
|
||||||
|
|
||||||
hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", RT_MANIFEST);
|
hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", (LPWSTR)RT_MANIFEST);
|
||||||
if (!hResInfo)
|
if (!hResInfo)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@ UserGetWindowIcon(HWND hwnd)
|
||||||
hIcon = (HICON)GetClassLong(hwnd, GCL_HICON);
|
hIcon = (HICON)GetClassLong(hwnd, GCL_HICON);
|
||||||
|
|
||||||
if(!hIcon)
|
if(!hIcon)
|
||||||
hIcon = LoadIcon(NULL, IDI_WINLOGO);
|
hIcon = LoadIconW(NULL, (LPCWSTR)IDI_WINLOGO);
|
||||||
|
|
||||||
return hIcon;
|
return hIcon;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue