diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e94cd2bba0d..f5cdaecd9c1 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -1164,10 +1164,10 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc wc->cbClsExtra = classPtr->cbClsExtra; wc->cbWndExtra = classPtr->cbWndExtra; wc->hInstance = (hInstance == user32_module) ? 0 : hInstance; - wc->hIcon = (HICON)classPtr->hIcon; - wc->hIconSm = (HICON)classPtr->hIconSm; - wc->hCursor = (HCURSOR)classPtr->hCursor; - wc->hbrBackground = (HBRUSH)classPtr->hbrBackground; + wc->hIcon = classPtr->hIcon; + wc->hIconSm = classPtr->hIconSm; + wc->hCursor = classPtr->hCursor; + wc->hbrBackground = classPtr->hbrBackground; wc->lpszMenuName = CLASS_GetMenuNameW( classPtr ); wc->lpszClassName = name; atom = classPtr->atomName; diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 478e0c68d87..707d2bb8b1a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -838,7 +838,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, /* Transfer the bitmap bits to the CURSORICONINFO structure */ - GetBitmapBits( hAndBits, sizeAnd, (char *)(info + 1) ); + GetBitmapBits( hAndBits, sizeAnd, info + 1 ); GetBitmapBits( hXorBits, sizeXor, (char *)(info + 1) + sizeAnd ); GlobalUnlock16( hObj ); } @@ -1613,8 +1613,7 @@ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon ) 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) ); + hAndBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); hXorBits = CreateBitmap( ptr->nWidth, ptr->nHeight, ptr->bPlanes, ptr->bBitsPerPixel, (char *)(ptr + 1) + ptr->nHeight * get_bitmap_width_bytes(ptr->nWidth,1) ); @@ -1677,7 +1676,7 @@ HCURSOR WINAPI SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) /* Change the cursor shape only if it is visible */ if (thread_info->cursor_count >= 0) { - USER_Driver->pSetCursor( (CURSORICONINFO*)GlobalLock16(HCURSOR_16(hCursor)) ); + USER_Driver->pSetCursor(GlobalLock16(HCURSOR_16(hCursor))); GlobalUnlock16(HCURSOR_16(hCursor)); } return hOldCursor; @@ -1696,7 +1695,7 @@ INT WINAPI ShowCursor( BOOL bShow ) { if (++thread_info->cursor_count == 0) /* Show it */ { - USER_Driver->pSetCursor((CURSORICONINFO*)GlobalLock16(HCURSOR_16(thread_info->cursor))); + USER_Driver->pSetCursor(GlobalLock16(HCURSOR_16(thread_info->cursor))); GlobalUnlock16(HCURSOR_16(thread_info->cursor)); } } @@ -1977,7 +1976,7 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) } iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, height, - 1, 1, (char *)(ciconinfo + 1)); + 1, 1, ciconinfo + 1); GlobalUnlock16(HICON_16(hIcon)); @@ -2062,7 +2061,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) /* Some apps pass a color bitmap as a mask, convert it to b/w */ if (bmpAnd.bmBitsPixel == 1) { - GetBitmapBits( iconinfo->hbmMask, sizeAnd, (char*)(info + 1) ); + GetBitmapBits( iconinfo->hbmMask, sizeAnd, info + 1 ); } else { @@ -2085,7 +2084,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) DeleteDC( hdc_mem ); ReleaseDC( 0, hdc ); - GetBitmapBits( hbmp_mono, sizeAnd, (char*)(info + 1) ); + GetBitmapBits( hbmp_mono, sizeAnd, info + 1 ); DeleteObject( hbmp_mono ); } @@ -2232,8 +2231,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, (char *)(ptr + 1) + ptr->nHeight * get_bitmap_width_bytes(ptr->nWidth,1) ); - hAndBits = CreateBitmap ( ptr->nWidth, ptr->nHeight, - 1, 1, (char *)(ptr+1) ); + hAndBits = CreateBitmap ( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); oldFg = SetTextColor( hdc, RGB(0,0,0) ); oldBg = SetBkColor( hdc, RGB(255,255,255) ); diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 602a39fa954..b8b84510792 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -730,7 +730,7 @@ static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPVOID pData, DWORD cbD hglobal = pData; dh = GlobalLock(hglobal); cbData = GlobalSize(hglobal) - sizeof(DDE_DATAHANDLE_HEAD); - pData = (LPVOID)(dh + 1); + pData = dh + 1; GlobalUnlock(hglobal); } diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 3cbbae8346c..d0243c79d4b 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -1345,7 +1345,7 @@ HDDEDATA WINAPI DdeCreateDataHandle(DWORD idInst, LPBYTE pSrc, DWORD cb, DWORD c GlobalUnlock(hMem); TRACE("=> %p\n", hMem); - return (HDDEDATA)hMem; + return hMem; } /***************************************************************** @@ -1577,8 +1577,8 @@ HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, DWORD dwSize; HGLOBAL hMem = 0; - dwSize = GlobalSize((HGLOBAL)hDdeData) - sizeof(DDE_DATAHANDLE_HEAD); - pDdh = GlobalLock((HGLOBAL)hDdeData); + dwSize = GlobalSize(hDdeData) - sizeof(DDE_DATAHANDLE_HEAD); + pDdh = GlobalLock(hDdeData); if (dwSize && pDdh) { WINE_DDEHEAD* wdh = NULL; @@ -1628,7 +1628,7 @@ HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, wdh->cfFormat = pDdh->cfFormat; GlobalUnlock(hMem); } - GlobalUnlock((HGLOBAL)hDdeData); + GlobalUnlock(hDdeData); } return hMem; diff --git a/dlls/user32/ddeml16.c b/dlls/user32/ddeml16.c index 4d14e03ea00..375ee452f8f 100644 --- a/dlls/user32/ddeml16.c +++ b/dlls/user32/ddeml16.c @@ -291,7 +291,7 @@ HDDEDATA WINAPI DdeClientTransaction16(LPVOID pData, DWORD cbData, HCONV hConv, HSZ hszItem, UINT16 wFmt, UINT16 wType, DWORD dwTimeout, LPDWORD pdwResult) { - return DdeClientTransaction((LPBYTE)pData, cbData, hConv, hszItem, + return DdeClientTransaction(pData, cbData, hConv, hszItem, wFmt, wType, dwTimeout, pdwResult); } diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index ad4740b86b9..a060aadab5a 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -236,7 +236,7 @@ BOOL DESKTOP_SetPattern( LPCWSTR pattern ) int i; for (i = 0; i < 8; i++) pattern[i] = pat[i] & 0xffff; - hbitmap = CreateBitmap( 8, 8, 1, 1, (LPSTR)pattern ); + hbitmap = CreateBitmap( 8, 8, 1, 1, pattern ); hbrushPattern = CreatePatternBrush( hbitmap ); DeleteObject( hbitmap ); } diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 9dd908345e4..bbe3ee27847 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -205,7 +205,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, } else { - info->className = (LPCWSTR)p; + info->className = p; p += strlenW( info->className ) + 1; } @@ -216,7 +216,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, } else { - info->windowName = (LPCWSTR)p; + info->windowName = p; p += strlenW( info->windowName ) + 1; } @@ -393,7 +393,7 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) TRACE(" MENU %04x\n", LOWORD(result->menuName) ); break; default: - result->menuName = (LPCWSTR)p; + result->menuName = p; TRACE(" MENU %s\n", debugstr_w(result->menuName) ); p += strlenW( result->menuName ) + 1; break; @@ -413,7 +413,7 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) TRACE(" CLASS %04x\n", LOWORD(result->className) ); break; default: - result->className = (LPCWSTR)p; + result->className = p; TRACE(" CLASS %s\n", debugstr_w( result->className )); p += strlenW( result->className ) + 1; break; @@ -421,7 +421,7 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) /* Get the window caption */ - result->caption = (LPCWSTR)p; + result->caption = p; p += strlenW( result->caption ) + 1; TRACE(" CAPTION %s\n", debugstr_w( result->caption ) ); @@ -441,7 +441,7 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) result->weight = GET_WORD(p); p++; result->italic = LOBYTE(GET_WORD(p)); p++; } - result->faceName = (LPCWSTR)p; + result->faceName = p; p += strlenW( result->faceName ) + 1; TRACE(" FONT %d, %s, %d, %s\n", result->pointSize, debugstr_w( result->faceName ), diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 41f0f14119e..1d30f25b52b 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -223,7 +223,7 @@ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG /* copy the entries */ for( i=0; i < lpcid->idCount; i++ ) { - memcpy((void*)&(lpID->idEntries[i]),(void*)&(lpcid->idEntries[i]), sizeof(CURSORICONDIRENTRY) - 2); + memcpy(&lpID->idEntries[i], &lpcid->idEntries[i], sizeof(CURSORICONDIRENTRY) - 2); lpID->idEntries[i].wResId = i; } @@ -776,7 +776,7 @@ UINT WINAPI PrivateExtractIconExW ( cxsmicon = GetSystemMetrics(SM_CXSMICON); cysmicon = GetSystemMetrics(SM_CYSMICON); - ret = ICO_ExtractIconExW(lpwstrFile, (HICON*)hIcon, nIndex, 2, cxicon | (cxsmicon<<16), + ret = ICO_ExtractIconExW(lpwstrFile, hIcon, nIndex, 2, cxicon | (cxsmicon<<16), cyicon | (cysmicon<<16), NULL, LR_DEFAULTCOLOR); *phIconLarge = hIcon[0]; *phIconSmall = hIcon[1]; diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index bd1994c350d..0b0d7c4203d 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -379,7 +379,7 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA thread_info->hook = info->handle; thread_info->hook_unicode = info->next_unicode; - ret = call_hook_proc( (HOOKPROC)info->proc, info->id, code, wparam, lparam, + ret = call_hook_proc( info->proc, info->id, code, wparam, lparam, info->prev_unicode, info->next_unicode ); thread_info->hook = prev; thread_info->hook_unicode = prev_unicode; diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 9b2378d10d2..f7231f902bd 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2620,7 +2620,7 @@ static LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, if (msg == WM_CREATE) { CREATESTRUCTW *lpcs = (CREATESTRUCTW *)lParam; - if (lpcs->style & LBS_COMBOBOX) lphc = (LPHEADCOMBO)lpcs->lpCreateParams; + if (lpcs->style & LBS_COMBOBOX) lphc = lpcs->lpCreateParams; if (!LISTBOX_Create( hwnd, lphc )) return -1; TRACE("creating hwnd %p descr %p\n", hwnd, (void *)GetWindowLongPtrW( hwnd, 0 ) ); return 0; diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index fe70b805c83..7e017b0a712 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -2025,7 +2025,6 @@ static HWND MDI_MoreWindowsDialog(HWND hwnd) if (template == 0) return 0; - return (HWND) DialogBoxIndirectParamA(user32_module, - (const DLGTEMPLATE*) template, - hwnd, MDI_MoreWindowsDlgProc, (LPARAM) hwnd); + return (HWND) DialogBoxIndirectParamA(user32_module, template, hwnd, + MDI_MoreWindowsDlgProc, (LPARAM) hwnd); } diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index bb0ff39065b..ef2b37ef441 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4018,7 +4018,7 @@ HMENU WINAPI CreateMenu(void) HMENU hMenu; LPPOPUPMENU menu; if (!(hMenu = USER_HEAP_ALLOC( sizeof(POPUPMENU) ))) return 0; - menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu); + menu = USER_HEAP_LIN_ADDR(hMenu); ZeroMemory(menu, sizeof(POPUPMENU)); menu->wMagic = MENU_MAGIC; @@ -4354,7 +4354,7 @@ HMENU WINAPI LoadMenuA( HINSTANCE instance, LPCSTR name ) { HRSRC hrsrc = FindResourceA( instance, name, (LPSTR)RT_MENU ); if (!hrsrc) return 0; - return LoadMenuIndirectA( (LPCVOID)LoadResource( instance, hrsrc )); + return LoadMenuIndirectA( LoadResource( instance, hrsrc )); } @@ -4365,7 +4365,7 @@ HMENU WINAPI LoadMenuW( HINSTANCE instance, LPCWSTR name ) { HRSRC hrsrc = FindResourceW( instance, name, (LPWSTR)RT_MENU ); if (!hrsrc) return 0; - return LoadMenuIndirectW( (LPCVOID)LoadResource( instance, hrsrc )); + return LoadMenuIndirectW( LoadResource( instance, hrsrc )); } @@ -4376,7 +4376,7 @@ HMENU16 WINAPI LoadMenuIndirect16( LPCVOID template ) { HMENU hMenu; WORD version, offset; - LPCSTR p = (LPCSTR)template; + LPCSTR p = template; TRACE("(%p)\n", template ); version = GET_WORD(p); @@ -4405,7 +4405,7 @@ HMENU WINAPI LoadMenuIndirectW( LPCVOID template ) { HMENU hMenu; WORD version, offset; - LPCSTR p = (LPCSTR)template; + LPCSTR p = template; version = GET_WORD(p); p += sizeof(WORD); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 27c4df7895f..0d820011542 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -980,7 +980,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case WM_WINE_KEYBOARD_LL_HOOK: case WM_WINE_MOUSE_LL_HOOK: { - struct hook_extra_info *h_extra = (struct hook_extra_info *)*buffer; + struct hook_extra_info *h_extra = *buffer; minsize = sizeof(struct hook_extra_info) + (message == WM_WINE_KEYBOARD_LL_HOOK ? sizeof(KBDLLHOOKSTRUCT) @@ -1467,7 +1467,7 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes { if ((ptr = GlobalLock( (HGLOBAL)uiLo) )) { - DDEDATA *dde_data = (DDEDATA *)ptr; + DDEDATA *dde_data = ptr; TRACE("unused %d, fResponse %d, fRelease %d, fDeferUpd %d, fAckReq %d, cfFormat %d\n", dde_data->unused, dde_data->fResponse, dde_data->fRelease, dde_data->reserved, dde_data->fAckReq, dde_data->cfFormat); diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index d9cec530a41..868e3b00e44 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -337,8 +337,8 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message, LPMSGBOXPARAMSW mbp = (LPMSGBOXPARAMSW)lParam; SetWindowContextHelpId(hwnd, mbp->dwContextHelpId); hFont = MSGBOX_OnInit(hwnd, mbp); - SetPropA(hwnd, "WINE_MSGBOX_HFONT", (HANDLE)hFont); - SetPropA(hwnd, "WINE_MSGBOX_HELPCALLBACK", (HANDLE)mbp->lpfnMsgBoxCallback); + SetPropA(hwnd, "WINE_MSGBOX_HFONT", hFont); + SetPropA(hwnd, "WINE_MSGBOX_HELPCALLBACK", mbp->lpfnMsgBoxCallback); break; } diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 46625149455..57fa7b80b05 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -77,11 +77,9 @@ HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance,LPCWSTR lpTableName) DWORD size; if (HIWORD(lpTableName)) - TRACE_(accel)("%p '%s'\n", - (LPVOID)instance, (const char *)( lpTableName ) ); + TRACE_(accel)("%p '%s'\n", instance, (const char *)( lpTableName ) ); else - TRACE_(accel)("%p 0x%04x\n", - (LPVOID)instance, LOWORD(lpTableName) ); + TRACE_(accel)("%p 0x%04x\n", instance, LOWORD(lpTableName) ); if (!(hRsrc = FindResourceW( instance, lpTableName, (LPWSTR)RT_ACCELERATOR ))) { @@ -156,7 +154,7 @@ INT WINAPI CopyAcceleratorTableW(HACCEL src, LPACCEL dst, as far as possible. */ if((dst && (entries < 1)) || (src == NULL) || !accel) { WARN_(accel)("Application sent invalid parameters (%p %p %d).\n", - (LPVOID)src, (LPVOID)dst, entries); + src, dst, entries); return 0; } xsize = GlobalSize16(HACCEL_16(src))/sizeof(ACCEL16); diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index b27eb12326d..b243e27173c 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -156,8 +156,8 @@ static SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ) if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return NULL; switch(nBar) { - case SB_HORZ: infoPtr = (SCROLLBAR_INFO *)wndPtr->pHScroll; break; - case SB_VERT: infoPtr = (SCROLLBAR_INFO *)wndPtr->pVScroll; break; + case SB_HORZ: infoPtr = wndPtr->pHScroll; break; + case SB_VERT: infoPtr = wndPtr->pVScroll; break; case SB_CTL: infoPtr = (SCROLLBAR_INFO *)wndPtr->wExtra; break; case SB_BOTH: WARN("with SB_BOTH\n"); break; } diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 5ee9db4e8a7..4e8091bda5a 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -151,7 +151,7 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) CURSORICONINFO * info; if ((style & SS_TYPEMASK) != SS_ICON) return 0; - info = hicon?(CURSORICONINFO *) GlobalLock16(HICON_16(hicon)):NULL; + info = hicon ? GlobalLock16(HICON_16(hicon)) : NULL; if (hicon && !info) { WARN("hicon != 0, but info == 0\n"); return 0; @@ -805,7 +805,7 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) GetClientRect( hwnd, &rc ); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); - info = hIcon ? (CURSORICONINFO *)GlobalLock16(HICON_16(hIcon)) : NULL; + info = hIcon ? GlobalLock16(HICON_16(hIcon)) : NULL; if (!hIcon || !info) { FillRect(hdc, &rc, hbrush); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8ecfed42a58..82940e4b23c 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1389,7 +1389,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, break; case SPI_SETDESKWALLPAPER: /* 20 */ - if (!pvParam || !SetDeskWallPaper( (LPSTR)pvParam )) return FALSE; + if (!pvParam || !SetDeskWallPaper( pvParam )) return FALSE; SYSPARAMS_Save(SPI_SETDESKWALLPAPER_REGKEY, SPI_SETDESKWALLPAPER_VALNAME, pvParam, fWinIni); break; @@ -1404,7 +1404,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, buf, sizeof(buf)/sizeof(WCHAR) ); ret = DESKTOP_SetPattern( buf ); } else - ret = DESKTOP_SetPattern( (LPWSTR)pvParam ); + ret = DESKTOP_SetPattern( pvParam ); break; case SPI_GETKEYBOARDDELAY: @@ -1554,7 +1554,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETICONTITLELOGFONT: /* 34 */ if( uiParam == sizeof(LOGFONTW)) { ret = SYSPARAMS_SaveLogFont( SPI_SETICONTITLELOGFONT_REGKEY, - SPI_SETICONTITLELOGFONT_VALNAME, (LOGFONTW *)pvParam, fWinIni); + SPI_SETICONTITLELOGFONT_VALNAME, pvParam, fWinIni); if( ret) { icon_metrics.lfFont = *(LOGFONTW *)pvParam; spi_loaded[SPI_SETICONTITLELOGFONT_IDX] = TRUE; @@ -1750,7 +1750,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, if (!pvParam) return FALSE; spi_idx = SPI_SETWORKAREA_IDX; - CopyRect( &work_area, (RECT *)pvParam ); + CopyRect( &work_area, pvParam ); spi_loaded[spi_idx] = TRUE; break; } @@ -1768,7 +1768,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, EnumDisplayMonitors( 0, NULL, enum_monitors, (LPARAM)&work_area ); spi_loaded[spi_idx] = TRUE; } - CopyRect( (RECT *)pvParam, &work_area ); + CopyRect( pvParam, &work_area ); TRACE("work area %s\n", wine_dbgstr_rect( &work_area )); break; } @@ -1777,7 +1777,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETFILTERKEYS: /* 50 */ { - LPFILTERKEYS lpFilterKeys = (LPFILTERKEYS)pvParam; + LPFILTERKEYS lpFilterKeys = pvParam; WARN("SPI_GETFILTERKEYS not fully implemented\n"); if (lpFilterKeys && lpFilterKeys->cbSize == sizeof(FILTERKEYS)) { @@ -1798,7 +1798,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETTOGGLEKEYS: /* 52 */ { - LPTOGGLEKEYS lpToggleKeys = (LPTOGGLEKEYS)pvParam; + LPTOGGLEKEYS lpToggleKeys = pvParam; WARN("SPI_GETTOGGLEKEYS not fully implemented\n"); if (lpToggleKeys && lpToggleKeys->cbSize == sizeof(TOGGLEKEYS)) { @@ -1815,7 +1815,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETMOUSEKEYS: /* 54 */ { - LPMOUSEKEYS lpMouseKeys = (LPMOUSEKEYS)pvParam; + LPMOUSEKEYS lpMouseKeys = pvParam; WARN("SPI_GETMOUSEKEYS not fully implemented\n"); if (lpMouseKeys && lpMouseKeys->cbSize == sizeof(MOUSEKEYS)) { @@ -1851,7 +1851,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETSTICKYKEYS: /* 58 */ { - LPSTICKYKEYS lpStickyKeys = (LPSTICKYKEYS)pvParam; + LPSTICKYKEYS lpStickyKeys = pvParam; WARN("SPI_GETSTICKYKEYS not fully implemented\n"); if (lpStickyKeys && lpStickyKeys->cbSize == sizeof(STICKYKEYS)) { @@ -1868,7 +1868,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETACCESSTIMEOUT: /* 60 */ { - LPACCESSTIMEOUT lpAccessTimeout = (LPACCESSTIMEOUT)pvParam; + LPACCESSTIMEOUT lpAccessTimeout = pvParam; WARN("SPI_GETACCESSTIMEOUT not fully implemented\n"); if (lpAccessTimeout && lpAccessTimeout->cbSize == sizeof(ACCESSTIMEOUT)) { @@ -1886,7 +1886,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETSERIALKEYS: /* 62 WINVER >= 0x400 */ { - LPSERIALKEYSW lpSerialKeysW = (LPSERIALKEYSW)pvParam; + LPSERIALKEYSW lpSerialKeysW = pvParam; WARN("SPI_GETSERIALKEYS not fully implemented\n"); if (lpSerialKeysW && lpSerialKeysW->cbSize == sizeof(SERIALKEYSW)) { @@ -1907,7 +1907,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETSOUNDSENTRY: /* 64 */ { - LPSOUNDSENTRYW lpSoundSentryW = (LPSOUNDSENTRYW)pvParam; + LPSOUNDSENTRYW lpSoundSentryW = pvParam; WARN("SPI_GETSOUNDSENTRY not fully implemented\n"); if (lpSoundSentryW && lpSoundSentryW->cbSize == sizeof(SOUNDSENTRYW)) { @@ -1934,7 +1934,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETHIGHCONTRAST: /* 66 WINVER >= 0x400 */ { - LPHIGHCONTRASTW lpHighContrastW = (LPHIGHCONTRASTW)pvParam; + LPHIGHCONTRASTW lpHighContrastW = pvParam; WARN("SPI_GETHIGHCONTRAST not fully implemented\n"); if (lpHighContrastW && lpHighContrastW->cbSize == sizeof(HIGHCONTRASTW)) { @@ -1980,7 +1980,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETANIMATION: /* 72 WINVER >= 0x400 */ { - LPANIMATIONINFO lpAnimInfo = (LPANIMATIONINFO)pvParam; + LPANIMATIONINFO lpAnimInfo = pvParam; /* Tell it "disabled" */ if (lpAnimInfo && lpAnimInfo->cbSize == sizeof(ANIMATIONINFO)) @@ -2212,12 +2212,12 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, if (SYSPARAMS_Load(SPI_SETDESKWALLPAPER_REGKEY, SPI_SETDESKWALLPAPER_VALNAME, buf, sizeof(buf))) { - lstrcpynW((WCHAR*)pvParam, buf, uiParam); + lstrcpynW(pvParam, buf, uiParam); } else { /* Return an empty string */ - memset((WCHAR*)pvParam, 0, uiParam); + memset(pvParam, 0, uiParam); } break; @@ -2563,7 +2563,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam, ret = SystemParametersInfoA( uAction, uParam, lpvParam ? &tmp : NULL, fuWinIni ); if (ret && lpvParam) { - RECT16 *r16 = (RECT16 *)lpvParam; + RECT16 *r16 = lpvParam; r16->left = tmp.left; r16->top = tmp.top; r16->right = tmp.right; @@ -2607,8 +2607,8 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, { WCHAR buffer[256]; if (pvParam) - if (!MultiByteToWideChar( CP_ACP, 0, (LPSTR)pvParam, -1, - buffer, sizeof(buffer)/sizeof(WCHAR) )) + if (!MultiByteToWideChar( CP_ACP, 0, pvParam, -1, buffer, + sizeof(buffer)/sizeof(WCHAR) )) buffer[sizeof(buffer)/sizeof(WCHAR)-1] = 0; ret = SystemParametersInfoW( uiAction, uiParam, pvParam ? buffer : NULL, fuWinIni ); break; @@ -2619,14 +2619,14 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, LOGFONTW tmp; ret = SystemParametersInfoW( uiAction, uiParam, pvParam ? &tmp : NULL, fuWinIni ); if (ret && pvParam) - SYSPARAMS_LogFont32WTo32A( &tmp, (LPLOGFONTA)pvParam ); + SYSPARAMS_LogFont32WTo32A( &tmp, pvParam ); break; } case SPI_GETNONCLIENTMETRICS: /* 41 WINVER >= 0x400 */ { NONCLIENTMETRICSW tmp; - LPNONCLIENTMETRICSA lpnmA = (LPNONCLIENTMETRICSA)pvParam; + LPNONCLIENTMETRICSA lpnmA = pvParam; if (lpnmA && lpnmA->cbSize == sizeof(NONCLIENTMETRICSA)) { tmp.cbSize = sizeof(NONCLIENTMETRICSW); @@ -2642,7 +2642,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, case SPI_SETNONCLIENTMETRICS: /* 42 WINVER >= 0x400 */ { NONCLIENTMETRICSW tmp; - LPNONCLIENTMETRICSA lpnmA = (LPNONCLIENTMETRICSA)pvParam; + LPNONCLIENTMETRICSA lpnmA = pvParam; if (lpnmA && lpnmA->cbSize == sizeof(NONCLIENTMETRICSA)) { tmp.cbSize = sizeof(NONCLIENTMETRICSW); @@ -2657,7 +2657,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, case SPI_GETICONMETRICS: /* 45 WINVER >= 0x400 */ { ICONMETRICSW tmp; - LPICONMETRICSA lpimA = (LPICONMETRICSA)pvParam; + LPICONMETRICSA lpimA = pvParam; if (lpimA && lpimA->cbSize == sizeof(ICONMETRICSA)) { tmp.cbSize = sizeof(ICONMETRICSW); @@ -2678,7 +2678,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, case SPI_SETICONMETRICS: /* 46 WINVER >= 0x400 */ { ICONMETRICSW tmp; - LPICONMETRICSA lpimA = (LPICONMETRICSA)pvParam; + LPICONMETRICSA lpimA = pvParam; if (lpimA && lpimA->cbSize == sizeof(ICONMETRICSA)) { tmp.cbSize = sizeof(ICONMETRICSW); @@ -2696,7 +2696,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, case SPI_GETHIGHCONTRAST: /* 66 WINVER >= 0x400 */ { HIGHCONTRASTW tmp; - LPHIGHCONTRASTA lphcA = (LPHIGHCONTRASTA)pvParam; + LPHIGHCONTRASTA lphcA = pvParam; if (lphcA && lphcA->cbSize == sizeof(HIGHCONTRASTA)) { tmp.cbSize = sizeof(HIGHCONTRASTW); diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 873328dac0a..54dab138da7 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -764,7 +764,7 @@ static BOOL UITOOLS95_DFC_ButtonRadio(HDC dc, LPRECT r, UINT uFlags) if(BorderShrink < 1) BorderShrink = 1; if((uFlags & 0xff) == DFCS_BUTTONRADIOIMAGE) - FillRect(dc, r, (HBRUSH)GetStockObject(BLACK_BRUSH)); + FillRect(dc, r, GetStockObject(BLACK_BRUSH)); xc = myr.left + SmallDiam - SmallDiam/2; yc = myr.top + SmallDiam - SmallDiam/2; @@ -1145,7 +1145,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) /* without luck. It seems as if this behavior is inherited from the */ /* win31 DFC() implementation... (you remember, B/W menus). */ - FillRect(dc, r, (HBRUSH)GetStockObject(WHITE_BRUSH)); + FillRect(dc, r, GetStockObject(WHITE_BRUSH)); hbsave = SelectObject(dc, GetStockObject(BLACK_BRUSH)); hpsave = SelectObject(dc, GetStockObject(BLACK_PEN)); @@ -1667,7 +1667,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp rc.left = rc.top = 0; rc.right = cx; rc.bottom = cy; - if(!FillRect(memdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH))) goto cleanup; + if(!FillRect(memdc, &rc, GetStockObject(WHITE_BRUSH))) goto cleanup; SetBkColor(memdc, RGB(255, 255, 255)); SetTextColor(memdc, RGB(0, 0, 0)); hfsave = SelectObject(memdc, GetCurrentObject(hdc, OBJ_FONT)); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 08649e898a2..ab0ab59405d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -983,7 +983,7 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags mdi_cs.style = cs->style; mdi_cs.lParam = (LPARAM)cs->lpCreateParams; - cs->lpCreateParams = (LPVOID)&mdi_cs; + cs->lpCreateParams = &mdi_cs; if (GetWindowLongW(cs->hwndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) { diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index bb08e1eba17..42904d98cd0 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2063,7 +2063,7 @@ HDWP WINAPI BeginDeferWindowPos( INT count ) handle = USER_HEAP_ALLOC( sizeof(DWP) + (count-1)*sizeof(WINDOWPOS) ); if (!handle) return 0; - pDWP = (DWP *) USER_HEAP_LIN_ADDR( handle ); + pDWP = USER_HEAP_LIN_ADDR( handle ); pDWP->actualCount = 0; pDWP->suggestedCount = count; pDWP->valid = TRUE; @@ -2134,7 +2134,7 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, retvalue = 0; goto END; } - pDWP = (DWP *) USER_HEAP_LIN_ADDR( newhdwp ); + pDWP = USER_HEAP_LIN_ADDR( newhdwp ); pDWP->suggestedCount++; } pDWP->winPos[pDWP->actualCount].hwnd = hwnd; @@ -2164,7 +2164,7 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) TRACE("%p\n", hdwp); - pDWP = (DWP *) USER_HEAP_LIN_ADDR( hdwp ); + pDWP = USER_HEAP_LIN_ADDR( hdwp ); if (!pDWP) return FALSE; for (i = 0, winpos = pDWP->winPos; res && i < pDWP->actualCount; i++, winpos++) { diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index dda649bbfe7..2a883291019 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1641,7 +1641,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT if (mdi_child) { - MDICREATESTRUCTA *mdi_cs = (MDICREATESTRUCTA *)cs32->lpCreateParams; + MDICREATESTRUCTA *mdi_cs = cs32->lpCreateParams; MDICREATESTRUCT32Ato16( mdi_cs, &mdi_cs16 ); mdi_cs16.szTitle = MapLS( mdi_cs->szTitle ); mdi_cs16.szClass = MapLS( mdi_cs->szClass ); @@ -1680,7 +1680,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT ret = callback( HWND_16(hwnd), msg, ((HWND)lParam == hwnd), MAKELPARAM( LOWORD(lParam), LOWORD(wParam) ), result, arg ); else - ret = callback( HWND_16(hwnd), msg, HWND_16( (HWND)wParam ), 0, result, arg ); + ret = callback( HWND_16(hwnd), msg, HWND_16( wParam ), 0, result, arg ); break; case WM_MDIGETACTIVE: ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); @@ -1916,7 +1916,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); break; case WM_ACTIVATEAPP: - ret = callback( HWND_16(hwnd), msg, wParam, HTASK_16( (HANDLE)lParam ), result, arg ); + ret = callback( HWND_16(hwnd), msg, wParam, HTASK_16( lParam ), result, arg ); break; case WM_PAINT: if (IsIconic( hwnd ) && GetClassLongPtrW( hwnd, GCLP_HICON )) @@ -1932,7 +1932,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case WM_DDE_TERMINATE: case WM_DDE_UNADVISE: case WM_DDE_REQUEST: - ret = callback( HWND_16(hwnd), msg, HWND_16((HWND)wParam), lParam, result, arg ); + ret = callback( HWND_16(hwnd), msg, HWND_16(wParam), lParam, result, arg ); break; case WM_DDE_ADVISE: case WM_DDE_DATA: @@ -1943,7 +1943,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT UnpackDDElParam( msg, lParam, &lo32, &hi ); if (lo32 && !(lo16 = convert_handle_32_to_16(lo32, GMEM_DDESHARE))) break; - ret = callback( HWND_16(hwnd), msg, HWND_16((HWND)wParam), + ret = callback( HWND_16(hwnd), msg, HWND_16(wParam), MAKELPARAM(lo16, hi), result, arg ); } break; /* FIXME don't know how to free allocated memory (handle) !! */ @@ -1975,7 +1975,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT hi = convert_handle_32_to_16(hi, GMEM_DDESHARE); break; } - ret = callback( HWND_16(hwnd), msg, HWND_16((HWND)wParam), + ret = callback( HWND_16(hwnd), msg, HWND_16(wParam), MAKELPARAM(lo, hi), result, arg ); } break; /* FIXME don't know how to free allocated memory (handle) !! */