Skip to content

W
wine-winehq
Commit fb11803d authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

user32: Remove superfluous casts of void pointers.

parent be2570f7
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
dlls/user32/cursoricon.c
View file @ fb11803d
......@@ -828,7 +828,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi,
{
CURSORICONINFO *info;
info = (CURSORICONINFO *)GlobalLock16( hObj );
info = GlobalLock16( hObj );
info->ptHotSpot.x = hotspot.x;
info->ptHotSpot.y = hotspot.y;
info->nWidth = bmpXor.bmWidth;
......@@ -992,7 +992,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name,
/* Find the best entry in the directory */
if (!(handle = LoadResource( hInstance, hRsrc ))) return 0;
if (!(dir = (CURSORICONDIR*)LockResource( handle ))) return 0;
if (!(dir = LockResource( handle ))) return 0;
if (fCursor)
dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, 1);
else
......@@ -1013,7 +1013,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name,
return hIcon;
if (!(handle = LoadResource( hInstance, hRsrc ))) return 0;
bits = (LPBYTE)LockResource( handle );
bits = LockResource( handle );
hIcon = CreateIconFromResourceEx( bits, dwBytesInRes,
!fCursor, 0x00030000, width, height, loadflags);
FreeResource( handle );
......@@ -1038,12 +1038,12 @@ static HICON CURSORICON_Copy( HINSTANCE16 hInst16, HICON hIcon )
HICON16 hOld = HICON_16(hIcon);
HICON16 hNew;
if (!(ptrOld = (char *)GlobalLock16( hOld ))) return 0;
if (!(ptrOld = GlobalLock16( hOld ))) return 0;
if (hInst16 && !(hInst16 = GetExePtr( hInst16 ))) return 0;
size = GlobalSize16( hOld );
hNew = GlobalAlloc16( GMEM_MOVEABLE, size );
FarSetOwner16( hNew, hInst16 );
ptrNew = (char *)GlobalLock16( hNew );
ptrNew = GlobalLock16( hNew );
memcpy( ptrNew, ptrOld, size );
GlobalUnlock16( hOld );
GlobalUnlock16( hNew );
......@@ -1134,7 +1134,7 @@ static HICON CURSORICON_ExtCopy(HICON hIcon, UINT nType,
{
return 0;
}
if (!(pDir = (CURSORICONDIR*)LockResource( hMem )))
if (!(pDir = LockResource( hMem )))
{
return 0;
}
......@@ -1172,7 +1172,7 @@ static HICON CURSORICON_ExtCopy(HICON hIcon, UINT nType,
return 0;
}
pBits = (LPBYTE)LockResource( hMem );
pBits = LockResource( hMem );
if(nFlags & LR_DEFAULTSIZE)
{
......@@ -1311,7 +1311,7 @@ HGLOBAL16 WINAPI CreateCursorIconIndirect16( HINSTANCE16 hInstance,
sizeof(CURSORICONINFO) + sizeXor + sizeAnd)))
return 0;
FarSetOwner16( handle, hInstance );
ptr = (char *)GlobalLock16( handle );
ptr = GlobalLock16( handle );
memcpy( ptr, info, sizeof(*info) );
memcpy( ptr + sizeof(CURSORICONINFO), lpANDbits, sizeAnd );
memcpy( ptr + sizeof(CURSORICONINFO) + sizeAnd, lpXORbits, sizeXor );
......@@ -1419,7 +1419,7 @@ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon )
TRACE("%p, (%d,%d), %p\n", hdc, x, y, hIcon);
if (!(ptr = (CURSORICONINFO *)GlobalLock16(HICON_16(hIcon)))) return FALSE;
if (!(ptr = GlobalLock16(HICON_16(hIcon)))) return FALSE;
if (!(hMemDC = CreateCompatibleDC( hdc ))) return FALSE;
hAndBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1,
(char *)(ptr+1) );
......@@ -1639,7 +1639,7 @@ INT WINAPI LookupIconIdFromDirectory( LPBYTE dir, BOOL bIcon )
*/
WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType )
{
LPBYTE lpDir = (LPBYTE)GlobalLock16(hResource);
LPBYTE lpDir = GlobalLock16(hResource);
TRACE_(cursor)("hRes=%04x, entries=%i\n",
hResource, lpDir ? ((CURSORICONDIR*)lpDir)->idCount : 0);
......@@ -1675,7 +1675,7 @@ HGLOBAL16 WINAPI LoadCursorIconHandler16( HGLOBAL16 hResource, HMODULE16 hModule
*/
HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew )
{
LPBYTE bits = (LPBYTE)LockResource16( hResource );
LPBYTE bits = LockResource16( hResource );
TRACE_(cursor)("hRes=%04x\n",hResource);
......@@ -1844,7 +1844,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
{
CURSORICONINFO *info;
info = (CURSORICONINFO *)GlobalLock16( hObj );
info = GlobalLock16( hObj );
/* If we are creating an icon, the hotspot is unused */
if (iconinfo->fIcon)
......@@ -1983,7 +1983,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon,
INT cxWidth, INT cyWidth, UINT istep,
HBRUSH hbr, UINT flags )
{
CURSORICONINFO *ptr = (CURSORICONINFO *)GlobalLock16(HICON_16(hIcon));
CURSORICONINFO *ptr = GlobalLock16(HICON_16(hIcon));
HDC hDC_off = 0, hMemDC;
BOOL result = FALSE, DoOffscreen;
HBITMAP hB_off = 0, hOld = 0;
......@@ -2213,7 +2213,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name,
if (!(hRsrc = FindResourceW( instance, name, (LPWSTR)RT_BITMAP ))) return 0;
if (!(handle = LoadResource( instance, hRsrc ))) return 0;
if ((info = (BITMAPINFO *)LockResource( handle )) == NULL) return 0;
if ((info = LockResource( handle )) == NULL) return 0;
}
else
{
......
dlls/user32/dde_client.c
View file @ fb11803d
......@@ -320,7 +320,7 @@ static WDML_XACT* WDML_ClientQueueAdvise(WDML_CONV* pConv, UINT wType, UINT wFmt
/* FIXME: hMem is unfreed for now... should be deleted in server */
/* pack DdeAdvise */
pDdeAdvise = (DDEADVISE*)GlobalLock(pXAct->hMem);
pDdeAdvise = GlobalLock(pXAct->hMem);
pDdeAdvise->fAckReq = (wType & XTYPF_ACKREQ) ? TRUE : FALSE;
pDdeAdvise->fDeferUpd = (wType & XTYPF_NODATA) ? TRUE : FALSE;
pDdeAdvise->cfFormat = wFmt;
......@@ -719,7 +719,7 @@ static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPVOID pData, DWORD cbD
if (cbData == (DWORD)-1)
{
hglobal = pData;
dh = (DDE_DATAHANDLE_HEAD *)GlobalLock(hglobal);
dh = GlobalLock(hglobal);
cbData = GlobalSize(hglobal) - sizeof(DDE_DATAHANDLE_HEAD);
pData = (LPVOID)(dh + 1);
GlobalUnlock(hglobal);
......
dlls/user32/dde_misc.c
View file @ fb11803d
......@@ -1295,7 +1295,7 @@ HDDEDATA WINAPI DdeCreateDataHandle(DWORD idInst, LPBYTE pSrc, DWORD cb, DWORD c
return 0;
}
pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock(hMem);
pDdh = GlobalLock(hMem);
if (!pDdh)
{
GlobalFree(hMem);
......@@ -1409,7 +1409,7 @@ LPBYTE WINAPI DdeAccessData(HDDEDATA hData, LPDWORD pcbDataSize)
TRACE("(%p,%p)\n", hData, pcbDataSize);
pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock(hMem);
pDdh = GlobalLock(hMem);
if (pDdh == NULL)
{
ERR("Failed on GlobalLock(%p)\n", hMem);
......@@ -1457,7 +1457,7 @@ BOOL WDML_IsAppOwned(HDDEDATA hData)
DDE_DATAHANDLE_HEAD* pDdh;
BOOL ret = FALSE;
pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock(hData);
pDdh = GlobalLock(hData);
if (pDdh != NULL)
{
ret = pDdh->bAppOwned;
......@@ -1546,7 +1546,7 @@ HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease,
HGLOBAL hMem = 0;
dwSize = GlobalSize((HGLOBAL)hDdeData) - sizeof(DDE_DATAHANDLE_HEAD);
pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock((HGLOBAL)hDdeData);
pDdh = GlobalLock((HGLOBAL)hDdeData);
if (dwSize && pDdh)
{
WINE_DDEHEAD* wdh = NULL;
......
dlls/user32/dde_server.c
View file @ fb11803d
......@@ -625,7 +625,7 @@ static WDML_QUEUE_STATE WDML_ServerHandleAdvise(WDML_CONV* pConv, WDML_XACT* pXA
HDDEDATA hDdeData = 0;
BOOL fAck = TRUE;
pDdeAdvise = (DDEADVISE*)GlobalLock(pXAct->hMem);
pDdeAdvise = GlobalLock(pXAct->hMem);
uType = XTYP_ADVSTART |
(pDdeAdvise->fDeferUpd ? XTYPF_NODATA : 0) |
(pDdeAdvise->fAckReq ? XTYPF_ACKREQ : 0);
......@@ -835,7 +835,7 @@ static WDML_QUEUE_STATE WDML_ServerHandlePoke(WDML_CONV* pConv, WDML_XACT* pXAct
HDDEDATA hDdeData;
BOOL fBusy = FALSE, fAck = FALSE;
pDdePoke = (DDEPOKE*)GlobalLock(pXAct->hMem);
pDdePoke = GlobalLock(pXAct->hMem);
if (!pDdePoke)
{
return WDML_QS_ERROR;
......
dlls/user32/dialog.c
View file @ fb11803d
......@@ -694,7 +694,7 @@ HWND WINAPI CreateDialogParamA( HINSTANCE hInst, LPCSTR name, HWND owner,
LPCDLGTEMPLATEA ptr;
if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return 0;
if (!(ptr = (LPCDLGTEMPLATEA)LoadResource(hInst, hrsrc))) return 0;
if (!(ptr = LoadResource(hInst, hrsrc))) return 0;
return CreateDialogIndirectParamA( hInst, ptr, owner, dlgProc, param );
}
......@@ -709,7 +709,7 @@ HWND WINAPI CreateDialogParamW( HINSTANCE hInst, LPCWSTR name, HWND owner,
LPCDLGTEMPLATEA ptr;
if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return 0;
if (!(ptr = (LPCDLGTEMPLATEW)LoadResource(hInst, hrsrc))) return 0;
if (!(ptr = LoadResource(hInst, hrsrc))) return 0;
return CreateDialogIndirectParamW( hInst, ptr, owner, dlgProc, param );
}
......@@ -804,7 +804,7 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name,
LPCDLGTEMPLATEA ptr;
if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1;
if (!(ptr = (LPCDLGTEMPLATEA)LoadResource(hInst, hrsrc))) return -1;
if (!(ptr = LoadResource(hInst, hrsrc))) return -1;
hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, TRUE );
if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
return 0;
......@@ -822,7 +822,7 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name,
LPCDLGTEMPLATEW ptr;
if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1;
if (!(ptr = (LPCDLGTEMPLATEW)LoadResource(hInst, hrsrc))) return -1;
if (!(ptr = LoadResource(hInst, hrsrc))) return -1;
hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, TRUE );
if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
return 0;
......
dlls/user32/edit.c
View file @ fb11803d
......@@ -4998,7 +4998,7 @@ static void EDIT_WM_Paste(EDITSTATE *es)
OpenClipboard(es->hwndSelf);
if ((hsrc = GetClipboardData(CF_UNICODETEXT))) {
src = (LPWSTR)GlobalLock(hsrc);
src = GlobalLock(hsrc);
EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE);
GlobalUnlock(hsrc);
}
......
dlls/user32/tests/cursoricon.c
View file @ fb11803d
......@@ -232,7 +232,7 @@ static void test_CopyImage_Check(HBITMAP bitmap, UINT flags, INT copyWidth, INT
BOOL orig_is_dib;
BOOL copy_is_dib;
copy = (HBITMAP) CopyImage(bitmap, IMAGE_BITMAP, copyWidth, copyHeight, flags);
copy = CopyImage(bitmap, IMAGE_BITMAP, copyWidth, copyHeight, flags);
ok(copy != NULL, "CopyImage() failed\n");
if (copy != NULL)
{
......
dlls/user32/tests/dialog.c
View file @ fb11803d
......@@ -874,7 +874,7 @@ static void InitialFocusTest (void)
hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG", (LPSTR)RT_DIALOG);
hTemplate = LoadResource(g_hinst, hResource);
pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate);
pTemplate = LockResource(hTemplate);
g_hwndInitialFocusT1 = 0;
hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0);
......
dlls/user32/uitools.c
View file @ fb11803d
......@@ -1612,7 +1612,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp
break;
case DST_ICON:
ici = (CURSORICONINFO *)GlobalLock16((HGLOBAL16)lp);
ici = GlobalLock16((HGLOBAL16)lp);
if(!ici) return FALSE;
s.cx = ici->nWidth;
s.cy = ici->nHeight;
......
dlls/user32/wnd16.c
View file @ fb11803d
......@@ -1575,7 +1575,7 @@ LRESULT WINAPI DefMDIChildProc16( HWND16 hwnd, UINT16 message,
case WM_GETMINMAXINFO:
{
MINMAXINFO16 *mmi16 = (MINMAXINFO16 *)MapSL(lParam);
MINMAXINFO16 *mmi16 = MapSL(lParam);
MINMAXINFO mmi;
mmi.ptReserved.x = mmi16->ptReserved.x;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment