ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Remove superfluous casts of void pointers.

This commit is contained in:
Michael Stefaniuc 2008-11-04 23:35:56 +01:00 committed by Alexandre Julliard
parent be2570f7a0
commit fb11803d19
10 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/user32/cursoricon.c
View File

@ -828,7 +828,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi,
{ {
CURSORICONINFO *info; CURSORICONINFO *info;
info = (CURSORICONINFO *)GlobalLock16( hObj ); info = GlobalLock16( hObj );
info->ptHotSpot.x = hotspot.x; info->ptHotSpot.x = hotspot.x;
info->ptHotSpot.y = hotspot.y; info->ptHotSpot.y = hotspot.y;
info->nWidth = bmpXor.bmWidth; info->nWidth = bmpXor.bmWidth;
@ -992,7 +992,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name,
/* Find the best entry in the directory */ /* Find the best entry in the directory */
if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; if (!(handle = LoadResource( hInstance, hRsrc ))) return 0;
if (!(dir = (CURSORICONDIR*)LockResource( handle ))) return 0; if (!(dir = LockResource( handle ))) return 0;
if (fCursor) if (fCursor)
dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, 1); dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, 1);
else else
@ -1013,7 +1013,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name,
return hIcon; return hIcon;
if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; if (!(handle = LoadResource( hInstance, hRsrc ))) return 0;
bits = (LPBYTE)LockResource( handle ); bits = LockResource( handle );
hIcon = CreateIconFromResourceEx( bits, dwBytesInRes, hIcon = CreateIconFromResourceEx( bits, dwBytesInRes,
!fCursor, 0x00030000, width, height, loadflags); !fCursor, 0x00030000, width, height, loadflags);
FreeResource( handle ); FreeResource( handle );
@ -1038,12 +1038,12 @@ static HICON CURSORICON_Copy( HINSTANCE16 hInst16, HICON hIcon )
HICON16 hOld = HICON_16(hIcon); HICON16 hOld = HICON_16(hIcon);
HICON16 hNew; HICON16 hNew;
if (!(ptrOld = (char *)GlobalLock16( hOld ))) return 0; if (!(ptrOld = GlobalLock16( hOld ))) return 0;
if (hInst16 && !(hInst16 = GetExePtr( hInst16 ))) return 0; if (hInst16 && !(hInst16 = GetExePtr( hInst16 ))) return 0;
size = GlobalSize16( hOld ); size = GlobalSize16( hOld );
hNew = GlobalAlloc16( GMEM_MOVEABLE, size ); hNew = GlobalAlloc16( GMEM_MOVEABLE, size );
FarSetOwner16( hNew, hInst16 ); FarSetOwner16( hNew, hInst16 );
ptrNew = (char *)GlobalLock16( hNew ); ptrNew = GlobalLock16( hNew );
memcpy( ptrNew, ptrOld, size ); memcpy( ptrNew, ptrOld, size );
GlobalUnlock16( hOld ); GlobalUnlock16( hOld );
GlobalUnlock16( hNew ); GlobalUnlock16( hNew );
@ -1134,7 +1134,7 @@ static HICON CURSORICON_ExtCopy(HICON hIcon, UINT nType,
{ {
return 0; return 0;
} }
if (!(pDir = (CURSORICONDIR*)LockResource( hMem ))) if (!(pDir = LockResource( hMem )))
{ {
return 0; return 0;
} }
@ -1172,7 +1172,7 @@ static HICON CURSORICON_ExtCopy(HICON hIcon, UINT nType,
return 0; return 0;
} }
pBits = (LPBYTE)LockResource( hMem ); pBits = LockResource( hMem );
if(nFlags & LR_DEFAULTSIZE) if(nFlags & LR_DEFAULTSIZE)
{ {
@ -1311,7 +1311,7 @@ HGLOBAL16 WINAPI CreateCursorIconIndirect16( HINSTANCE16 hInstance,
sizeof(CURSORICONINFO) + sizeXor + sizeAnd))) sizeof(CURSORICONINFO) + sizeXor + sizeAnd)))
return 0; return 0;
FarSetOwner16( handle, hInstance ); FarSetOwner16( handle, hInstance );
ptr = (char *)GlobalLock16( handle ); ptr = GlobalLock16( handle );
memcpy( ptr, info, sizeof(*info) ); memcpy( ptr, info, sizeof(*info) );
memcpy( ptr + sizeof(CURSORICONINFO), lpANDbits, sizeAnd ); memcpy( ptr + sizeof(CURSORICONINFO), lpANDbits, sizeAnd );
memcpy( ptr + sizeof(CURSORICONINFO) + sizeAnd, lpXORbits, sizeXor ); 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); 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; if (!(hMemDC = CreateCompatibleDC( hdc ))) return FALSE;
hAndBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1, hAndBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1,
(char *)(ptr+1) ); (char *)(ptr+1) );
@ -1639,7 +1639,7 @@ INT WINAPI LookupIconIdFromDirectory( LPBYTE dir, BOOL bIcon )
*/ */
WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType ) WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType )
{ {
LPBYTE lpDir = (LPBYTE)GlobalLock16(hResource); LPBYTE lpDir = GlobalLock16(hResource);
TRACE_(cursor)("hRes=%04x, entries=%i\n", TRACE_(cursor)("hRes=%04x, entries=%i\n",
hResource, lpDir ? ((CURSORICONDIR*)lpDir)->idCount : 0); hResource, lpDir ? ((CURSORICONDIR*)lpDir)->idCount : 0);
@ -1675,7 +1675,7 @@ HGLOBAL16 WINAPI LoadCursorIconHandler16( HGLOBAL16 hResource, HMODULE16 hModule
*/ */
HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew ) HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew )
{ {
LPBYTE bits = (LPBYTE)LockResource16( hResource ); LPBYTE bits = LockResource16( hResource );
TRACE_(cursor)("hRes=%04x\n",hResource); TRACE_(cursor)("hRes=%04x\n",hResource);
@ -1844,7 +1844,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
{ {
CURSORICONINFO *info; CURSORICONINFO *info;
info = (CURSORICONINFO *)GlobalLock16( hObj ); info = GlobalLock16( hObj );
/* If we are creating an icon, the hotspot is unused */ /* If we are creating an icon, the hotspot is unused */
if (iconinfo->fIcon) if (iconinfo->fIcon)
@ -1983,7 +1983,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon,
INT cxWidth, INT cyWidth, UINT istep, INT cxWidth, INT cyWidth, UINT istep,
HBRUSH hbr, UINT flags ) HBRUSH hbr, UINT flags )
{ {
CURSORICONINFO *ptr = (CURSORICONINFO *)GlobalLock16(HICON_16(hIcon)); CURSORICONINFO *ptr = GlobalLock16(HICON_16(hIcon));
HDC hDC_off = 0, hMemDC; HDC hDC_off = 0, hMemDC;
BOOL result = FALSE, DoOffscreen; BOOL result = FALSE, DoOffscreen;
HBITMAP hB_off = 0, hOld = 0; 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 (!(hRsrc = FindResourceW( instance, name, (LPWSTR)RT_BITMAP ))) return 0;
if (!(handle = LoadResource( instance, hRsrc ))) 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 else
{ {

4
dlls/user32/dde_client.c
View File

@ -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 */ /* FIXME: hMem is unfreed for now... should be deleted in server */
/* pack DdeAdvise */ /* pack DdeAdvise */
pDdeAdvise = (DDEADVISE*)GlobalLock(pXAct->hMem); pDdeAdvise = GlobalLock(pXAct->hMem);
pDdeAdvise->fAckReq = (wType & XTYPF_ACKREQ) ? TRUE : FALSE; pDdeAdvise->fAckReq = (wType & XTYPF_ACKREQ) ? TRUE : FALSE;
pDdeAdvise->fDeferUpd = (wType & XTYPF_NODATA) ? TRUE : FALSE; pDdeAdvise->fDeferUpd = (wType & XTYPF_NODATA) ? TRUE : FALSE;
pDdeAdvise->cfFormat = wFmt; pDdeAdvise->cfFormat = wFmt;
@ -719,7 +719,7 @@ static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPVOID pData, DWORD cbD
if (cbData == (DWORD)-1) if (cbData == (DWORD)-1)
{ {
hglobal = pData; hglobal = pData;
dh = (DDE_DATAHANDLE_HEAD *)GlobalLock(hglobal); dh = GlobalLock(hglobal);
cbData = GlobalSize(hglobal) - sizeof(DDE_DATAHANDLE_HEAD); cbData = GlobalSize(hglobal) - sizeof(DDE_DATAHANDLE_HEAD);
pData = (LPVOID)(dh + 1); pData = (LPVOID)(dh + 1);
GlobalUnlock(hglobal); GlobalUnlock(hglobal);

8
dlls/user32/dde_misc.c
View File

@ -1295,7 +1295,7 @@ HDDEDATA WINAPI DdeCreateDataHandle(DWORD idInst, LPBYTE pSrc, DWORD cb, DWORD c
return 0; return 0;
} }
pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock(hMem); pDdh = GlobalLock(hMem);
if (!pDdh) if (!pDdh)
{ {
GlobalFree(hMem); GlobalFree(hMem);
@ -1409,7 +1409,7 @@ LPBYTE WINAPI DdeAccessData(HDDEDATA hData, LPDWORD pcbDataSize)
TRACE("(%p,%p)\n", hData, pcbDataSize); TRACE("(%p,%p)\n", hData, pcbDataSize);
pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock(hMem); pDdh = GlobalLock(hMem);
if (pDdh == NULL) if (pDdh == NULL)
{ {
ERR("Failed on GlobalLock(%p)\n", hMem); ERR("Failed on GlobalLock(%p)\n", hMem);
@ -1457,7 +1457,7 @@ BOOL WDML_IsAppOwned(HDDEDATA hData)
DDE_DATAHANDLE_HEAD* pDdh; DDE_DATAHANDLE_HEAD* pDdh;
BOOL ret = FALSE; BOOL ret = FALSE;
pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock(hData); pDdh = GlobalLock(hData);
if (pDdh != NULL) if (pDdh != NULL)
{ {
ret = pDdh->bAppOwned; ret = pDdh->bAppOwned;
@ -1546,7 +1546,7 @@ HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease,
HGLOBAL hMem = 0; HGLOBAL hMem = 0;
dwSize = GlobalSize((HGLOBAL)hDdeData) - sizeof(DDE_DATAHANDLE_HEAD); dwSize = GlobalSize((HGLOBAL)hDdeData) - sizeof(DDE_DATAHANDLE_HEAD);
pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock((HGLOBAL)hDdeData); pDdh = GlobalLock((HGLOBAL)hDdeData);
if (dwSize && pDdh) if (dwSize && pDdh)
{ {
WINE_DDEHEAD* wdh = NULL; WINE_DDEHEAD* wdh = NULL;

4
dlls/user32/dde_server.c
View File

@ -625,7 +625,7 @@ static WDML_QUEUE_STATE WDML_ServerHandleAdvise(WDML_CONV* pConv, WDML_XACT* pXA
HDDEDATA hDdeData = 0; HDDEDATA hDdeData = 0;
BOOL fAck = TRUE; BOOL fAck = TRUE;
pDdeAdvise = (DDEADVISE*)GlobalLock(pXAct->hMem); pDdeAdvise = GlobalLock(pXAct->hMem);
uType = XTYP_ADVSTART | uType = XTYP_ADVSTART |
(pDdeAdvise->fDeferUpd ? XTYPF_NODATA : 0) | (pDdeAdvise->fDeferUpd ? XTYPF_NODATA : 0) |
(pDdeAdvise->fAckReq ? XTYPF_ACKREQ : 0); (pDdeAdvise->fAckReq ? XTYPF_ACKREQ : 0);
@ -835,7 +835,7 @@ static WDML_QUEUE_STATE WDML_ServerHandlePoke(WDML_CONV* pConv, WDML_XACT* pXAct
HDDEDATA hDdeData; HDDEDATA hDdeData;
BOOL fBusy = FALSE, fAck = FALSE; BOOL fBusy = FALSE, fAck = FALSE;
pDdePoke = (DDEPOKE*)GlobalLock(pXAct->hMem); pDdePoke = GlobalLock(pXAct->hMem);
if (!pDdePoke) if (!pDdePoke)
{ {
return WDML_QS_ERROR; return WDML_QS_ERROR;

8
dlls/user32/dialog.c
View File

@ -694,7 +694,7 @@ HWND WINAPI CreateDialogParamA( HINSTANCE hInst, LPCSTR name, HWND owner,
LPCDLGTEMPLATEA ptr; LPCDLGTEMPLATEA ptr;
if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return 0; 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 ); return CreateDialogIndirectParamA( hInst, ptr, owner, dlgProc, param );
} }
@ -709,7 +709,7 @@ HWND WINAPI CreateDialogParamW( HINSTANCE hInst, LPCWSTR name, HWND owner,
LPCDLGTEMPLATEA ptr; LPCDLGTEMPLATEA ptr;
if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return 0; 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 ); return CreateDialogIndirectParamW( hInst, ptr, owner, dlgProc, param );
} }
@ -804,7 +804,7 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name,
LPCDLGTEMPLATEA ptr; LPCDLGTEMPLATEA ptr;
if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; 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 ); hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, TRUE );
if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
return 0; return 0;
@ -822,7 +822,7 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name,
LPCDLGTEMPLATEW ptr; LPCDLGTEMPLATEW ptr;
if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; 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 ); hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, TRUE );
if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
return 0; return 0;

2
dlls/user32/edit.c
View File

@ -4998,7 +4998,7 @@ static void EDIT_WM_Paste(EDITSTATE *es)
OpenClipboard(es->hwndSelf); OpenClipboard(es->hwndSelf);
if ((hsrc = GetClipboardData(CF_UNICODETEXT))) { if ((hsrc = GetClipboardData(CF_UNICODETEXT))) {
src = (LPWSTR)GlobalLock(hsrc); src = GlobalLock(hsrc);
EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE); EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE);
GlobalUnlock(hsrc); GlobalUnlock(hsrc);
} }

2
dlls/user32/tests/cursoricon.c
View File

@ -232,7 +232,7 @@ static void test_CopyImage_Check(HBITMAP bitmap, UINT flags, INT copyWidth, INT
BOOL orig_is_dib; BOOL orig_is_dib;
BOOL copy_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"); ok(copy != NULL, "CopyImage() failed\n");
if (copy != NULL) if (copy != NULL)
{ {

2
dlls/user32/tests/dialog.c
View File

@ -874,7 +874,7 @@ static void InitialFocusTest (void)
hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG", (LPSTR)RT_DIALOG); hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG", (LPSTR)RT_DIALOG);
hTemplate = LoadResource(g_hinst, hResource); hTemplate = LoadResource(g_hinst, hResource);
pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate); pTemplate = LockResource(hTemplate);
g_hwndInitialFocusT1 = 0; g_hwndInitialFocusT1 = 0;
hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0);

2
dlls/user32/uitools.c
View File

@ -1612,7 +1612,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp
break; break;
case DST_ICON: case DST_ICON:
ici = (CURSORICONINFO *)GlobalLock16((HGLOBAL16)lp); ici = GlobalLock16((HGLOBAL16)lp);
if(!ici) return FALSE; if(!ici) return FALSE;
s.cx = ici->nWidth; s.cx = ici->nWidth;
s.cy = ici->nHeight; s.cy = ici->nHeight;

2
dlls/user32/wnd16.c
View File

@ -1575,7 +1575,7 @@ LRESULT WINAPI DefMDIChildProc16( HWND16 hwnd, UINT16 message,
case WM_GETMINMAXINFO: case WM_GETMINMAXINFO:
{ {
MINMAXINFO16 *mmi16 = (MINMAXINFO16 *)MapSL(lParam); MINMAXINFO16 *mmi16 = MapSL(lParam);
MINMAXINFO mmi; MINMAXINFO mmi;
mmi.ptReserved.x = mmi16->ptReserved.x; mmi.ptReserved.x = mmi16->ptReserved.x;