diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c index 04684de7d97..26f3e8e98f8 100644 --- a/dlls/commdlg/colordlg.c +++ b/dlls/commdlg/colordlg.c @@ -1403,7 +1403,8 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol ) } else { - HANDLE hResInfo, hDlgTmpl32; + HRSRC hResInfo; + HGLOBAL hDlgTmpl32; LPCVOID template32; DWORD size; if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, "CHOOSE_COLOR", RT_DIALOGA))) @@ -1454,9 +1455,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol ) * ChooseColorW (COMDLG32.@) */ BOOL WINAPI ChooseColorW( LPCHOOSECOLORW lpChCol ) - { - HANDLE hDlgTmpl = 0; BOOL bRet = FALSE; LPCVOID template; @@ -1474,7 +1473,7 @@ BOOL WINAPI ChooseColorW( LPCHOOSECOLORW lpChCol ) } else if (lpChCol->Flags & CC_ENABLETEMPLATE) { - HANDLE hResInfo; + HRSRC hResInfo; if (!(hResInfo = FindResourceW(lpChCol->hInstance, lpChCol->lpTemplateName, RT_DIALOGW))) @@ -1491,7 +1490,8 @@ BOOL WINAPI ChooseColorW( LPCHOOSECOLORW lpChCol ) } else { - HANDLE hResInfo, hDlgTmpl; + HRSRC hResInfo; + HGLOBAL hDlgTmpl; if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, "CHOOSE_COLOR", RT_DIALOGA))) { COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c index 1f0bdaef581..c31d41973be 100644 --- a/dlls/commdlg/filedlg.c +++ b/dlls/commdlg/filedlg.c @@ -151,7 +151,7 @@ BOOL Get32BitsTemplate(LFSPRIVATE lfs) } else if (ofnW->Flags & OFN_ENABLETEMPLATE) { - HANDLE hResInfo; + HRSRC hResInfo; if (lfs->ofnA) hResInfo = FindResourceA(lfs->ofnA->hInstance, lfs->ofnA->lpTemplateName, @@ -173,7 +173,7 @@ BOOL Get32BitsTemplate(LFSPRIVATE lfs) return FALSE; } } else { /* get it from internal Wine resource */ - HANDLE hResInfo; + HRSRC hResInfo; if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, lfs->open? "OPEN_FILE":"SAVE_FILE", RT_DIALOGA))) { @@ -225,7 +225,8 @@ BOOL Get16BitsTemplate(LFSPRIVATE lfs) } else { /* get resource from (32 bits) own Wine resource; convert it to 16 */ - HANDLE hResInfo, hDlgTmpl32; + HRSRC hResInfo; + HGLOBAL hDlgTmpl32; LPCVOID template32; DWORD size; diff --git a/dlls/commdlg/finddlg.c b/dlls/commdlg/finddlg.c index 1e6f540e2c4..e4255cc136c 100644 --- a/dlls/commdlg/finddlg.c +++ b/dlls/commdlg/finddlg.c @@ -96,7 +96,8 @@ BOOL FINDDLG_Get16BitsTemplate(LFRPRIVATE lfr) } else { /* get resource from (32 bits) own Wine resource; convert it to 16 */ - HANDLE hResInfo, hDlgTmpl32; + HRSRC hResInfo; + HGLOBAL hDlgTmpl32; LPCVOID template32; DWORD size; HGLOBAL16 hGlobal16; diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c index df04772092e..db841ae9d34 100644 --- a/dlls/commdlg/fontdlg.c +++ b/dlls/commdlg/fontdlg.c @@ -183,7 +183,8 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) } else { - HANDLE hResInfo, hDlgTmpl32; + HRSRC hResInfo; + HGLOBAL hDlgTmpl32; LPCVOID template32; DWORD size; if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, "CHOOSE_FONT", RT_DIALOGA))) @@ -260,7 +261,8 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) { LPCVOID template; - HANDLE hResInfo, hDlgTmpl; + HRSRC hResInfo; + HGLOBAL hDlgTmpl; if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, "CHOOSE_FONT", RT_DIALOGA))) { diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c index b014e84f866..e9a62484fea 100644 --- a/dlls/commdlg/printdlg.c +++ b/dlls/commdlg/printdlg.c @@ -2096,7 +2096,8 @@ BOOL WINAPI PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, */ static HGLOBAL16 PRINTDLG_Get16TemplateFrom32(char *PrintResourceName) { - HANDLE hResInfo, hDlgTmpl32; + HRSRC hResInfo; + HGLOBAL hDlgTmpl32; LPCVOID template32; DWORD size; HGLOBAL16 hGlobal16; @@ -2142,7 +2143,8 @@ static HGLOBAL16 PRINTDLG_Get16TemplateFrom32(char *PrintResourceName) */ static HGLOBAL PRINTDLG_GetDlgTemplateA(PRINTDLGA *lppd) { - HGLOBAL hDlgTmpl, hResInfo; + HRSRC hResInfo; + HGLOBAL hDlgTmpl; if (lppd->Flags & PD_PRINTSETUP) { if(lppd->Flags & PD_ENABLESETUPTEMPLATEHANDLE) { @@ -2175,7 +2177,8 @@ static HGLOBAL PRINTDLG_GetDlgTemplateA(PRINTDLGA *lppd) static HGLOBAL PRINTDLG_GetDlgTemplateW(PRINTDLGW *lppd) { - HGLOBAL hDlgTmpl, hResInfo; + HRSRC hResInfo; + HGLOBAL hDlgTmpl; const WCHAR xpsetup[] = { 'P','R','I','N','T','3','2','_','S','E','T','U','P',0}; const WCHAR xprint[] = { 'P','R','I','N','T','3','2',0}; @@ -2846,7 +2849,8 @@ typedef struct { static HGLOBAL PRINTDLG_GetPGSTemplateA(PAGESETUPDLGA *lppd) { - HGLOBAL hDlgTmpl, hResInfo; + HRSRC hResInfo; + HGLOBAL hDlgTmpl; if(lppd->Flags & PSD_ENABLEPAGESETUPTEMPLATEHANDLE) { hDlgTmpl = lppd->hPageSetupTemplate; @@ -2863,7 +2867,8 @@ static HGLOBAL PRINTDLG_GetPGSTemplateA(PAGESETUPDLGA *lppd) static HGLOBAL PRINTDLG_GetPGSTemplateW(PAGESETUPDLGW *lppd) { - HGLOBAL hDlgTmpl, hResInfo; + HRSRC hResInfo; + HGLOBAL hDlgTmpl; if(lppd->Flags & PSD_ENABLEPAGESETUPTEMPLATEHANDLE) { hDlgTmpl = lppd->hPageSetupTemplate; diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c index 82ca725b9c0..e6d3b5e8f48 100644 --- a/dlls/setupapi/virtcopy.c +++ b/dlls/setupapi/virtcopy.c @@ -594,7 +594,8 @@ static BOOL CALLBACK VCP_UI_FileCopyDlgProc(HWND hWndDlg, UINT iMsg, WPARAM wPar BOOL VCP_UI_GetDialogTemplate(LPCVOID *template32) { - HANDLE hResInfo, hDlgTmpl32; + HRSRC hResInfo; + HGLOBAL hDlgTmpl32; if (!(hResInfo = FindResourceA(SETUPAPI_hInstance, MAKEINTRESOURCEA(COPYFILEDLGORD), RT_DIALOGA))) return FALSE; diff --git a/include/windef.h b/include/windef.h index 7f9f997e6aa..e0c8e456e16 100644 --- a/include/windef.h +++ b/include/windef.h @@ -90,7 +90,7 @@ DECLARE_HANDLE(HMONITOR); DECLARE_HANDLE(HPALETTE); DECLARE_OLD_HANDLE(HPEN); DECLARE_OLD_HANDLE(HRGN); -DECLARE_OLD_HANDLE(HRSRC); +DECLARE_HANDLE(HRSRC); DECLARE_HANDLE(HTASK); DECLARE_HANDLE(HWINEVENTHOOK); DECLARE_HANDLE(HWINSTA); diff --git a/loader/resource.c b/loader/resource.c index f16d5d357f9..20c47c8be1b 100644 --- a/loader/resource.c +++ b/loader/resource.c @@ -48,10 +48,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource); #define HRSRC_MAP_BLOCKSIZE 16 +/* handle conversions */ +#define HRSRC_32(h16) ((HRSRC)(ULONG_PTR)(h16)) + typedef struct _HRSRC_ELEM { - HANDLE hRsrc; - WORD type; + HRSRC hRsrc; + WORD type; } HRSRC_ELEM; typedef struct _HRSRC_MAP @@ -64,7 +67,7 @@ typedef struct _HRSRC_MAP /********************************************************************** * MapHRsrc32To16 */ -static HRSRC MapHRsrc32To16( NE_MODULE *pModule, HANDLE hRsrc32, WORD type ) +static HRSRC MapHRsrc32To16( NE_MODULE *pModule, HRSRC hRsrc32, WORD type ) { HRSRC_MAP *map = (HRSRC_MAP *)pModule->hRsrcMap; HRSRC_ELEM *newElem; @@ -385,7 +388,7 @@ HRSRC WINAPI FindResourceW(HINSTANCE hModule, LPCWSTR name, LPCWSTR type) */ HGLOBAL16 WINAPI LoadResource16( HMODULE16 hModule, HRSRC16 hRsrc ) { - return RES_LoadResource( hModule, hRsrc, TRUE ); + return RES_LoadResource( hModule, HRSRC_32(hRsrc), TRUE ); } /********************************************************************** @@ -477,7 +480,7 @@ BOOL WINAPI FreeResource( HGLOBAL handle ) */ DWORD WINAPI SizeofResource16( HMODULE16 hModule, HRSRC16 hRsrc ) { - return RES_SizeofResource( hModule, hRsrc, TRUE ); + return RES_SizeofResource( hModule, HRSRC_32(hRsrc), TRUE ); } /********************************************************************** diff --git a/windows/cursoricon.c b/windows/cursoricon.c index 9bb8d7a1b3a..e43af865575 100644 --- a/windows/cursoricon.c +++ b/windows/cursoricon.c @@ -735,7 +735,7 @@ HGLOBAL CURSORICON_Load( HINSTANCE hInstance, LPCWSTR name, BOOL fCursor, UINT loadflags ) { HANDLE handle = 0, h = 0; - HANDLE hRsrc; + HRSRC hRsrc; CURSORICONDIR *dir; CURSORICONDIRENTRY *dirEntry; LPBYTE bits; @@ -757,7 +757,7 @@ HGLOBAL CURSORICON_Load( HINSTANCE hInstance, LPCWSTR name, } else /* Load from resource */ { - HANDLE hGroupRsrc; + HRSRC hGroupRsrc; WORD wResId; DWORD dwBytesInRes; diff --git a/windows/dialog.c b/windows/dialog.c index 60afc545568..21a71a85712 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -931,7 +931,7 @@ HWND WINAPI CreateDialogParamA( HINSTANCE hInst, LPCSTR name, HWND owner, DLGPROC dlgProc, LPARAM param ) { - HANDLE hrsrc = FindResourceA( hInst, name, RT_DIALOGA ); + HRSRC hrsrc = FindResourceA( hInst, name, RT_DIALOGA ); if (!hrsrc) return 0; return CreateDialogIndirectParamA( hInst, (LPVOID)LoadResource(hInst, hrsrc), @@ -946,7 +946,7 @@ HWND WINAPI CreateDialogParamW( HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPROC dlgProc, LPARAM param ) { - HANDLE hrsrc = FindResourceW( hInst, name, RT_DIALOGW ); + HRSRC hrsrc = FindResourceW( hInst, name, RT_DIALOGW ); if (!hrsrc) return 0; return CreateDialogIndirectParamW( hInst, (LPVOID)LoadResource(hInst, hrsrc), @@ -1100,7 +1100,7 @@ INT WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, HWND owner, DLGPROC dlgProc, LPARAM param ) { HWND hwnd; - HANDLE hrsrc = FindResourceA( hInst, name, RT_DIALOGA ); + HRSRC hrsrc = FindResourceA( hInst, name, RT_DIALOGA ); if (!hrsrc) return 0; hwnd = DIALOG_CreateIndirect( hInst, (LPVOID)LoadResource(hInst, hrsrc), owner, dlgProc, param, WIN_PROC_32A, TRUE ); @@ -1116,7 +1116,7 @@ INT WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPROC dlgProc, LPARAM param ) { HWND hwnd; - HANDLE hrsrc = FindResourceW( hInst, name, RT_DIALOGW ); + HRSRC hrsrc = FindResourceW( hInst, name, RT_DIALOGW ); if (!hrsrc) return 0; hwnd = DIALOG_CreateIndirect( hInst, (LPVOID)LoadResource(hInst, hrsrc), owner, dlgProc, param, WIN_PROC_32W, TRUE );