Michael Stefaniuc : comctl32: LockResource() returns a LPVOID so don' t cast its return value.
Alexandre Julliard
julliard at winehq.org
Fri Oct 24 08:12:39 CDT 2008
Module: wine
Branch: master
Commit: 6060ca94388c4b0089af6683570323c2aa7b0fa5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6060ca94388c4b0089af6683570323c2aa7b0fa5
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Oct 23 23:52:45 2008 +0200
comctl32: LockResource() returns a LPVOID so don't cast its return value.
---
dlls/comctl32/commctrl.c | 2 +-
dlls/comctl32/propsheet.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 050a018..f21aa11 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -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;
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 0499a83..b463dfd 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -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
*/
More information about the wine-cvs
mailing list