marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32: LockResource() returns a LPVOID so don't cast its return value.

oldstable
Michael Stefaniuc 2008-10-23 23:52:45 +02:00 committed by Alexandre Julliard
parent 1659313142
commit 6060ca9438
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/comctl32/commctrl.c
View File

@ -878,7 +878,7 @@ CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags,
hglb = LoadResource (hInstance, hRsrc);
if (hglb == 0)
return 0;
lpBitmap = (LPBITMAPINFOHEADER)LockResource (hglb);
lpBitmap = LockResource (hglb);
if (lpBitmap == NULL)
return 0;

8
dlls/comctl32/propsheet.c
View File

@ -441,7 +441,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp,
(LPWSTR)RT_DIALOG);
HGLOBAL hTemplate = LoadResource(lppsp->hInstance,
hResource);
pTemplate = (LPDLGTEMPLATEW)LockResource(hTemplate);
pTemplate = LockResource(hTemplate);
}
else
{
@ -450,7 +450,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp,
(LPSTR)RT_DIALOG);
HGLOBAL hTemplate = LoadResource(lppsp->hInstance,
hResource);
pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate);
pTemplate = LockResource(hTemplate);
}
/*
@ -1412,7 +1412,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent,
if(!hTemplate)
return FALSE;
pTemplate = (LPDLGTEMPLATEW)LockResource(hTemplate);
pTemplate = LockResource(hTemplate);
/*
* Make a copy of the dialog template to make it writable
*/
@ -1434,7 +1434,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent,
if(!hTemplate)
return FALSE;
pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate);
pTemplate = LockResource(hTemplate);
/*
* Make a copy of the dialog template to make it writable
*/