From 29565d558fad4dd3be9a5826d289eceef29f2504 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Fri, 11 Apr 2008 16:56:08 +0900 Subject: [PATCH] user32: Fix Win64 warnings. --- dlls/user32/exticon.c | 2 +- dlls/user32/listbox.c | 2 +- dlls/user32/sysparams.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index e25e9c9a91e..3d28f4c474f 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -259,7 +259,7 @@ static BOOL CALLBACK extract_icons_callback(HMODULE hModule, LPCWSTR pwszType, L LONG_PTR lParam) { struct extract_icons_state *pState = (struct extract_icons_state *)lParam; - INT idCurrent = (INT)pwszName; + INT idCurrent = LOWORD(pwszName); /* If the handle array pointer is NULL, we just count the number of icons in the module. */ if (!pState->pahIcon) { diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 0b318fa7dfb..80ff0ac11de 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2607,7 +2607,7 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, CREATESTRUCTW *lpcs = (CREATESTRUCTW *)lParam; if (lpcs->style & LBS_COMBOBOX) lphc = (LPHEADCOMBO)lpcs->lpCreateParams; if (!LISTBOX_Create( hwnd, lphc )) return -1; - TRACE("creating wnd=%p descr=%x\n", hwnd, GetWindowLongPtrW( hwnd, 0 ) ); + TRACE("creating hwnd %p descr %p\n", hwnd, (void *)GetWindowLongPtrW( hwnd, 0 ) ); return 0; } /* Ignore all other messages before we get a WM_CREATE */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f5555dbb2e5..2fa3feecf35 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2110,7 +2110,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETMOUSESPEED: /* 113 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ { ret = save_int_param( SPI_SETMOUSE_REGKEY, SPI_SETMOUSE_VALNAME3, - &mouse_speed, (INT) pvParam, fWinIni); + &mouse_speed, PtrToInt(pvParam), fWinIni); break; } -- 2.11.4.GIT