Skip to content

W
wine-winehq
Commit 8806159b authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

comctl32: Fix long types warnings in traces.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 010dd60f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 338 additions and 374 deletions
dlls/comctl32/Makefile.in
View file @ 8806159b
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_COMCTL32_ EXTRADEFS = -D_COMCTL32_
MODULE = comctl32.dll MODULE = comctl32.dll
IMPORTLIB = comctl32 IMPORTLIB = comctl32
IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase
......
dlls/comctl32/animate.c
View file @ 8806159b
...@@ -508,16 +508,16 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) ...@@ -508,16 +508,16 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr)
mmioRead(infoPtr->hMMio, (LPSTR)&infoPtr->mah, sizeof(infoPtr->mah)); mmioRead(infoPtr->hMMio, (LPSTR)&infoPtr->mah, sizeof(infoPtr->mah));
TRACE("mah.dwMicroSecPerFrame=%d\n", infoPtr->mah.dwMicroSecPerFrame); TRACE("mah.dwMicroSecPerFrame=%ld\n", infoPtr->mah.dwMicroSecPerFrame);
TRACE("mah.dwMaxBytesPerSec=%d\n", infoPtr->mah.dwMaxBytesPerSec); TRACE("mah.dwMaxBytesPerSec=%ld\n", infoPtr->mah.dwMaxBytesPerSec);
TRACE("mah.dwPaddingGranularity=%d\n", infoPtr->mah.dwPaddingGranularity); TRACE("mah.dwPaddingGranularity=%ld\n", infoPtr->mah.dwPaddingGranularity);
TRACE("mah.dwFlags=%d\n", infoPtr->mah.dwFlags); TRACE("mah.dwFlags=%ld\n", infoPtr->mah.dwFlags);
TRACE("mah.dwTotalFrames=%d\n", infoPtr->mah.dwTotalFrames); TRACE("mah.dwTotalFrames=%ld\n", infoPtr->mah.dwTotalFrames);
TRACE("mah.dwInitialFrames=%d\n", infoPtr->mah.dwInitialFrames); TRACE("mah.dwInitialFrames=%ld\n", infoPtr->mah.dwInitialFrames);
TRACE("mah.dwStreams=%d\n", infoPtr->mah.dwStreams); TRACE("mah.dwStreams=%ld\n", infoPtr->mah.dwStreams);
TRACE("mah.dwSuggestedBufferSize=%d\n", infoPtr->mah.dwSuggestedBufferSize); TRACE("mah.dwSuggestedBufferSize=%ld\n", infoPtr->mah.dwSuggestedBufferSize);
TRACE("mah.dwWidth=%d\n", infoPtr->mah.dwWidth); TRACE("mah.dwWidth=%ld\n", infoPtr->mah.dwWidth);
TRACE("mah.dwHeight=%d\n", infoPtr->mah.dwHeight); TRACE("mah.dwHeight=%ld\n", infoPtr->mah.dwHeight);
mmioAscend(infoPtr->hMMio, &mmckInfo, 0); mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
...@@ -543,17 +543,17 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) ...@@ -543,17 +543,17 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr)
HIBYTE(LOWORD(infoPtr->ash.fccHandler)), HIBYTE(LOWORD(infoPtr->ash.fccHandler)),
LOBYTE(HIWORD(infoPtr->ash.fccHandler)), LOBYTE(HIWORD(infoPtr->ash.fccHandler)),
HIBYTE(HIWORD(infoPtr->ash.fccHandler))); HIBYTE(HIWORD(infoPtr->ash.fccHandler)));
TRACE("ash.dwFlags=%d\n", infoPtr->ash.dwFlags); TRACE("ash.dwFlags=%ld\n", infoPtr->ash.dwFlags);
TRACE("ash.wPriority=%d\n", infoPtr->ash.wPriority); TRACE("ash.wPriority=%d\n", infoPtr->ash.wPriority);
TRACE("ash.wLanguage=%d\n", infoPtr->ash.wLanguage); TRACE("ash.wLanguage=%d\n", infoPtr->ash.wLanguage);
TRACE("ash.dwInitialFrames=%d\n", infoPtr->ash.dwInitialFrames); TRACE("ash.dwInitialFrames=%ld\n", infoPtr->ash.dwInitialFrames);
TRACE("ash.dwScale=%d\n", infoPtr->ash.dwScale); TRACE("ash.dwScale=%ld\n", infoPtr->ash.dwScale);
TRACE("ash.dwRate=%d\n", infoPtr->ash.dwRate); TRACE("ash.dwRate=%ld\n", infoPtr->ash.dwRate);
TRACE("ash.dwStart=%d\n", infoPtr->ash.dwStart); TRACE("ash.dwStart=%ld\n", infoPtr->ash.dwStart);
TRACE("ash.dwLength=%d\n", infoPtr->ash.dwLength); TRACE("ash.dwLength=%lu\n", infoPtr->ash.dwLength);
TRACE("ash.dwSuggestedBufferSize=%d\n", infoPtr->ash.dwSuggestedBufferSize); TRACE("ash.dwSuggestedBufferSize=%lu\n", infoPtr->ash.dwSuggestedBufferSize);
TRACE("ash.dwQuality=%d\n", infoPtr->ash.dwQuality); TRACE("ash.dwQuality=%lu\n", infoPtr->ash.dwQuality);
TRACE("ash.dwSampleSize=%d\n", infoPtr->ash.dwSampleSize); TRACE("ash.dwSampleSize=%lu\n", infoPtr->ash.dwSampleSize);
TRACE("ash.rcFrame=(%d,%d,%d,%d)\n", infoPtr->ash.rcFrame.top, infoPtr->ash.rcFrame.left, TRACE("ash.rcFrame=(%d,%d,%d,%d)\n", infoPtr->ash.rcFrame.top, infoPtr->ash.rcFrame.left,
infoPtr->ash.rcFrame.bottom, infoPtr->ash.rcFrame.right); infoPtr->ash.rcFrame.bottom, infoPtr->ash.rcFrame.right);
...@@ -573,17 +573,17 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) ...@@ -573,17 +573,17 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr)
mmioRead(infoPtr->hMMio, (LPSTR)infoPtr->inbih, mmckInfo.cksize); mmioRead(infoPtr->hMMio, (LPSTR)infoPtr->inbih, mmckInfo.cksize);
TRACE("bih.biSize=%d\n", infoPtr->inbih->biSize); TRACE("bih.biSize=%lu\n", infoPtr->inbih->biSize);
TRACE("bih.biWidth=%d\n", infoPtr->inbih->biWidth); TRACE("bih.biWidth=%ld\n", infoPtr->inbih->biWidth);
TRACE("bih.biHeight=%d\n", infoPtr->inbih->biHeight); TRACE("bih.biHeight=%ld\n", infoPtr->inbih->biHeight);
TRACE("bih.biPlanes=%d\n", infoPtr->inbih->biPlanes); TRACE("bih.biPlanes=%d\n", infoPtr->inbih->biPlanes);
TRACE("bih.biBitCount=%d\n", infoPtr->inbih->biBitCount); TRACE("bih.biBitCount=%d\n", infoPtr->inbih->biBitCount);
TRACE("bih.biCompression=%d\n", infoPtr->inbih->biCompression); TRACE("bih.biCompression=%lu\n", infoPtr->inbih->biCompression);
TRACE("bih.biSizeImage=%d\n", infoPtr->inbih->biSizeImage); TRACE("bih.biSizeImage=%lu\n", infoPtr->inbih->biSizeImage);
TRACE("bih.biXPelsPerMeter=%d\n", infoPtr->inbih->biXPelsPerMeter); TRACE("bih.biXPelsPerMeter=%lu\n", infoPtr->inbih->biXPelsPerMeter);
TRACE("bih.biYPelsPerMeter=%d\n", infoPtr->inbih->biYPelsPerMeter); TRACE("bih.biYPelsPerMeter=%lu\n", infoPtr->inbih->biYPelsPerMeter);
TRACE("bih.biClrUsed=%d\n", infoPtr->inbih->biClrUsed); TRACE("bih.biClrUsed=%lu\n", infoPtr->inbih->biClrUsed);
TRACE("bih.biClrImportant=%d\n", infoPtr->inbih->biClrImportant); TRACE("bih.biClrImportant=%lu\n", infoPtr->inbih->biClrImportant);
mmioAscend(infoPtr->hMMio, &mmckInfo, 0); mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
...@@ -625,13 +625,15 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) ...@@ -625,13 +625,15 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr)
numFrame++; numFrame++;
mmioAscend(infoPtr->hMMio, &mmckInfo, 0); mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
} }
if (numFrame != infoPtr->mah.dwTotalFrames) { if (numFrame != infoPtr->mah.dwTotalFrames)
WARN("Found %d frames (/%d)\n", numFrame, infoPtr->mah.dwTotalFrames); {
return FALSE; WARN("Found %lu frames (/%lu)\n", numFrame, infoPtr->mah.dwTotalFrames);
return FALSE;
} }
if (insize > infoPtr->ash.dwSuggestedBufferSize) { if (insize > infoPtr->ash.dwSuggestedBufferSize)
WARN("insize=%d suggestedSize=%d\n", insize, infoPtr->ash.dwSuggestedBufferSize); {
infoPtr->ash.dwSuggestedBufferSize = insize; WARN("insize %lu suggestedSize %lu\n", insize, infoPtr->ash.dwSuggestedBufferSize);
infoPtr->ash.dwSuggestedBufferSize = insize;
} }
infoPtr->indata = heap_alloc_zero(infoPtr->ash.dwSuggestedBufferSize); infoPtr->indata = heap_alloc_zero(infoPtr->ash.dwSuggestedBufferSize);
...@@ -818,7 +820,7 @@ static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs) ...@@ -818,7 +820,7 @@ static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs)
infoPtr->hbmPrevFrame = 0; infoPtr->hbmPrevFrame = 0;
infoPtr->dwStyle = lpcs->style; infoPtr->dwStyle = lpcs->style;
TRACE("Animate style=0x%08x, parent=%p\n", infoPtr->dwStyle, infoPtr->hwndNotify); TRACE("Animate style %#lx, parent %p\n", infoPtr->dwStyle, infoPtr->hwndNotify);
InitializeCriticalSection(&infoPtr->cs); InitializeCriticalSection(&infoPtr->cs);
infoPtr->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ANIMATE_INFO*->cs"); infoPtr->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ANIMATE_INFO*->cs");
...@@ -859,8 +861,7 @@ static BOOL ANIMATE_EraseBackground(ANIMATE_INFO const *infoPtr, HDC hdc) ...@@ -859,8 +861,7 @@ static BOOL ANIMATE_EraseBackground(ANIMATE_INFO const *infoPtr, HDC hdc)
static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss)
{ {
TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", TRACE("%#Ix, styleOld %#lx, styleNew %#lx.\n", wStyleType, lpss->styleOld, lpss->styleNew);
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0; if (wStyleType != GWL_STYLE) return 0;
...@@ -875,7 +876,8 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP ...@@ -875,7 +876,8 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP
{ {
ANIMATE_INFO *infoPtr = (ANIMATE_INFO *)GetWindowLongPtrW(hWnd, 0); ANIMATE_INFO *infoPtr = (ANIMATE_INFO *)GetWindowLongPtrW(hWnd, 0);
TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam); TRACE("hwnd %p, msg %x, wparam %#Ix, lparam %#Ix.\n", hWnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_NCCREATE)) if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW(hWnd, uMsg, wParam, lParam); return DefWindowProcW(hWnd, uMsg, wParam, lParam);
switch (uMsg) switch (uMsg)
...@@ -953,7 +955,7 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP ...@@ -953,7 +955,7 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); ERR("unknown msg %#x, wp %#Ix, lp %#Ix.\n", uMsg, wParam, lParam);
return DefWindowProcW(hWnd, uMsg, wParam, lParam); return DefWindowProcW(hWnd, uMsg, wParam, lParam);
} }
......
dlls/comctl32/combo.c
View file @ 8806159b
...@@ -1411,7 +1411,7 @@ static void COMBO_Size( HEADCOMBO *lphc ) ...@@ -1411,7 +1411,7 @@ static void COMBO_Size( HEADCOMBO *lphc )
*/ */
if( curComboHeight > newComboHeight ) if( curComboHeight > newComboHeight )
{ {
TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%ld, oldDropTop=%ld\n",
curComboHeight, newComboHeight, lphc->droppedRect.bottom, curComboHeight, newComboHeight, lphc->droppedRect.bottom,
lphc->droppedRect.top); lphc->droppedRect.top);
lphc->droppedRect.bottom = lphc->droppedRect.top + curComboHeight - newComboHeight; lphc->droppedRect.bottom = lphc->droppedRect.top + curComboHeight - newComboHeight;
...@@ -1663,7 +1663,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam ...@@ -1663,7 +1663,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam
HEADCOMBO *lphc = (HEADCOMBO *)GetWindowLongPtrW( hwnd, 0 ); HEADCOMBO *lphc = (HEADCOMBO *)GetWindowLongPtrW( hwnd, 0 );
HTHEME theme; HTHEME theme;
TRACE("[%p]: msg %#x wp %08lx lp %08lx\n", hwnd, message, wParam, lParam ); TRACE("[%p]: msg %#x, wp %Ix, lp %Ix\n", hwnd, message, wParam, lParam );
if (!IsWindow(hwnd)) return 0; if (!IsWindow(hwnd)) return 0;
...@@ -2108,7 +2108,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam ...@@ -2108,7 +2108,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam
default: default:
if (message >= WM_USER) if (message >= WM_USER)
WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n", message - WM_USER, wParam, lParam ); WARN("unknown msg WM_USER+%04x, wp %Ix, lp %Ix\n", message - WM_USER, wParam, lParam );
break; break;
} }
......
dlls/comctl32/commctrl.c
View file @ 8806159b
...@@ -167,7 +167,7 @@ BOOL WINAPI RegisterClassNameW(const WCHAR *class) ...@@ -167,7 +167,7 @@ BOOL WINAPI RegisterClassNameW(const WCHAR *class)
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); TRACE("%p, %#lx, %p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) { switch (fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
...@@ -293,8 +293,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu, ...@@ -293,8 +293,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
switch (uMsg) { switch (uMsg) {
case WM_MENUSELECT: case WM_MENUSELECT:
TRACE("WM_MENUSELECT wParam=0x%lX lParam=0x%lX\n", TRACE("WM_MENUSELECT wParam %#Ix, lParam %#Ix\n", wParam, lParam);
wParam, lParam);
if ((HIWORD(wParam) == 0xFFFF) && (lParam == 0)) { if ((HIWORD(wParam) == 0xFFFF) && (lParam == 0)) {
/* menu was closed */ /* menu was closed */
...@@ -323,8 +322,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu, ...@@ -323,8 +322,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
break; break;
case WM_COMMAND : case WM_COMMAND :
TRACE("WM_COMMAND wParam=0x%lX lParam=0x%lX\n", TRACE("WM_COMMAND wParam %#Ix, lParam %#Ix\n", wParam, lParam);
wParam, lParam);
/* WM_COMMAND is not invalid since it is documented /* WM_COMMAND is not invalid since it is documented
* in the windows api reference. So don't output * in the windows api reference. So don't output
* any FIXME for WM_COMMAND * any FIXME for WM_COMMAND
...@@ -374,7 +372,7 @@ ShowHideMenuCtl (HWND hwnd, UINT_PTR uFlags, LPINT lpInfo) ...@@ -374,7 +372,7 @@ ShowHideMenuCtl (HWND hwnd, UINT_PTR uFlags, LPINT lpInfo)
{ {
LPINT lpMenuId; LPINT lpMenuId;
TRACE("%p, %lx, %p\n", hwnd, uFlags, lpInfo); TRACE("%p, %Ix, %p\n", hwnd, uFlags, lpInfo);
if (lpInfo == NULL) if (lpInfo == NULL)
return FALSE; return FALSE;
...@@ -715,7 +713,7 @@ InitCommonControlsEx (const INITCOMMONCONTROLSEX *lpInitCtrls) ...@@ -715,7 +713,7 @@ InitCommonControlsEx (const INITCOMMONCONTROLSEX *lpInitCtrls)
if (!lpInitCtrls || lpInitCtrls->dwSize != sizeof(INITCOMMONCONTROLSEX)) if (!lpInitCtrls || lpInitCtrls->dwSize != sizeof(INITCOMMONCONTROLSEX))
return FALSE; return FALSE;
TRACE("(0x%08x)\n", lpInitCtrls->dwICC); TRACE("%#lx\n", lpInitCtrls->dwICC);
return TRUE; return TRUE;
} }
...@@ -977,9 +975,8 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) ...@@ -977,9 +975,8 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
pdvi->dwBuildNumber = 2919; pdvi->dwBuildNumber = 2919;
pdvi->dwPlatformID = 6304; pdvi->dwPlatformID = 6304;
TRACE("%u.%u.%u.%u\n", TRACE("%lu.%lu.%lu.%lu\n", pdvi->dwMajorVersion, pdvi->dwMinorVersion,
pdvi->dwMajorVersion, pdvi->dwMinorVersion, pdvi->dwBuildNumber, pdvi->dwPlatformID);
pdvi->dwBuildNumber, pdvi->dwPlatformID);
return S_OK; return S_OK;
} }
...@@ -1084,7 +1081,7 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, ...@@ -1084,7 +1081,7 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
LPSUBCLASS_INFO stack; LPSUBCLASS_INFO stack;
LPSUBCLASSPROCS proc; LPSUBCLASSPROCS proc;
TRACE ("(%p, %p, %lx, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef); TRACE("%p, %p, %Ix, %Ix\n", hWnd, pfnSubclass, uIDSubclass, dwRef);
if (!hWnd || !pfnSubclass) if (!hWnd || !pfnSubclass)
return FALSE; return FALSE;
...@@ -1171,7 +1168,7 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, ...@@ -1171,7 +1168,7 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
const SUBCLASS_INFO *stack; const SUBCLASS_INFO *stack;
const SUBCLASSPROCS *proc; const SUBCLASSPROCS *proc;
TRACE ("(%p, %p, %lx, %p)\n", hWnd, pfnSubclass, uID, pdwRef); TRACE("%p, %p, %Ix, %p\n", hWnd, pfnSubclass, uID, pdwRef);
/* See if we have been called for this window */ /* See if we have been called for this window */
stack = GetPropW (hWnd, COMCTL32_wSubclass); stack = GetPropW (hWnd, COMCTL32_wSubclass);
...@@ -1214,7 +1211,7 @@ BOOL WINAPI RemoveWindowSubclass(HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR u ...@@ -1214,7 +1211,7 @@ BOOL WINAPI RemoveWindowSubclass(HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR u
LPSUBCLASSPROCS proc; LPSUBCLASSPROCS proc;
BOOL ret = FALSE; BOOL ret = FALSE;
TRACE ("(%p, %p, %lx)\n", hWnd, pfnSubclass, uID); TRACE("%p, %p, %Ix.\n", hWnd, pfnSubclass, uID);
/* Find the Subclass to remove */ /* Find the Subclass to remove */
stack = GetPropW (hWnd, COMCTL32_wSubclass); stack = GetPropW (hWnd, COMCTL32_wSubclass);
...@@ -1267,8 +1264,8 @@ static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam ...@@ -1267,8 +1264,8 @@ static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam
LPSUBCLASS_INFO stack; LPSUBCLASS_INFO stack;
LPSUBCLASSPROCS proc; LPSUBCLASSPROCS proc;
LRESULT ret; LRESULT ret;
TRACE ("(%p, 0x%08x, 0x%08lx, 0x%08lx)\n", hWnd, uMsg, wParam, lParam); TRACE("%p, %#x, %#Ix, %#Ix\n", hWnd, uMsg, wParam, lParam);
stack = GetPropW (hWnd, COMCTL32_wSubclass); stack = GetPropW (hWnd, COMCTL32_wSubclass);
if (!stack) { if (!stack) {
...@@ -1317,8 +1314,8 @@ LRESULT WINAPI DefSubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar ...@@ -1317,8 +1314,8 @@ LRESULT WINAPI DefSubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
{ {
LPSUBCLASS_INFO stack; LPSUBCLASS_INFO stack;
LRESULT ret; LRESULT ret;
TRACE ("(%p, 0x%08x, 0x%08lx, 0x%08lx)\n", hWnd, uMsg, wParam, lParam); TRACE("%p, %#x, %#Ix, %#Ix\n", hWnd, uMsg, wParam, lParam);
/* retrieve our little stack from the Properties */ /* retrieve our little stack from the Properties */
stack = GetPropW (hWnd, COMCTL32_wSubclass); stack = GetPropW (hWnd, COMCTL32_wSubclass);
...@@ -1669,7 +1666,7 @@ int WINAPI DrawShadowText(HDC hdc, LPCWSTR text, UINT length, RECT *rect, DWORD ...@@ -1669,7 +1666,7 @@ int WINAPI DrawShadowText(HDC hdc, LPCWSTR text, UINT length, RECT *rect, DWORD
COLORREF clr; COLORREF clr;
RECT r; RECT r;
FIXME("(%p, %s, %d, %p, 0x%08x, 0x%08x, 0x%08x, %d, %d): semi-stub\n", hdc, debugstr_w(text), FIXME("%p, %s, %d, %p, %#lx, %#lx, %#lx, %d, %d: semi-stub\n", hdc, debugstr_w(text),
length, rect, flags, crText, crShadow, offset_x, offset_y); length, rect, flags, crText, crShadow, offset_x, offset_y);
bkmode = SetBkMode(hdc, TRANSPARENT); bkmode = SetBkMode(hdc, TRANSPARENT);
...@@ -1972,7 +1969,7 @@ static void MRU_SaveChanged(WINEMRULIST *mp) ...@@ -1972,7 +1969,7 @@ static void MRU_SaveChanged(WINEMRULIST *mp)
{ {
ERR("error saving /%s/, err=%d\n", debugstr_w(realname), err); ERR("error saving /%s/, err=%d\n", debugstr_w(realname), err);
} }
TRACE("saving value for name /%s/ size=%d\n", debugstr_w(realname), witem->size); TRACE("saving value for name /%s/ size %ld\n", debugstr_w(realname), witem->size);
} }
} }
RegCloseKey(newkey); RegCloseKey(newkey);
...@@ -2071,7 +2068,7 @@ INT WINAPI FindMRUData(HANDLE hList, const void *data, DWORD cbData, int *pos) ...@@ -2071,7 +2068,7 @@ INT WINAPI FindMRUData(HANDLE hList, const void *data, DWORD cbData, int *pos)
if (pos && (ret != -1)) if (pos && (ret != -1))
*pos = 'a' + i; *pos = 'a' + i;
TRACE("%p, %p, %d, %p, returning %d.\n", hList, data, cbData, pos, ret); TRACE("%p, %p, %ld, %p, returning %d.\n", hList, data, cbData, pos, ret);
return ret; return ret;
} }
...@@ -2131,7 +2128,7 @@ INT WINAPI AddMRUData(HANDLE hList, const void *data, DWORD cbData) ...@@ -2131,7 +2128,7 @@ INT WINAPI AddMRUData(HANDLE hList, const void *data, DWORD cbData)
mp->wineFlags |= WMRUF_CHANGED; mp->wineFlags |= WMRUF_CHANGED;
mp->realMRU[0] = replace + 'a'; mp->realMRU[0] = replace + 'a';
TRACE("(%p, %p, %d) adding data, /%c/ now most current\n", hList, data, cbData, replace+'a'); TRACE("%p, %p, %ld adding data, /%c/ now most current\n", hList, data, cbData, replace+'a');
if (!(mp->extview.fFlags & MRU_CACHEWRITE)) if (!(mp->extview.fFlags & MRU_CACHEWRITE))
{ {
...@@ -2268,7 +2265,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp) ...@@ -2268,7 +2265,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp)
KEY_READ | KEY_WRITE, 0, &newkey, &dwdisp))) KEY_READ | KEY_WRITE, 0, &newkey, &dwdisp)))
{ {
/* error - what to do ??? */ /* error - what to do ??? */
ERR("(%u %u %x %p %s %p): Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags, ERR("%lu, %u, %x, %p, %s, %p: Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags,
mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.u.string_cmpfn, err); mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.u.string_cmpfn, err);
return 0; return 0;
} }
...@@ -2286,7 +2283,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp) ...@@ -2286,7 +2283,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp)
else else
datasize /= sizeof(WCHAR); datasize /= sizeof(WCHAR);
TRACE("MRU list = %s, datasize = %d\n", debugstr_w(mp->realMRU), datasize); TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize);
mp->cursize = datasize - 1; mp->cursize = datasize - 1;
/* datasize now has number of items in the MRUList */ /* datasize now has number of items in the MRUList */
...@@ -2314,7 +2311,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp) ...@@ -2314,7 +2311,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp)
else else
mp->cursize = 0; mp->cursize = 0;
TRACE("(%u %u %x %p %s %p): Current Size = %d\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags, TRACE("%lu, %u, %x, %p, %s, %p: Current Size = %ld\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags,
mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.u.string_cmpfn, mp->cursize); mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.u.string_cmpfn, mp->cursize);
return mp; return mp;
} }
...@@ -2412,7 +2409,7 @@ INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, void *buffer, DWORD nBufferS ...@@ -2412,7 +2409,7 @@ INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, void *buffer, DWORD nBufferS
witem = mp->array[desired]; witem = mp->array[desired];
datasize = min(witem->size, nBufferSize); datasize = min(witem->size, nBufferSize);
memcpy(buffer, &witem->datastart, datasize); memcpy(buffer, &witem->datastart, datasize);
TRACE("(%p, %d, %p, %d): returning len=%d\n", hList, nItemPos, buffer, nBufferSize, datasize); TRACE("(%p, %d, %p, %ld): returning len %d\n", hList, nItemPos, buffer, nBufferSize, datasize);
return datasize; return datasize;
} }
...@@ -2446,7 +2443,7 @@ INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, void *buffer, DWORD nBufferS ...@@ -2446,7 +2443,7 @@ INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, void *buffer, DWORD nBufferS
((char *)buffer)[ datasize - 1 ] = '\0'; ((char *)buffer)[ datasize - 1 ] = '\0';
datasize = lenA - 1; datasize = lenA - 1;
} }
TRACE("(%p, %d, %p, %d): returning len=%d\n", hList, nItemPos, buffer, nBufferSize, datasize); TRACE("(%p, %d, %p, %ld): returning len=%d\n", hList, nItemPos, buffer, nBufferSize, datasize);
return datasize; return datasize;
} }
...@@ -2606,7 +2603,7 @@ static LRESULT DoNotify(const struct NOTIFYDATA *notify, UINT code, NMHDR *hdr) ...@@ -2606,7 +2603,7 @@ static LRESULT DoNotify(const struct NOTIFYDATA *notify, UINT code, NMHDR *hdr)
NMHDR *lpNmh = NULL; NMHDR *lpNmh = NULL;
UINT idFrom = 0; UINT idFrom = 0;
TRACE("%p, %p, %d, %p, %#x.\n", notify->hwndFrom, notify->hwndTo, code, hdr, notify->dwParam5); TRACE("%p, %p, %d, %p, %#lx.\n", notify->hwndFrom, notify->hwndTo, code, hdr, notify->dwParam5);
if (!notify->hwndTo) if (!notify->hwndTo)
return 0; return 0;
...@@ -2676,7 +2673,7 @@ LRESULT WINAPI SendNotifyEx(HWND hwndTo, HWND hwndFrom, UINT code, NMHDR *hdr, D ...@@ -2676,7 +2673,7 @@ LRESULT WINAPI SendNotifyEx(HWND hwndTo, HWND hwndFrom, UINT code, NMHDR *hdr, D
struct NOTIFYDATA notify; struct NOTIFYDATA notify;
HWND hwndNotify; HWND hwndNotify;
TRACE("(%p %p %d %p %#x)\n", hwndFrom, hwndTo, code, hdr, dwParam5); TRACE("%p, %p, %d, %p, %#lx\n", hwndFrom, hwndTo, code, hdr, dwParam5);
hwndNotify = hwndTo; hwndNotify = hwndTo;
if (!hwndTo) if (!hwndTo)
......
dlls/comctl32/datetime.c
View file @ 8806159b
...@@ -1455,7 +1455,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, INT width, INT height) ...@@ -1455,7 +1455,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, INT width, INT height)
infoPtr->rcClient.bottom = height; infoPtr->rcClient.bottom = height;
infoPtr->rcClient.right = width; infoPtr->rcClient.right = width;
TRACE("Height=%d, Width=%d\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right); TRACE("Height %ld, Width %ld\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right);
infoPtr->rcDraw = infoPtr->rcClient; infoPtr->rcDraw = infoPtr->rcClient;
...@@ -1489,8 +1489,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, INT width, INT height) ...@@ -1489,8 +1489,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, INT width, INT height)
static LRESULT static LRESULT
DATETIME_StyleChanging(DATETIME_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *lpss) DATETIME_StyleChanging(DATETIME_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *lpss)
{ {
TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
wStyleType, lpss->styleOld, lpss->styleNew);
/* block DTS_SHOWNONE change */ /* block DTS_SHOWNONE change */
if ((lpss->styleNew ^ lpss->styleOld) & DTS_SHOWNONE) if ((lpss->styleNew ^ lpss->styleOld) & DTS_SHOWNONE)
...@@ -1507,8 +1506,7 @@ DATETIME_StyleChanging(DATETIME_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *l ...@@ -1507,8 +1506,7 @@ DATETIME_StyleChanging(DATETIME_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *l
static LRESULT static LRESULT
DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss)
{ {
TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0; if (wStyleType != GWL_STYLE) return 0;
...@@ -1595,7 +1593,7 @@ static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size) ...@@ -1595,7 +1593,7 @@ static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size)
size->cx += 12; size->cx += 12;
size->cy += 4; size->cy += 4;
TRACE("cx=%d cy=%d\n", size->cx, size->cy); TRACE("cx %ld, cy %ld\n", size->cx, size->cy);
return TRUE; return TRUE;
} }
...@@ -1710,7 +1708,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -1710,7 +1708,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
DATETIME_INFO *infoPtr = ((DATETIME_INFO *)GetWindowLongPtrW (hwnd, 0)); DATETIME_INFO *infoPtr = ((DATETIME_INFO *)GetWindowLongPtrW (hwnd, 0));
TRACE ("%x, %lx, %lx\n", uMsg, wParam, lParam); TRACE("%x, %Ix, %Ix\n", uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE)) if (!infoPtr && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE))
return DefWindowProcW( hwnd, uMsg, wParam, lParam ); return DefWindowProcW( hwnd, uMsg, wParam, lParam );
...@@ -1839,10 +1837,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -1839,10 +1837,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return CB_ERR; return CB_ERR;
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR("unknown msg %04x wp=%08lx lp=%08lx\n", ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
} }
} }
......
dlls/comctl32/dpa.c
View file @ 8806159b
...@@ -110,7 +110,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, ...@@ -110,7 +110,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc,
if (errCode != S_OK) if (errCode != S_OK)
return errCode; return errCode;
TRACE ("dwSize=%u dwData2=%u dwItems=%u\n", TRACE ("dwSize=%lu dwData2=%lu dwItems=%lu\n",
streamData.dwSize, streamData.dwData2, streamData.dwItems); streamData.dwSize, streamData.dwData2, streamData.dwItems);
if (ulRead < sizeof(STREAMDATA) || if (ulRead < sizeof(STREAMDATA) ||
...@@ -152,7 +152,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, ...@@ -152,7 +152,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc,
/* store the handle to the dpa */ /* store the handle to the dpa */
*phDpa = hDpa; *phDpa = hDpa;
TRACE ("new hDpa=%p, errorcode=%x\n", hDpa, errCode); TRACE ("new hDpa=%p, errorcode %lx\n", hDpa, errCode);
return errCode; return errCode;
} }
...@@ -271,8 +271,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, ...@@ -271,8 +271,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags,
INT nResult, i; INT nResult, i;
INT nIndex; INT nIndex;
TRACE("(%p %p %08x %p %p %08lx)\n", TRACE("%p, %p, %#lx, %p, %p, %#Ix\n", hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam);
hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam);
if (IsBadWritePtr (hdpa1, sizeof(*hdpa1))) if (IsBadWritePtr (hdpa1, sizeof(*hdpa1)))
return FALSE; return FALSE;
...@@ -526,7 +525,7 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, HDPA hdpaNew) ...@@ -526,7 +525,7 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, HDPA hdpaNew)
*/ */
LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex) LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex)
{ {
TRACE("(%p %ld)\n", hdpa, nIndex); TRACE("%p, %Id\n", hdpa, nIndex);
if (!hdpa) if (!hdpa)
return NULL; return NULL;
...@@ -535,7 +534,7 @@ LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex) ...@@ -535,7 +534,7 @@ LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex)
return NULL; return NULL;
} }
if ((nIndex < 0) || (nIndex >= hdpa->nItemCount)) { if ((nIndex < 0) || (nIndex >= hdpa->nItemCount)) {
WARN("not enough pointers in array (%ld vs %d).\n",nIndex,hdpa->nItemCount); WARN("not enough pointers in array (%Id vs %d).\n",nIndex,hdpa->nItemCount);
return NULL; return NULL;
} }
...@@ -815,7 +814,7 @@ BOOL WINAPI DPA_Sort (HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) ...@@ -815,7 +814,7 @@ BOOL WINAPI DPA_Sort (HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam)
if (!hdpa || !pfnCompare) if (!hdpa || !pfnCompare)
return FALSE; return FALSE;
TRACE("(%p %p 0x%lx)\n", hdpa, pfnCompare, lParam); TRACE("%p, %p, %#Ix\n", hdpa, pfnCompare, lParam);
if ((hdpa->nItemCount > 1) && (hdpa->ptrs)) if ((hdpa->nItemCount > 1) && (hdpa->ptrs))
DPA_QuickSort (hdpa->ptrs, 0, hdpa->nItemCount - 1, DPA_QuickSort (hdpa->ptrs, 0, hdpa->nItemCount - 1,
...@@ -848,8 +847,7 @@ INT WINAPI DPA_Search (HDPA hdpa, LPVOID pFind, INT nStart, ...@@ -848,8 +847,7 @@ INT WINAPI DPA_Search (HDPA hdpa, LPVOID pFind, INT nStart,
if (!hdpa || !pfnCompare || !pFind) if (!hdpa || !pfnCompare || !pFind)
return -1; return -1;
TRACE("(%p %p %d %p 0x%08lx 0x%08x)\n", TRACE("%p, %p, %d, %p, %#Ix, %#x\n", hdpa, pFind, nStart, pfnCompare, lParam, uOptions);
hdpa, pFind, nStart, pfnCompare, lParam, uOptions);
if (uOptions & DPAS_SORTED) { if (uOptions & DPAS_SORTED) {
/* array is sorted --> use binary search */ /* array is sorted --> use binary search */
......
dlls/comctl32/draglist.c
View file @ 8806159b
...@@ -292,8 +292,7 @@ INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll) ...@@ -292,8 +292,7 @@ INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll)
INT nIndex; INT nIndex;
DWORD dwScrollTime; DWORD dwScrollTime;
TRACE("(%p %d x %d %s)\n", TRACE("%p, %ld x %ld, %s\n", hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE");
hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE");
ScreenToClient (hwndLB, &pt); ScreenToClient (hwndLB, &pt);
GetClientRect (hwndLB, &rcClient); GetClientRect (hwndLB, &rcClient);
......
dlls/comctl32/edit.c
View file @ 8806159b
...@@ -349,7 +349,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD ...@@ -349,7 +349,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD
NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("ScriptStringAnalyse failed (%x)\n",hr); WARN("ScriptStringAnalyse failed, hr %#lx.\n", hr);
line_def->ssa = NULL; line_def->ssa = NULL;
} }
...@@ -2355,7 +2355,7 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es) ...@@ -2355,7 +2355,7 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es)
/* The text buffer handle belongs to the app */ /* The text buffer handle belongs to the app */
es->hlocapp = es->hloc32W; es->hlocapp = es->hloc32W;
TRACE("Returning %p, LocalSize() = %ld\n", es->hlocapp, LocalSize(es->hlocapp)); TRACE("Returning %p, LocalSize() = %Id\n", es->hlocapp, LocalSize(es->hlocapp));
return es->hlocapp; return es->hlocapp;
} }
...@@ -3896,7 +3896,7 @@ static LRESULT EDIT_WM_StyleChanged ( EDITSTATE *es, WPARAM which, const STYLES ...@@ -3896,7 +3896,7 @@ static LRESULT EDIT_WM_StyleChanged ( EDITSTATE *es, WPARAM which, const STYLES
} else if (GWL_EXSTYLE == which) { } else if (GWL_EXSTYLE == which) {
; /* FIXME - what is needed here */ ; /* FIXME - what is needed here */
} else { } else {
WARN ("Invalid style change %ld\n",which); WARN ("Invalid style change %#Ix.\n", which);
} }
return 0; return 0;
...@@ -4045,7 +4045,7 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos) ...@@ -4045,7 +4045,7 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos)
INT fw = es->format_rect.right - es->format_rect.left; INT fw = es->format_rect.right - es->format_rect.left;
ret = es->text_width ? es->x_offset * 100 / (es->text_width - fw) : 0; ret = es->text_width ? es->x_offset * 100 / (es->text_width - fw) : 0;
} }
TRACE("EM_GETTHUMB: returning %ld\n", ret); TRACE("EM_GETTHUMB: returning %Id\n", ret);
return ret; return ret;
} }
case EM_LINESCROLL: case EM_LINESCROLL:
...@@ -4168,7 +4168,7 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) ...@@ -4168,7 +4168,7 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos)
INT vlc = get_vertical_line_count(es); INT vlc = get_vertical_line_count(es);
ret = es->line_count ? es->y_offset * 100 / (es->line_count - vlc) : 0; ret = es->line_count ? es->y_offset * 100 / (es->line_count - vlc) : 0;
} }
TRACE("EM_GETTHUMB: returning %ld\n", ret); TRACE("EM_GETTHUMB: returning %Id\n", ret);
return ret; return ret;
} }
case EM_LINESCROLL: case EM_LINESCROLL:
...@@ -4401,7 +4401,7 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) ...@@ -4401,7 +4401,7 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs)
EDITSTATE *es; EDITSTATE *es;
UINT alloc_size; UINT alloc_size;
TRACE("Creating edit control, style = %08x\n", lpcs->style); TRACE("Creating edit control, style = %#lx\n", lpcs->style);
if (!(es = heap_alloc_zero(sizeof(*es)))) if (!(es = heap_alloc_zero(sizeof(*es))))
return FALSE; return FALSE;
...@@ -4600,7 +4600,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR ...@@ -4600,7 +4600,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
LRESULT result = 0; LRESULT result = 0;
RECT *rect; RECT *rect;
TRACE("hwnd=%p msg=%#x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); TRACE("hwnd %p, msg %#x, wparam %Ix, lparam %Ix\n", hwnd, msg, wParam, lParam);
if (!es && msg != WM_NCCREATE) if (!es && msg != WM_NCCREATE)
return DefWindowProcW(hwnd, msg, wParam, lParam); return DefWindowProcW(hwnd, msg, wParam, lParam);
...@@ -5108,7 +5108,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR ...@@ -5108,7 +5108,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) if (IsWindow(hwnd) && es && msg != EM_GETHANDLE)
EDIT_UnlockBuffer(es, FALSE); EDIT_UnlockBuffer(es, FALSE);
TRACE("hwnd=%p msg=%x -- 0x%08lx\n", hwnd, msg, result); TRACE("hwnd=%p msg=%x -- %#Ix\n", hwnd, msg, result);
return result; return result;
} }
......
dlls/comctl32/flatsb.c
View file @ 8806159b
...@@ -227,7 +227,7 @@ FlatSB_SetScrollRange(HWND hwnd, int nBar, INT min, INT max, BOOL bRedraw) ...@@ -227,7 +227,7 @@ FlatSB_SetScrollRange(HWND hwnd, int nBar, INT min, INT max, BOOL bRedraw)
static LRESULT static LRESULT
FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TRACE("[%p] wParam=%04lx lParam=%08lx\n", hwnd, wParam, lParam); TRACE("[%p] wParam %Ix, lParam %Ix\n", hwnd, wParam, lParam);
return 0; return 0;
} }
...@@ -235,7 +235,7 @@ FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -235,7 +235,7 @@ FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
static LRESULT static LRESULT
FlatSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) FlatSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TRACE("[%p] wParam=%04lx lParam=%08lx\n", hwnd, wParam, lParam); TRACE("[%p] wParam %Ix, lParam %Ix\n", hwnd, wParam, lParam);
return 0; return 0;
} }
...@@ -256,8 +256,7 @@ FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -256,8 +256,7 @@ FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR("unknown msg %04x wp=%08lx lp=%08lx\n", ERR("unknown msg %04x, wp %#Ix, lp %#Ix\n", uMsg, wParam, lParam);
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
} }
} }
......
dlls/comctl32/header.c
View file @ 8806159b
...@@ -2094,8 +2094,7 @@ static LRESULT HEADER_SetRedraw(HEADER_INFO *infoPtr, WPARAM wParam, LPARAM lPar ...@@ -2094,8 +2094,7 @@ static LRESULT HEADER_SetRedraw(HEADER_INFO *infoPtr, WPARAM wParam, LPARAM lPar
static INT HEADER_StyleChanged(HEADER_INFO *infoPtr, WPARAM wStyleType, static INT HEADER_StyleChanged(HEADER_INFO *infoPtr, WPARAM wStyleType,
const STYLESTRUCT *lpss) const STYLESTRUCT *lpss)
{ {
TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0; if (wStyleType != GWL_STYLE) return 0;
...@@ -2128,7 +2127,8 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -2128,7 +2127,8 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
HEADER_INFO *infoPtr = (HEADER_INFO *)GetWindowLongPtrW(hwnd, 0); HEADER_INFO *infoPtr = (HEADER_INFO *)GetWindowLongPtrW(hwnd, 0);
TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, msg, wParam, lParam); TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix\n", hwnd, msg, wParam, lParam);
if (!infoPtr && (msg != WM_CREATE)) if (!infoPtr && (msg != WM_CREATE))
return DefWindowProcW (hwnd, msg, wParam, lParam); return DefWindowProcW (hwnd, msg, wParam, lParam);
switch (msg) { switch (msg) {
...@@ -2266,8 +2266,7 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -2266,8 +2266,7 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
default: default:
if ((msg >= WM_USER) && (msg < WM_APP) && !COMCTL32_IsReflectedMessage(msg)) if ((msg >= WM_USER) && (msg < WM_APP) && !COMCTL32_IsReflectedMessage(msg))
ERR("unknown msg %04x wp=%04lx lp=%08lx\n", ERR("unknown msg %04x, wp %#Ix, lp %#Ix\n", msg, wParam, lParam );
msg, wParam, lParam );
return DefWindowProcW(hwnd, msg, wParam, lParam); return DefWindowProcW(hwnd, msg, wParam, lParam);
} }
} }
......
dlls/comctl32/hotkey.c
View file @ 8806159b
...@@ -290,7 +290,7 @@ HOTKEY_KeyDown (HOTKEY_INFO *infoPtr, DWORD key, DWORD flags) ...@@ -290,7 +290,7 @@ HOTKEY_KeyDown (HOTKEY_INFO *infoPtr, DWORD key, DWORD flags)
if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED)
return 0; return 0;
TRACE("() Key: %d\n", key); TRACE("() Key: %ld\n", key);
wOldHotKey = infoPtr->HotKey; wOldHotKey = infoPtr->HotKey;
bOldMod = infoPtr->CurrMod; bOldMod = infoPtr->CurrMod;
...@@ -350,7 +350,7 @@ HOTKEY_KeyUp (HOTKEY_INFO *infoPtr, DWORD key) ...@@ -350,7 +350,7 @@ HOTKEY_KeyUp (HOTKEY_INFO *infoPtr, DWORD key)
if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED)
return 0; return 0;
TRACE("() Key: %d\n", key); TRACE("() Key: %ld\n", key);
bOldMod = infoPtr->CurrMod; bOldMod = infoPtr->CurrMod;
...@@ -511,7 +511,9 @@ static LRESULT WINAPI ...@@ -511,7 +511,9 @@ static LRESULT WINAPI
HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
HOTKEY_INFO *infoPtr = (HOTKEY_INFO *)GetWindowLongPtrW (hwnd, 0); HOTKEY_INFO *infoPtr = (HOTKEY_INFO *)GetWindowLongPtrW (hwnd, 0);
TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam);
TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_NCCREATE)) if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
switch (uMsg) switch (uMsg)
...@@ -577,8 +579,7 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -577,8 +579,7 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR("unknown msg %04x wp=%08lx lp=%08lx\n", ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
} }
return 0; return 0;
......
dlls/comctl32/imagelist.c
View file @ 8806159b
...@@ -342,13 +342,13 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) ...@@ -342,13 +342,13 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount)
imagelist_get_bitmap_size(himl, nNewCount, &sz); imagelist_get_bitmap_size(himl, nNewCount, &sz);
TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, sz.cy, nNewCount); TRACE("Create expanded bitmaps : himl=%p x=%ld y=%ld count=%d\n", himl, sz.cx, sz.cy, nNewCount);
hdcBitmap = CreateCompatibleDC (0); hdcBitmap = CreateCompatibleDC (0);
hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount); hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount);
if (hbmNewBitmap == 0) if (hbmNewBitmap == 0)
ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, sz.cy); ERR("creating new image bitmap (x=%ld y=%ld)!\n", sz.cx, sz.cy);
if (himl->cCurImage) if (himl->cCurImage)
{ {
...@@ -527,7 +527,8 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) ...@@ -527,7 +527,8 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask)
HBITMAP hMaskBitmap; HBITMAP hMaskBitmap;
COLORREF bkColor; COLORREF bkColor;
TRACE("himl=%p hbitmap=%p clrmask=%x\n", himl, hBitmap, clrMask); TRACE("himl %p, hbitmap %p, clrmask %#lx\n", himl, hBitmap, clrMask);
if (!is_valid(himl)) if (!is_valid(himl))
return -1; return -1;
...@@ -2209,7 +2210,7 @@ static void *read_bitmap(IStream *pstm, BITMAPINFO *bmi) ...@@ -2209,7 +2210,7 @@ static void *read_bitmap(IStream *pstm, BITMAPINFO *bmi)
if ((bmi->bmiHeader.biSize != sizeof(bmi->bmiHeader))) if ((bmi->bmiHeader.biSize != sizeof(bmi->bmiHeader)))
return NULL; return NULL;
TRACE("width %u, height %u, planes %u, bpp %u\n", TRACE("width %lu, height %lu, planes %u, bpp %u\n",
bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight,
bmi->bmiHeader.biPlanes, bmi->bmiHeader.biBitCount); bmi->bmiHeader.biPlanes, bmi->bmiHeader.biBitCount);
...@@ -2793,7 +2794,7 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag, ...@@ -2793,7 +2794,7 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag,
BOOL WINAPI BOOL WINAPI
ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter) ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter)
{ {
FIXME("(%p 0x%x 0x%x):empty stub!\n", himl, i, dwFilter); FIXME("%p, %d, %#lx:empty stub!\n", himl, i, dwFilter);
return FALSE; return FALSE;
} }
...@@ -2818,7 +2819,7 @@ ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter) ...@@ -2818,7 +2819,7 @@ ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter)
DWORD WINAPI DWORD WINAPI
ImageList_SetFlags(HIMAGELIST himl, DWORD flags) ImageList_SetFlags(HIMAGELIST himl, DWORD flags)
{ {
FIXME("(%p %08x):empty stub\n", himl, flags); FIXME("(%p %#lx):empty stub\n", himl, flags);
return 0; return 0;
} }
...@@ -3043,7 +3044,7 @@ static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm) ...@@ -3043,7 +3044,7 @@ static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm)
if (!result) if (!result)
goto failed; goto failed;
TRACE("width %u, height %u, planes %u, bpp %u\n", TRACE("width %lu, height %lu, planes %u, bpp %u\n",
bmih->biWidth, bmih->biHeight, bmih->biWidth, bmih->biHeight,
bmih->biPlanes, bmih->biBitCount); bmih->biPlanes, bmih->biBitCount);
...@@ -3063,7 +3064,7 @@ failed: ...@@ -3063,7 +3064,7 @@ failed:
*/ */
HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm)
{ {
FIXME("%p %08x %p: semi-stub\n", himl, flags, pstm); FIXME("%p %#lx %p: semi-stub\n", himl, flags, pstm);
return ImageList_Write(himl, pstm) ? S_OK : E_FAIL; return ImageList_Write(himl, pstm) ? S_OK : E_FAIL;
} }
...@@ -3140,7 +3141,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) ...@@ -3140,7 +3141,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count)
char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)];
BITMAPINFO *bmi = (BITMAPINFO *)buffer; BITMAPINFO *bmi = (BITMAPINFO *)buffer;
TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n", TRACE("Creating DIBSection %ld x %ld, %d Bits per Pixel\n",
sz.cx, sz.cy, himl->uBitsPixel); sz.cx, sz.cy, himl->uBitsPixel);
memset( buffer, 0, sizeof(buffer) ); memset( buffer, 0, sizeof(buffer) );
...@@ -3272,7 +3273,7 @@ static ULONG WINAPI ImageListImpl_AddRef(IImageList2 *iface) ...@@ -3272,7 +3273,7 @@ static ULONG WINAPI ImageListImpl_AddRef(IImageList2 *iface)
HIMAGELIST imgl = impl_from_IImageList2(iface); HIMAGELIST imgl = impl_from_IImageList2(iface);
ULONG ref = InterlockedIncrement(&imgl->ref); ULONG ref = InterlockedIncrement(&imgl->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("%p, refcount %lu\n", iface, ref);
return ref; return ref;
} }
...@@ -3281,7 +3282,7 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface) ...@@ -3281,7 +3282,7 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface)
HIMAGELIST This = impl_from_IImageList2(iface); HIMAGELIST This = impl_from_IImageList2(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("%p, refcount %lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -3673,7 +3674,7 @@ static HRESULT WINAPI ImageListImpl_Resize(IImageList2 *iface, INT cx, INT cy) ...@@ -3673,7 +3674,7 @@ static HRESULT WINAPI ImageListImpl_Resize(IImageList2 *iface, INT cx, INT cy)
static HRESULT WINAPI ImageListImpl_GetOriginalSize(IImageList2 *iface, INT image, DWORD flags, INT *cx, INT *cy) static HRESULT WINAPI ImageListImpl_GetOriginalSize(IImageList2 *iface, INT image, DWORD flags, INT *cx, INT *cy)
{ {
FIXME("(%p)->(%d %x %p %p): stub\n", iface, image, flags, cx, cy); FIXME("(%p)->(%d %lx %p %p): stub\n", iface, image, flags, cx, cy);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -3697,13 +3698,13 @@ static HRESULT WINAPI ImageListImpl_GetCallback(IImageList2 *iface, REFIID riid, ...@@ -3697,13 +3698,13 @@ static HRESULT WINAPI ImageListImpl_GetCallback(IImageList2 *iface, REFIID riid,
static HRESULT WINAPI ImageListImpl_ForceImagePresent(IImageList2 *iface, INT image, DWORD flags) static HRESULT WINAPI ImageListImpl_ForceImagePresent(IImageList2 *iface, INT image, DWORD flags)
{ {
FIXME("(%p)->(%d %x): stub\n", iface, image, flags); FIXME("(%p)->(%d %lx): stub\n", iface, image, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ImageListImpl_DiscardImages(IImageList2 *iface, INT first_image, INT last_image, DWORD flags) static HRESULT WINAPI ImageListImpl_DiscardImages(IImageList2 *iface, INT first_image, INT last_image, DWORD flags)
{ {
FIXME("(%p)->(%d %d %x): stub\n", iface, first_image, last_image, flags); FIXME("(%p)->(%d %d %lx): stub\n", iface, first_image, last_image, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -3727,14 +3728,14 @@ static HRESULT WINAPI ImageListImpl_Initialize(IImageList2 *iface, INT cx, INT c ...@@ -3727,14 +3728,14 @@ static HRESULT WINAPI ImageListImpl_Initialize(IImageList2 *iface, INT cx, INT c
static HRESULT WINAPI ImageListImpl_Replace2(IImageList2 *iface, INT i, HBITMAP image, HBITMAP mask, IUnknown *unk, DWORD flags) static HRESULT WINAPI ImageListImpl_Replace2(IImageList2 *iface, INT i, HBITMAP image, HBITMAP mask, IUnknown *unk, DWORD flags)
{ {
FIXME("(%p)->(%d %p %p %p %x): stub\n", iface, i, image, mask, unk, flags); FIXME("(%p)->(%d %p %p %p %lx): stub\n", iface, i, image, mask, unk, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ImageListImpl_ReplaceFromImageList(IImageList2 *iface, INT i, IImageList *imagelist, INT src, static HRESULT WINAPI ImageListImpl_ReplaceFromImageList(IImageList2 *iface, INT i, IImageList *imagelist, INT src,
IUnknown *unk, DWORD flags) IUnknown *unk, DWORD flags)
{ {
FIXME("(%p)->(%d %p %d %p %x): stub\n", iface, i, imagelist, src, unk, flags); FIXME("(%p)->(%d %p %d %p %lx): stub\n", iface, i, imagelist, src, unk, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/comctl32/ipaddress.c
View file @ 8806159b
...@@ -509,7 +509,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -509,7 +509,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
INT index, len = 0, startsel, endsel; INT index, len = 0, startsel, endsel;
IPPART_INFO *part; IPPART_INFO *part;
TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam); TRACE("hwnd %p, msg 0x%x, wparam %#Ix, lparam %#Ix\n", hwnd, uMsg, wParam, lParam);
if ((index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) if ((index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0)
{ {
...@@ -592,7 +592,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -592,7 +592,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
IPADDRESS_INFO *infoPtr = (IPADDRESS_INFO *)GetWindowLongPtrW (hwnd, 0); IPADDRESS_INFO *infoPtr = (IPADDRESS_INFO *)GetWindowLongPtrW (hwnd, 0);
TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam); TRACE("hwnd %p, msg 0x%x, wparam %#Ix, lparam %#Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE)) if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
...@@ -654,7 +654,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -654,7 +654,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
} }
return 0; return 0;
......
dlls/comctl32/listbox.c
View file @ 8806159b
...@@ -2683,7 +2683,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, ...@@ -2683,7 +2683,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam,
} }
if (descr->style & LBS_COMBOBOX) lphc = descr->lphc; if (descr->style & LBS_COMBOBOX) lphc = descr->lphc;
TRACE("[%p]: msg %#x wp %08lx lp %08lx\n", descr->self, msg, wParam, lParam ); TRACE("[%p]: msg %#x, wp %Ix, lp %Ix\n", descr->self, msg, wParam, lParam );
switch(msg) switch(msg)
{ {
...@@ -3143,8 +3143,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, ...@@ -3143,8 +3143,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam,
default: default:
if ((msg >= WM_USER) && (msg < 0xc000)) if ((msg >= WM_USER) && (msg < 0xc000))
WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n", WARN("[%p]: unknown msg %04x, wp %Ix, lp %Ix\n", hwnd, msg, wParam, lParam );
hwnd, msg, wParam, lParam );
} }
return DefWindowProcW( hwnd, msg, wParam, lParam ); return DefWindowProcW( hwnd, msg, wParam, lParam );
......
dlls/comctl32/monthcal.c
View file @ 8806159b
...@@ -671,7 +671,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) ...@@ -671,7 +671,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st)
{ {
INT range; INT range;
TRACE("flag=%d, st=%p\n", flag, st); TRACE("flags %#lx, st %p\n", flag, st);
switch (flag) { switch (flag) {
case GMR_VISIBLE: case GMR_VISIBLE:
...@@ -709,7 +709,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) ...@@ -709,7 +709,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st)
break; break;
} }
default: default:
WARN("Unknown flag value, got %d\n", flag); WARN("Unknown flag value, got %ld\n", flag);
range = 0; range = 0;
} }
...@@ -1296,7 +1296,7 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color) ...@@ -1296,7 +1296,7 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color)
enum CachedBrush type; enum CachedBrush type;
COLORREF prev; COLORREF prev;
TRACE("%p, %d: color %08x\n", infoPtr, index, color); TRACE("%p, %d: color %#lx\n", infoPtr, index, color);
if (index > MCSC_TRAILINGTEXT) return -1; if (index > MCSC_TRAILINGTEXT) return -1;
...@@ -2071,8 +2071,7 @@ static LRESULT CALLBACK EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM ...@@ -2071,8 +2071,7 @@ static LRESULT CALLBACK EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
{ {
MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0); MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0);
TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx)\n", TRACE("hwnd %p, uMsg %x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam);
hwnd, uMsg, wParam, lParam);
switch (uMsg) switch (uMsg)
{ {
...@@ -2160,7 +2159,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) ...@@ -2160,7 +2159,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam)
hit = MONTHCAL_HitTest(infoPtr, &ht); hit = MONTHCAL_HitTest(infoPtr, &ht);
TRACE("%x at %s\n", hit, wine_dbgstr_point(&ht.pt)); TRACE("%lx at %s\n", hit, wine_dbgstr_point(&ht.pt));
switch(hit) switch(hit)
{ {
...@@ -2320,7 +2319,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) ...@@ -2320,7 +2319,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam)
static LRESULT static LRESULT
MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id) MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id)
{ {
TRACE("%ld\n", id); TRACE("%Id\n", id);
switch(id) { switch(id) {
case MC_PREVNEXTMONTHTIMER: case MC_PREVNEXTMONTHTIMER:
...@@ -2343,7 +2342,7 @@ MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id) ...@@ -2343,7 +2342,7 @@ MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id)
return 0; return 0;
} }
default: default:
ERR("got unknown timer %ld\n", id); ERR("got unknown timer %Id\n", id);
break; break;
} }
...@@ -2449,7 +2448,7 @@ MONTHCAL_EraseBkgnd(const MONTHCAL_INFO *infoPtr, HDC hdc) ...@@ -2449,7 +2448,7 @@ MONTHCAL_EraseBkgnd(const MONTHCAL_INFO *infoPtr, HDC hdc)
static LRESULT static LRESULT
MONTHCAL_PrintClient(MONTHCAL_INFO *infoPtr, HDC hdc, DWORD options) MONTHCAL_PrintClient(MONTHCAL_INFO *infoPtr, HDC hdc, DWORD options)
{ {
FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options); FIXME("Partial Stub: (hdc %p options %#lx)\n", hdc, options);
if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwndSelf)) if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwndSelf))
return 0; return 0;
...@@ -2705,8 +2704,7 @@ static LRESULT theme_changed (const MONTHCAL_INFO* infoPtr) ...@@ -2705,8 +2704,7 @@ static LRESULT theme_changed (const MONTHCAL_INFO* infoPtr)
static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType,
const STYLESTRUCT *lpss) const STYLESTRUCT *lpss)
{ {
TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0; if (wStyleType != GWL_STYLE) return 0;
...@@ -2722,8 +2720,7 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, ...@@ -2722,8 +2720,7 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType,
static INT MONTHCAL_StyleChanging(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, static INT MONTHCAL_StyleChanging(MONTHCAL_INFO *infoPtr, WPARAM wStyleType,
STYLESTRUCT *lpss) STYLESTRUCT *lpss)
{ {
TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
wStyleType, lpss->styleOld, lpss->styleNew);
/* block MCS_MULTISELECT change */ /* block MCS_MULTISELECT change */
if ((lpss->styleNew ^ lpss->styleOld) & MCS_MULTISELECT) if ((lpss->styleNew ^ lpss->styleOld) & MCS_MULTISELECT)
...@@ -2874,7 +2871,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -2874,7 +2871,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0); MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0);
TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam); TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE)) if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW(hwnd, uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam);
...@@ -3015,7 +3012,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -3015,7 +3012,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR( "unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); ERR( "unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW(hwnd, uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam);
} }
} }
......
dlls/comctl32/nativefont.c
View file @ 8806159b
...@@ -76,8 +76,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -76,8 +76,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
NATIVEFONT_INFO *infoPtr = NATIVEFONT_GetInfoPtr(hwnd); NATIVEFONT_INFO *infoPtr = NATIVEFONT_GetInfoPtr(hwnd);
TRACE("hwnd=%p msg=%04x wparam=%08lx lparam=%08lx\n", TRACE("hwnd %p, msg %04x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE)) if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW( hwnd, uMsg, wParam, lParam ); return DefWindowProcW( hwnd, uMsg, wParam, lParam );
...@@ -102,8 +101,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -102,8 +101,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR("unknown msg %04x wp=%08lx lp=%08lx\n", ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
} }
} }
......
dlls/comctl32/pager.c
View file @ 8806159b
...@@ -219,7 +219,7 @@ PAGER_GetBorder(const PAGER_INFO *infoPtr) ...@@ -219,7 +219,7 @@ PAGER_GetBorder(const PAGER_INFO *infoPtr)
static inline COLORREF static inline COLORREF
PAGER_GetBkColor(const PAGER_INFO *infoPtr) PAGER_GetBkColor(const PAGER_INFO *infoPtr)
{ {
TRACE("[%p] returns %06x\n", infoPtr->hwndSelf, infoPtr->clrBk); TRACE("[%p] returns %#lx\n", infoPtr->hwndSelf, infoPtr->clrBk);
return infoPtr->clrBk; return infoPtr->clrBk;
} }
...@@ -446,7 +446,7 @@ PAGER_SetBkColor (PAGER_INFO* infoPtr, COLORREF clrBk) ...@@ -446,7 +446,7 @@ PAGER_SetBkColor (PAGER_INFO* infoPtr, COLORREF clrBk)
COLORREF clrTemp = infoPtr->clrBk; COLORREF clrTemp = infoPtr->clrBk;
infoPtr->clrBk = clrBk; infoPtr->clrBk = clrBk;
TRACE("[%p] %06x\n", infoPtr->hwndSelf, infoPtr->clrBk); TRACE("[%p] %#lx\n", infoPtr->hwndSelf, infoPtr->clrBk);
/* the native control seems to do things this way */ /* the native control seems to do things this way */
SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0,
...@@ -776,7 +776,7 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) ...@@ -776,7 +776,7 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y)
/* If in one of the buttons the capture and draw buttons */ /* If in one of the buttons the capture and draw buttons */
if (rect) if (rect)
{ {
TRACE("[%p] draw btn (%s), Capture %s, style %08x\n", TRACE("[%p] draw btn (%s), Capture %s, style %#lx\n",
infoPtr->hwndSelf, wine_dbgstr_rect(rect), infoPtr->hwndSelf, wine_dbgstr_rect(rect),
(infoPtr->bCapture) ? "TRUE" : "FALSE", (infoPtr->bCapture) ? "TRUE" : "FALSE",
infoPtr->dwStyle); infoPtr->dwStyle);
...@@ -943,7 +943,7 @@ PAGER_Timer (PAGER_INFO* infoPtr, INT nTimerId) ...@@ -943,7 +943,7 @@ PAGER_Timer (PAGER_INFO* infoPtr, INT nTimerId)
else else
dir = (infoPtr->dwStyle & PGS_HORZ) ? dir = (infoPtr->dwStyle & PGS_HORZ) ?
PGF_SCROLLRIGHT : PGF_SCROLLDOWN; PGF_SCROLLRIGHT : PGF_SCROLLDOWN;
TRACE("[%p] TIMERID1: style=%08x, dir=%d\n", TRACE("[%p] TIMERID1: style=%#lx, dir=%d\n",
infoPtr->hwndSelf, infoPtr->dwStyle, dir); infoPtr->hwndSelf, infoPtr->dwStyle, dir);
KillTimer(infoPtr->hwndSelf, TIMERID1); KillTimer(infoPtr->hwndSelf, TIMERID1);
SetTimer(infoPtr->hwndSelf, TIMERID1, REPEAT_DELAY, 0); SetTimer(infoPtr->hwndSelf, TIMERID1, REPEAT_DELAY, 0);
...@@ -1012,8 +1012,7 @@ PAGER_StyleChanged(PAGER_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lp ...@@ -1012,8 +1012,7 @@ PAGER_StyleChanged(PAGER_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lp
{ {
DWORD oldStyle = infoPtr->dwStyle; DWORD oldStyle = infoPtr->dwStyle;
TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0; if (wStyleType != GWL_STYLE) return 0;
...@@ -1464,7 +1463,7 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -1464,7 +1463,7 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
PAGER_INFO *infoPtr = (PAGER_INFO *)GetWindowLongPtrW(hwnd, 0); PAGER_INFO *infoPtr = (PAGER_INFO *)GetWindowLongPtrW(hwnd, 0);
TRACE("(%p, %#x, %#lx, %#lx)\n", hwnd, uMsg, wParam, lParam); TRACE("%p, %#x, %#Ix, %#Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE)) if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
......
dlls/comctl32/progress.c
View file @ 8806159b
...@@ -532,7 +532,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, ...@@ -532,7 +532,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
static const WCHAR themeClass[] = L"Progress"; static const WCHAR themeClass[] = L"Progress";
HTHEME theme; HTHEME theme;
TRACE("hwnd=%p msg=%04x wparam=%lx lParam=%lx\n", hwnd, message, wParam, lParam); TRACE("hwnd %p, msg %04x, wparam %Ix, lParam %Ix\n", hwnd, message, wParam, lParam);
infoPtr = (PROGRESS_INFO *)GetWindowLongPtrW(hwnd, 0); infoPtr = (PROGRESS_INFO *)GetWindowLongPtrW(hwnd, 0);
...@@ -712,7 +712,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, ...@@ -712,7 +712,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
case PBM_SETSTATE: case PBM_SETSTATE:
if(wParam != PBST_NORMAL) if(wParam != PBST_NORMAL)
FIXME("state %04lx not yet handled\n", wParam); FIXME("state %Ix not yet handled\n", wParam);
return PBST_NORMAL; return PBST_NORMAL;
case PBM_GETSTATE: case PBM_GETSTATE:
...@@ -734,7 +734,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, ...@@ -734,7 +734,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
default: default:
if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message)) if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message))
ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam ); ERR("unknown msg %04x, wp %Ix, lp %Ix\n", message, wParam, lParam );
return DefWindowProcW( hwnd, message, wParam, lParam ); return DefWindowProcW( hwnd, message, wParam, lParam );
} }
} }
......
dlls/comctl32/propsheet.c
View file @ 8806159b
...@@ -321,7 +321,7 @@ static void PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh, ...@@ -321,7 +321,7 @@ static void PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh,
psInfo->useCallback = (dwFlags & PSH_USECALLBACK )&& (lppsh->pfnCallback); psInfo->useCallback = (dwFlags & PSH_USECALLBACK )&& (lppsh->pfnCallback);
memcpy(&psInfo->ppshheader,lppsh,dwSize); memcpy(&psInfo->ppshheader,lppsh,dwSize);
TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%d\ndwFlags\t\t%08x\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n", TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%#lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance,
debugstr_a(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback); debugstr_a(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
...@@ -365,7 +365,7 @@ static void PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, ...@@ -365,7 +365,7 @@ static void PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh,
psInfo->useCallback = (dwFlags & PSH_USECALLBACK) && (lppsh->pfnCallback); psInfo->useCallback = (dwFlags & PSH_USECALLBACK) && (lppsh->pfnCallback);
memcpy(&psInfo->ppshheader,lppsh,dwSize); memcpy(&psInfo->ppshheader,lppsh,dwSize);
TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%d\ndwFlags\t\t%08x\nhwndParent\t%p\nhInstance\t%p\npszCaption\t%s\nnPages\t\t%d\npfnCallback\t%p\n", TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%#lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t%s\nnPages\t\t%d\npfnCallback\t%p\n",
lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_w(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback); lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_w(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
if (lppsh->dwFlags & INTRNL_ANY_WIZARD) if (lppsh->dwFlags & INTRNL_ANY_WIZARD)
...@@ -765,8 +765,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) ...@@ -765,8 +765,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo)
rc.right -= rc.left; rc.right -= rc.left;
rc.bottom -= rc.top; rc.bottom -= rc.top;
TRACE("setting tab %p, rc (0,0)-(%d,%d)\n", TRACE("setting tab %p, rc (0,0)-(%ld,%ld)\n", hwndTabCtrl, rc.right, rc.bottom);
hwndTabCtrl, rc.right, rc.bottom);
SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom, SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
...@@ -787,8 +786,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) ...@@ -787,8 +786,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo)
/* /*
* Resize the property sheet. * Resize the property sheet.
*/ */
TRACE("setting dialog %p, rc (0,0)-(%d,%d)\n", TRACE("setting dialog %p, rc (0,0)-(%ld,%ld)\n", hwndDlg, rc.right, rc.bottom);
hwndDlg, rc.right, rc.bottom);
SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom, SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
return TRUE; return TRUE;
...@@ -820,8 +818,7 @@ static BOOL PROPSHEET_AdjustSizeWizard(HWND hwndDlg, const PropSheetInfo* psInfo ...@@ -820,8 +818,7 @@ static BOOL PROPSHEET_AdjustSizeWizard(HWND hwndDlg, const PropSheetInfo* psInfo
AdjustWindowRect(&rc, GetWindowLongW(hwndDlg, GWL_STYLE), FALSE); AdjustWindowRect(&rc, GetWindowLongW(hwndDlg, GWL_STYLE), FALSE);
/* Resize the property sheet */ /* Resize the property sheet */
TRACE("setting dialog %p, rc (0,0)-(%d,%d)\n", TRACE("setting dialog %p, rc (0,0)-(%ld,%ld)\n", hwndDlg, rc.right, rc.bottom);
hwndDlg, rc.right, rc.bottom);
SetWindowPos(hwndDlg, 0, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SetWindowPos(hwndDlg, 0, 0, 0, rc.right - rc.left, rc.bottom - rc.top,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
...@@ -1297,7 +1294,7 @@ static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate) ...@@ -1297,7 +1294,7 @@ static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate)
p++; p++;
break; break;
case 0xffff: case 0xffff:
TRACE("class ordinal 0x%08x\n",*(const DWORD*)p); TRACE("class ordinal %#lx\n",*(const DWORD*)p);
p += 2; p += 2;
break; break;
default: default:
...@@ -1313,7 +1310,7 @@ static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate) ...@@ -1313,7 +1310,7 @@ static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate)
p++; p++;
break; break;
case 0xffff: case 0xffff:
TRACE("text ordinal 0x%08x\n",*(const DWORD*)p); TRACE("text ordinal %#lx\n",*(const DWORD*)p);
p += 2; p += 2;
break; break;
default: default:
...@@ -1405,7 +1402,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, ...@@ -1405,7 +1402,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent,
if (!pTemplateCopy) if (!pTemplateCopy)
return FALSE; return FALSE;
TRACE("copying pTemplate %p into pTemplateCopy %p (%d)\n", pTemplate, pTemplateCopy, resSize); TRACE("copying pTemplate %p into pTemplateCopy %p (%ld)\n", pTemplate, pTemplateCopy, resSize);
memcpy(pTemplateCopy, pTemplate, resSize); memcpy(pTemplateCopy, pTemplate, resSize);
if (((MyDLGTEMPLATEEX*)pTemplateCopy)->signature == 0xFFFF) if (((MyDLGTEMPLATEEX*)pTemplateCopy)->signature == 0xFFFF)
...@@ -1674,7 +1671,7 @@ static BOOL PROPSHEET_Finish(HWND hwndDlg) ...@@ -1674,7 +1671,7 @@ static BOOL PROPSHEET_Finish(HWND hwndDlg)
msgResult = SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn); msgResult = SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
TRACE("msg result %ld\n", msgResult); TRACE("msg result %Id\n", msgResult);
if (msgResult != 0) if (msgResult != 0)
return FALSE; return FALSE;
...@@ -2030,7 +2027,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, ...@@ -2030,7 +2027,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg,
* NOTE: The resizing happens every time the page is selected and * NOTE: The resizing happens every time the page is selected and
* not only when it's created (some applications depend on it). */ * not only when it's created (some applications depend on it). */
PROPSHEET_GetPageRect(psInfo, hwndDlg, &rc, ppshpage); PROPSHEET_GetPageRect(psInfo, hwndDlg, &rc, ppshpage);
TRACE("setting page %p, rc (%s) w=%d, h=%d\n", TRACE("setting page %p, rc (%s) w=%ld, h=%ld\n",
psInfo->proppage[index].hwndPage, wine_dbgstr_rect(&rc), psInfo->proppage[index].hwndPage, wine_dbgstr_rect(&rc),
rc.right - rc.left, rc.bottom - rc.top); rc.right - rc.left, rc.bottom - rc.top);
SetWindowPos(psInfo->proppage[index].hwndPage, HWND_TOP, SetWindowPos(psInfo->proppage[index].hwndPage, HWND_TOP,
...@@ -2136,7 +2133,7 @@ static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText) ...@@ -2136,7 +2133,7 @@ static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText)
PropSheetInfo* psInfo = GetPropW(hwndDlg, PropSheetInfoStr); PropSheetInfo* psInfo = GetPropW(hwndDlg, PropSheetInfoStr);
WCHAR szTitle[256]; WCHAR szTitle[256];
TRACE("%s (style %08x)\n", debugstr_w(lpszText), dwStyle); TRACE("%s (style %#lx)\n", debugstr_w(lpszText), dwStyle);
if (IS_INTRESOURCE(lpszText)) { if (IS_INTRESOURCE(lpszText)) {
if (!LoadStringW(psInfo->ppshheader.hInstance, LOWORD(lpszText), szTitle, ARRAY_SIZE(szTitle))) if (!LoadStringW(psInfo->ppshheader.hInstance, LOWORD(lpszText), szTitle, ARRAY_SIZE(szTitle)))
return; return;
...@@ -2458,7 +2455,7 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) ...@@ -2458,7 +2455,7 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH);
TRACE("%d\n", dwFlags); TRACE("%lx\n", dwFlags);
EnableWindow(hwndBack, dwFlags & PSWIZB_BACK); EnableWindow(hwndBack, dwFlags & PSWIZB_BACK);
EnableWindow(hwndNext, dwFlags & PSWIZB_NEXT); EnableWindow(hwndNext, dwFlags & PSWIZB_NEXT);
...@@ -3444,8 +3441,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) ...@@ -3444,8 +3441,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam)
static INT_PTR CALLBACK static INT_PTR CALLBACK
PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n", TRACE("hwnd %p, msg=0x%04x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
hwnd, uMsg, wParam, lParam);
switch (uMsg) switch (uMsg)
{ {
......
dlls/comctl32/smoothscroll.c
View file @ 8806159b
...@@ -112,9 +112,7 @@ BOOL WINAPI SmoothScrollWindow( const SMOOTHSCROLLSTRUCT *smooth ) { ...@@ -112,9 +112,7 @@ BOOL WINAPI SmoothScrollWindow( const SMOOTHSCROLLSTRUCT *smooth ) {
); );
} }
FIXME("(hwnd=%p,flags=%x,x2=%x): should smooth scroll here.\n", FIXME("(hwnd=%p,flags=%lx,x2=%lx): should smooth scroll here.\n", smooth->hwnd, flags, smooth->x2);
smooth->hwnd,flags,smooth->x2
);
/* FIXME: do timer based smooth scrolling */ /* FIXME: do timer based smooth scrolling */
if ((smooth->x2 & 1) && smooth->scrollfun) if ((smooth->x2 & 1) && smooth->scrollfun)
return smooth->scrollfun( return smooth->scrollfun(
......
dlls/comctl32/static.c
View file @ 8806159b
...@@ -438,7 +438,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, ...@@ -438,7 +438,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam,
if (style < 0L || style > SS_TYPEMASK) if (style < 0L || style > SS_TYPEMASK)
{ {
ERR("Unknown style 0x%02x\n", style ); ERR("Unknown style %#lx\n", style );
return -1; return -1;
} }
...@@ -613,7 +613,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, ...@@ -613,7 +613,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam,
lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style );
break; break;
default: default:
FIXME("STM_SETIMAGE: Unhandled type %lx\n", wParam); FIXME("STM_SETIMAGE: Unhandled type %Ix\n", wParam);
break; break;
} }
STATIC_TryPaintFcn( hwnd, full_style ); STATIC_TryPaintFcn( hwnd, full_style );
......
dlls/comctl32/status.c
View file @ 8806159b
...@@ -110,7 +110,7 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) ...@@ -110,7 +110,7 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr)
margin = (tm.tmInternalLeading ? tm.tmInternalLeading : 2); margin = (tm.tmInternalLeading ? tm.tmInternalLeading : 2);
height = max(tm.tmHeight + margin + 2*GetSystemMetrics(SM_CYBORDER), infoPtr->minHeight) + infoPtr->verticalBorder; height = max(tm.tmHeight + margin + 2*GetSystemMetrics(SM_CYBORDER), infoPtr->minHeight) + infoPtr->verticalBorder;
TRACE(" textHeight=%d+%d, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height); TRACE(" textHeight=%ld+%ld, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height);
return height; return height;
} }
...@@ -542,7 +542,7 @@ STATUSBAR_SetBkColor (STATUS_INFO *infoPtr, COLORREF color) ...@@ -542,7 +542,7 @@ STATUSBAR_SetBkColor (STATUS_INFO *infoPtr, COLORREF color)
infoPtr->clrBk = color; infoPtr->clrBk = color;
InvalidateRect(infoPtr->Self, NULL, FALSE); InvalidateRect(infoPtr->Self, NULL, FALSE);
TRACE("CREF: %08x -> %08x\n", oldBkColor, infoPtr->clrBk); TRACE("CREF: %#lx -> %#lx\n", oldBkColor, infoPtr->clrBk);
return oldBkColor; return oldBkColor;
} }
...@@ -1101,7 +1101,7 @@ STATUSBAR_SendMouseNotify(const STATUS_INFO *infoPtr, UINT code, UINT msg, WPARA ...@@ -1101,7 +1101,7 @@ STATUSBAR_SendMouseNotify(const STATUS_INFO *infoPtr, UINT code, UINT msg, WPARA
{ {
NMMOUSE nm; NMMOUSE nm;
TRACE("code %04x, lParam=%lx\n", code, lParam); TRACE("code %04x, lParam %Ix\n", code, lParam);
nm.hdr.hwndFrom = infoPtr->Self; nm.hdr.hwndFrom = infoPtr->Self;
nm.hdr.idFrom = GetWindowLongPtrW(infoPtr->Self, GWLP_ID); nm.hdr.idFrom = GetWindowLongPtrW(infoPtr->Self, GWLP_ID);
nm.hdr.code = code; nm.hdr.code = code;
...@@ -1128,7 +1128,8 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -1128,7 +1128,8 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
INT nPart = ((INT) wParam) & 0x00ff; INT nPart = ((INT) wParam) & 0x00ff;
LRESULT res; LRESULT res;
TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, msg, wParam, lParam);
if (!infoPtr && msg != WM_CREATE) if (!infoPtr && msg != WM_CREATE)
return DefWindowProcW (hwnd, msg, wParam, lParam); return DefWindowProcW (hwnd, msg, wParam, lParam);
...@@ -1267,8 +1268,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -1267,8 +1268,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
default: default:
if ((msg >= WM_USER) && (msg < WM_APP) && !COMCTL32_IsReflectedMessage(msg)) if ((msg >= WM_USER) && (msg < WM_APP) && !COMCTL32_IsReflectedMessage(msg))
ERR("unknown msg %04x wp=%04lx lp=%08lx\n", ERR("unknown msg %04x wp=%Ix lp=%Ix\n", msg, wParam, lParam);
msg, wParam, lParam);
return DefWindowProcW (hwnd, msg, wParam, lParam); return DefWindowProcW (hwnd, msg, wParam, lParam);
} }
} }
......
dlls/comctl32/syslink.c
View file @ 8806159b
...@@ -1497,7 +1497,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, ...@@ -1497,7 +1497,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message,
{ {
SYSLINK_INFO *infoPtr; SYSLINK_INFO *infoPtr;
TRACE("hwnd=%p msg=%04x wparam=%lx lParam=%lx\n", hwnd, message, wParam, lParam); TRACE("hwnd %p, msg %04x, wparam %Ix, lParam %Ix\n", hwnd, message, wParam, lParam);
infoPtr = (SYSLINK_INFO *)GetWindowLongPtrW(hwnd, 0); infoPtr = (SYSLINK_INFO *)GetWindowLongPtrW(hwnd, 0);
...@@ -1726,7 +1726,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, ...@@ -1726,7 +1726,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message,
default: default:
if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message)) if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message))
{ {
ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam ); ERR("unknown msg %04x, wp %Ix, lp %Ix\n", message, wParam, lParam );
} }
return DefWindowProcW(hwnd, message, wParam, lParam); return DefWindowProcW(hwnd, message, wParam, lParam);
} }
......
dlls/comctl32/tab.c
View file @ 8806159b
...@@ -203,9 +203,9 @@ static void ...@@ -203,9 +203,9 @@ static void
TAB_DumpItemExternalT(const TCITEMW *pti, UINT iItem, BOOL isW) TAB_DumpItemExternalT(const TCITEMW *pti, UINT iItem, BOOL isW)
{ {
if (TRACE_ON(tab)) { if (TRACE_ON(tab)) {
TRACE("external tab %d, mask=0x%08x, dwState=0x%08x, dwStateMask=0x%08x, cchTextMax=0x%08x\n", TRACE("external tab %d, mask=0x%08x, dwState %#lx, dwStateMask %#lx, cchTextMax=0x%08x\n",
iItem, pti->mask, pti->dwState, pti->dwStateMask, pti->cchTextMax); iItem, pti->mask, pti->dwState, pti->dwStateMask, pti->cchTextMax);
TRACE("external tab %d, iImage=%d, lParam=0x%08lx, pszTextW=%s\n", TRACE("external tab %d, iImage=%d, lParam %Ix, pszTextW=%s\n",
iItem, pti->iImage, pti->lParam, isW ? debugstr_w(pti->pszText) : debugstr_a((LPSTR)pti->pszText)); iItem, pti->iImage, pti->lParam, isW ? debugstr_w(pti->pszText) : debugstr_a((LPSTR)pti->pszText));
} }
} }
...@@ -216,10 +216,8 @@ TAB_DumpItemInternal(const TAB_INFO *infoPtr, UINT iItem) ...@@ -216,10 +216,8 @@ TAB_DumpItemInternal(const TAB_INFO *infoPtr, UINT iItem)
if (TRACE_ON(tab)) { if (TRACE_ON(tab)) {
TAB_ITEM *ti = TAB_GetItem(infoPtr, iItem); TAB_ITEM *ti = TAB_GetItem(infoPtr, iItem);
TRACE("tab %d, dwState=0x%08x, pszText=%s, iImage=%d\n", TRACE("tab %d, dwState %#lx, pszText %s, iImage %d\n", iItem, ti->dwState, debugstr_w(ti->pszText), ti->iImage);
iItem, ti->dwState, debugstr_w(ti->pszText), ti->iImage); TRACE("tab %d, rect.left=%ld, rect.top(row)=%ld\n", iItem, ti->rect.left, ti->rect.top);
TRACE("tab %d, rect.left=%d, rect.top(row)=%d\n",
iItem, ti->rect.left, ti->rect.top);
} }
} }
...@@ -929,8 +927,7 @@ static LRESULT TAB_AdjustRect(const TAB_INFO *infoPtr, WPARAM fLarger, LPRECT pr ...@@ -929,8 +927,7 @@ static LRESULT TAB_AdjustRect(const TAB_INFO *infoPtr, WPARAM fLarger, LPRECT pr
{ {
LONG *iRightBottom, *iLeftTop; LONG *iRightBottom, *iLeftTop;
TRACE ("hwnd=%p fLarger=%ld (%s)\n", infoPtr->hwnd, fLarger, TRACE("hwnd %p, fLarger %Id, (%s)\n", infoPtr->hwnd, fLarger, wine_dbgstr_rect(prc));
wine_dbgstr_rect(prc));
if (!prc) return -1; if (!prc) return -1;
...@@ -1173,11 +1170,10 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) ...@@ -1173,11 +1170,10 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr)
((infoPtr->dwStyle & TCS_BUTTONS) ? 2 : 1) * ((infoPtr->dwStyle & TCS_BUTTONS) ? 2 : 1) *
infoPtr->uVItemPadding; infoPtr->uVItemPadding;
TRACE("tabH=%d, tmH=%d, iconh=%d\n", TRACE("tabH=%d, tmH %ld, iconh %d\n", infoPtr->tabHeight, fontMetrics.tmHeight, icon_height);
infoPtr->tabHeight, fontMetrics.tmHeight, icon_height);
} }
TRACE("client right=%d\n", clientRect.right); TRACE("client right %ld\n", clientRect.right);
/* Get the icon width */ /* Get the icon width */
if (infoPtr->himl) if (infoPtr->himl)
...@@ -1331,7 +1327,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) ...@@ -1331,7 +1327,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr)
curr->rect.right -= curr->rect.left; curr->rect.right -= curr->rect.left;
curr->rect.left = 0; curr->rect.left = 0;
TRACE("r=%d, cl=%d, cl.r=%d, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n", TRACE("r=%ld, cl=%d, cl.r=%ld, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n",
curr->rect.right, curItemLeftPos, clientRect.right, curr->rect.right, curItemLeftPos, clientRect.right,
iCount, iRow, infoPtr->uNumRows, remTab, tabPerRow); iCount, iRow, infoPtr->uNumRows, remTab, tabPerRow);
...@@ -1796,8 +1792,8 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect ...@@ -1796,8 +1792,8 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect
if (center_offset_v < 0) if (center_offset_v < 0)
center_offset_v = 0; center_offset_v = 0;
TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%d\n", TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%ld\n",
debugstr_w(item->pszText), center_offset_h, center_offset_v, debugstr_w(item->pszText), center_offset_h, center_offset_v,
wine_dbgstr_rect(drawRect), (rcText.right-rcText.left)); wine_dbgstr_rect(drawRect), (rcText.right-rcText.left));
...@@ -1823,8 +1819,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect ...@@ -1823,8 +1819,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect
drawRect->left += cx + infoPtr->uHItemPadding; drawRect->left += cx + infoPtr->uHItemPadding;
} }
TRACE("drawing image=%d, left=%d, top=%d\n", TRACE("drawing image %d, left %ld, top %ld\n", item->iImage, rcImage.left, rcImage.top-1);
item->iImage, rcImage.left, rcImage.top-1);
ImageList_Draw ImageList_Draw
( (
infoPtr->himl, infoPtr->himl,
...@@ -1914,7 +1909,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect ...@@ -1914,7 +1909,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect
} }
else else
{ {
TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%d\n", TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%ld\n",
debugstr_w(item->pszText), center_offset_h, center_offset_v, debugstr_w(item->pszText), center_offset_h, center_offset_v,
wine_dbgstr_rect(drawRect), (rcText.right-rcText.left)); wine_dbgstr_rect(drawRect), (rcText.right-rcText.left));
if (item->pszText) if (item->pszText)
...@@ -3240,8 +3235,7 @@ TAB_DeselectAll (TAB_INFO *infoPtr, BOOL excludesel) ...@@ -3240,8 +3235,7 @@ TAB_DeselectAll (TAB_INFO *infoPtr, BOOL excludesel)
static INT TAB_StyleChanged(TAB_INFO *infoPtr, WPARAM wStyleType, static INT TAB_StyleChanged(TAB_INFO *infoPtr, WPARAM wStyleType,
const STYLESTRUCT *lpss) const STYLESTRUCT *lpss)
{ {
TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", TRACE("style type %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew);
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0; if (wStyleType != GWL_STYLE) return 0;
...@@ -3258,7 +3252,8 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -3258,7 +3252,8 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
TRACE("hwnd=%p msg=%x wParam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam); TRACE("hwnd %p, msg %x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE)) if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
...@@ -3425,8 +3420,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -3425,8 +3420,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
if (uMsg >= WM_USER && uMsg < WM_APP && !COMCTL32_IsReflectedMessage(uMsg)) if (uMsg >= WM_USER && uMsg < WM_APP && !COMCTL32_IsReflectedMessage(uMsg))
WARN("unknown msg %04x wp=%08lx lp=%08lx\n", WARN("unknown msg %04x wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
uMsg, wParam, lParam);
break; break;
} }
return DefWindowProcW(hwnd, uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam);
......
dlls/comctl32/taskdialog.c
View file @ 8806159b
...@@ -1210,7 +1210,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR ...@@ -1210,7 +1210,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
struct taskdialog_info *dialog_info; struct taskdialog_info *dialog_info;
LRESULT result; LRESULT result;
TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); TRACE("hwnd %p, msg 0x%04x, wparam %Ix, lparam %Ix\n", hwnd, msg, wParam, lParam);
if (msg != WM_INITDIALOG) if (msg != WM_INITDIALOG)
dialog_info = GetPropW(hwnd, taskdialog_info_propnameW); dialog_info = GetPropW(hwnd, taskdialog_info_propnameW);
......
dlls/comctl32/tooltips.c
View file @ 8806159b
...@@ -228,7 +228,7 @@ TOOLTIPS_notify_customdraw (DWORD dwDrawStage, NMTTCUSTOMDRAW *lpnmttcd) ...@@ -228,7 +228,7 @@ TOOLTIPS_notify_customdraw (DWORD dwDrawStage, NMTTCUSTOMDRAW *lpnmttcd)
LRESULT result; LRESULT result;
lpnmttcd->nmcd.dwDrawStage = dwDrawStage; lpnmttcd->nmcd.dwDrawStage = dwDrawStage;
TRACE("Notifying stage %d, flags %x, id %x\n", lpnmttcd->nmcd.dwDrawStage, TRACE("Notifying stage %ld, flags %x, id %x\n", lpnmttcd->nmcd.dwDrawStage,
lpnmttcd->uDrawFlags, lpnmttcd->nmcd.hdr.code); lpnmttcd->uDrawFlags, lpnmttcd->nmcd.hdr.code);
result = SendMessageW(GetParent(lpnmttcd->nmcd.hdr.hwndFrom), WM_NOTIFY, result = SendMessageW(GetParent(lpnmttcd->nmcd.hdr.hwndFrom), WM_NOTIFY,
...@@ -370,7 +370,7 @@ static void TOOLTIPS_GetDispInfoA(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too ...@@ -370,7 +370,7 @@ static void TOOLTIPS_GetDispInfoA(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too
ttnmdi.uFlags = toolPtr->uFlags; ttnmdi.uFlags = toolPtr->uFlags;
ttnmdi.lParam = toolPtr->lParam; ttnmdi.lParam = toolPtr->lParam;
TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom); TRACE("hdr.idFrom = %Ix\n", ttnmdi.hdr.idFrom);
SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi);
if (IS_INTRESOURCE(ttnmdi.lpszText)) { if (IS_INTRESOURCE(ttnmdi.lpszText)) {
...@@ -426,7 +426,7 @@ static void TOOLTIPS_GetDispInfoW(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too ...@@ -426,7 +426,7 @@ static void TOOLTIPS_GetDispInfoW(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too
ttnmdi.uFlags = toolPtr->uFlags; ttnmdi.uFlags = toolPtr->uFlags;
ttnmdi.lParam = toolPtr->lParam; ttnmdi.lParam = toolPtr->lParam;
TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom); TRACE("hdr.idFrom = %Ix\n", ttnmdi.hdr.idFrom);
SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi);
if (IS_INTRESOURCE(ttnmdi.lpszText)) { if (IS_INTRESOURCE(ttnmdi.lpszText)) {
...@@ -616,7 +616,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) ...@@ -616,7 +616,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate)
toolPtr = &infoPtr->tools[nTool]; toolPtr = &infoPtr->tools[nTool];
TOOLTIPS_CalcTipSize (infoPtr, &size); TOOLTIPS_CalcTipSize (infoPtr, &size);
TRACE("Show tooltip %d, %s, size %d x %d\n", nTool, debugstr_w(infoPtr->szTipText), TRACE("Show tooltip %d, %s, size %ld x %ld\n", nTool, debugstr_w(infoPtr->szTipText),
size.cx, size.cy); size.cx, size.cy);
if (track_activate && (toolPtr->uFlags & TTF_TRACK)) if (track_activate && (toolPtr->uFlags & TTF_TRACK))
...@@ -720,7 +720,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) ...@@ -720,7 +720,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate)
} }
} }
TRACE("pos %d - %d\n", rect.left, rect.top); TRACE("pos %ld - %ld\n", rect.left, rect.top);
rect.right = rect.left + size.cx; rect.right = rect.left + size.cx;
rect.bottom = rect.top + size.cy; rect.bottom = rect.top + size.cy;
...@@ -1045,7 +1045,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) ...@@ -1045,7 +1045,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW)
if (!ti) return FALSE; if (!ti) return FALSE;
TRACE("add tool (%p) %p %ld%s\n", infoPtr->hwndSelf, ti->hwnd, ti->uId, TRACE("add tool (%p) %p %Id%s\n", infoPtr->hwndSelf, ti->hwnd, ti->uId,
(ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
if (ti->cbSize > TTTOOLINFOW_V3_SIZE && isW) if (ti->cbSize > TTTOOLINFOW_V3_SIZE && isW)
...@@ -1285,7 +1285,7 @@ TOOLTIPS_GetBubbleSize (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolI ...@@ -1285,7 +1285,7 @@ TOOLTIPS_GetBubbleSize (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolI
TRACE("tool %d\n", nTool); TRACE("tool %d\n", nTool);
TOOLTIPS_CalcTipSize (infoPtr, &size); TOOLTIPS_CalcTipSize (infoPtr, &size);
TRACE("size %d x %d\n", size.cx, size.cy); TRACE("size %ld x %ld\n", size.cx, size.cy);
return MAKELRESULT(size.cx, size.cy); return MAKELRESULT(size.cx, size.cy);
} }
...@@ -1320,7 +1320,7 @@ TOOLTIPS_GetDelayTime (const TOOLTIPS_INFO *infoPtr, DWORD duration) ...@@ -1320,7 +1320,7 @@ TOOLTIPS_GetDelayTime (const TOOLTIPS_INFO *infoPtr, DWORD duration)
return infoPtr->nInitialTime; return infoPtr->nInitialTime;
default: default:
WARN("Invalid duration flag %x\n", duration); WARN("Invalid duration flag %lx\n", duration);
break; break;
} }
...@@ -1577,7 +1577,7 @@ TOOLTIPS_SetDelayTime (TOOLTIPS_INFO *infoPtr, DWORD duration, INT nTime) ...@@ -1577,7 +1577,7 @@ TOOLTIPS_SetDelayTime (TOOLTIPS_INFO *infoPtr, DWORD duration, INT nTime)
break; break;
default: default:
WARN("Invalid duration flag %x\n", duration); WARN("Invalid duration flag %lx\n", duration);
break; break;
} }
...@@ -1924,7 +1924,7 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -1924,7 +1924,7 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
static LRESULT static LRESULT
TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{ {
FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", infoPtr->hwndSelf, wParam, lParam); FIXME("hwnd %p, wParam %Ix, lParam %Ix\n", infoPtr->hwndSelf, wParam, lParam);
return 0; return 0;
} }
...@@ -2102,7 +2102,8 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -2102,7 +2102,8 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam); TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE)) if (!infoPtr && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
switch (uMsg) switch (uMsg)
...@@ -2270,8 +2271,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -2270,8 +2271,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR("unknown msg %04x wp=%08lx lp=%08lx\n", ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
} }
} }
......
dlls/comctl32/trackbar.c
View file @ 8806159b
...@@ -118,7 +118,7 @@ static LRESULT notify_hdr (const TRACKBAR_INFO *infoPtr, INT code, LPNMHDR pnmh) ...@@ -118,7 +118,7 @@ static LRESULT notify_hdr (const TRACKBAR_INFO *infoPtr, INT code, LPNMHDR pnmh)
pnmh->code = code; pnmh->code = code;
result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh); result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh);
TRACE(" <= %ld\n", result); TRACE(" <= %Id\n", result);
return result; return result;
} }
...@@ -443,7 +443,7 @@ TRACKBAR_AutoPage (TRACKBAR_INFO *infoPtr, POINT clickPoint) ...@@ -443,7 +443,7 @@ TRACKBAR_AutoPage (TRACKBAR_INFO *infoPtr, POINT clickPoint)
LONG dir = TRACKBAR_GetAutoPageDirection(infoPtr, clickPoint); LONG dir = TRACKBAR_GetAutoPageDirection(infoPtr, clickPoint);
LONG prevPos = infoPtr->lPos; LONG prevPos = infoPtr->lPos;
TRACE("clickPoint=%s, dir=%d\n", wine_dbgstr_point(&clickPoint), dir); TRACE("clickPoint=%s, dir=%ld\n", wine_dbgstr_point(&clickPoint), dir);
if (dir > 0 && (infoPtr->flags & TB_AUTO_PAGE_RIGHT)) if (dir > 0 && (infoPtr->flags & TB_AUTO_PAGE_RIGHT))
TRACKBAR_PageDown(infoPtr); TRACKBAR_PageDown(infoPtr);
...@@ -1127,7 +1127,6 @@ static int __cdecl comp_tics (const void *ap, const void *bp) ...@@ -1127,7 +1127,6 @@ static int __cdecl comp_tics (const void *ap, const void *bp)
const DWORD a = *(const DWORD *)ap; const DWORD a = *(const DWORD *)ap;
const DWORD b = *(const DWORD *)bp; const DWORD b = *(const DWORD *)bp;
TRACE("(a=%d, b=%d)\n", a, b);
if (a < b) return -1; if (a < b) return -1;
if (a > b) return 1; if (a > b) return 1;
return 0; return 0;
...@@ -1407,7 +1406,7 @@ TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos) ...@@ -1407,7 +1406,7 @@ TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos)
if ((lPos < infoPtr->lRangeMin) || (lPos> infoPtr->lRangeMax)) if ((lPos < infoPtr->lRangeMin) || (lPos> infoPtr->lRangeMax))
return FALSE; return FALSE;
TRACE("lPos=%d\n", lPos); TRACE("position %ld\n", lPos);
infoPtr->uNumTics++; infoPtr->uNumTics++;
infoPtr->tics=ReAlloc( infoPtr->tics, infoPtr->tics=ReAlloc( infoPtr->tics,
...@@ -1885,7 +1884,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -1885,7 +1884,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
TRACKBAR_INFO *infoPtr = (TRACKBAR_INFO *)GetWindowLongPtrW (hwnd, 0); TRACKBAR_INFO *infoPtr = (TRACKBAR_INFO *)GetWindowLongPtrW (hwnd, 0);
TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam); TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE)) if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
...@@ -2064,7 +2063,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -2064,7 +2063,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam);
} }
} }
......
dlls/comctl32/treeview.c
View file @ 8806159b
...@@ -624,7 +624,7 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, ...@@ -624,7 +624,7 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage,
NMTVCUSTOMDRAW nmcdhdr; NMTVCUSTOMDRAW nmcdhdr;
NMCUSTOMDRAW *nmcd; NMCUSTOMDRAW *nmcd;
TRACE("drawstage:0x%x hdc:%p\n", dwDrawStage, hdc); TRACE("drawstage %#lx, hdc %p\n", dwDrawStage, hdc);
nmcd = &nmcdhdr.nmcd; nmcd = &nmcdhdr.nmcd;
nmcd->dwDrawStage = dwDrawStage; nmcd->dwDrawStage = dwDrawStage;
...@@ -671,7 +671,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, ...@@ -671,7 +671,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc,
nmcd->lItemlParam = item->lParam; nmcd->lItemlParam = item->lParam;
nmcdhdr->iLevel = item->iLevel; nmcdhdr->iLevel = item->iLevel;
TRACE("drawstage:0x%x hdc:%p item:%lx, itemstate:0x%x, lItemlParam:0x%lx\n", TRACE("drawstage %#lx hdc:%p item:%Ix, itemstate:0x%x, lItemlParam:%Ix\n",
nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec,
nmcd->uItemState, nmcd->lItemlParam); nmcd->uItemState, nmcd->lItemlParam);
...@@ -2005,7 +2005,7 @@ TREEVIEW_SetInsertMarkColor(TREEVIEW_INFO *infoPtr, COLORREF color) ...@@ -2005,7 +2005,7 @@ TREEVIEW_SetInsertMarkColor(TREEVIEW_INFO *infoPtr, COLORREF color)
{ {
COLORREF prevColor = infoPtr->clrInsertMark; COLORREF prevColor = infoPtr->clrInsertMark;
TRACE("0x%08x\n", color); TRACE("%#lx\n", color);
infoPtr->clrInsertMark = color; infoPtr->clrInsertMark = color;
return (LRESULT)prevColor; return (LRESULT)prevColor;
...@@ -2079,7 +2079,7 @@ static inline LRESULT ...@@ -2079,7 +2079,7 @@ static inline LRESULT
TREEVIEW_GetVisibleCount(const TREEVIEW_INFO *infoPtr) TREEVIEW_GetVisibleCount(const TREEVIEW_INFO *infoPtr)
{ {
/* Surprise! This does not take integral height into account. */ /* Surprise! This does not take integral height into account. */
TRACE("client=%d, item=%d\n", infoPtr->clientHeight, infoPtr->uItemHeight); TRACE("client=%ld, item=%d\n", infoPtr->clientHeight, infoPtr->uItemHeight);
return infoPtr->clientHeight / infoPtr->uItemHeight; return infoPtr->clientHeight / infoPtr->uItemHeight;
} }
...@@ -3113,7 +3113,7 @@ TREEVIEW_Paint(TREEVIEW_INFO *infoPtr, HDC hdc_ref) ...@@ -3113,7 +3113,7 @@ TREEVIEW_Paint(TREEVIEW_INFO *infoPtr, HDC hdc_ref)
static LRESULT static LRESULT
TREEVIEW_PrintClient(TREEVIEW_INFO *infoPtr, HDC hdc, DWORD options) TREEVIEW_PrintClient(TREEVIEW_INFO *infoPtr, HDC hdc, DWORD options)
{ {
FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options); FIXME("Partial Stub: (hdc=%p options=%#lx)\n", hdc, options);
if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwnd)) if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwnd))
return 0; return 0;
...@@ -3789,7 +3789,7 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) ...@@ -3789,7 +3789,7 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht)
} }
lpht->hItem = item; lpht->hItem = item;
TRACE("(%d,%d):result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags); TRACE("(%ld, %ld) : result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags);
return item; return item;
} }
...@@ -3866,7 +3866,7 @@ TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -3866,7 +3866,7 @@ TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
static LRESULT static LRESULT
TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{ {
TRACE("code=0x%x, id=0x%x, handle=0x%lx\n", HIWORD(wParam), LOWORD(wParam), lParam); TRACE("code 0x%x, id=0x%x, handle %Ix\n", HIWORD(wParam), LOWORD(wParam), lParam);
switch (HIWORD(wParam)) switch (HIWORD(wParam))
{ {
...@@ -4472,7 +4472,7 @@ TREEVIEW_CreateDragImage(TREEVIEW_INFO *infoPtr, LPARAM lParam) ...@@ -4472,7 +4472,7 @@ TREEVIEW_CreateDragImage(TREEVIEW_INFO *infoPtr, LPARAM lParam)
else else
GetTextExtentPoint32A(hdc, "", 0, &size); GetTextExtentPoint32A(hdc, "", 0, &size);
TRACE("%d %d %s\n", size.cx, size.cy, debugstr_w(dragItem->pszText)); TRACE("%ld, %ld, %s\n", size.cx, size.cy, debugstr_w(dragItem->pszText));
hbmp = CreateCompatibleBitmap(htopdc, size.cx, size.cy); hbmp = CreateCompatibleBitmap(htopdc, size.cx, size.cy);
hOldbmp = SelectObject(hdc, hbmp); hOldbmp = SelectObject(hdc, hbmp);
...@@ -4804,7 +4804,7 @@ TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr, HTREEITEM item, BOOL bHScroll) ...@@ -4804,7 +4804,7 @@ TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr, HTREEITEM item, BOOL bHScroll)
viscount = TREEVIEW_GetVisibleCount(infoPtr); viscount = TREEVIEW_GetVisibleCount(infoPtr);
TRACE("%p (%s) %d - %d viscount(%d)\n", item, TREEVIEW_ItemName(item), item->visibleOrder, TRACE("%p (%s) %ld - %ld viscount(%d)\n", item, TREEVIEW_ItemName(item), item->visibleOrder,
hasFirstVisible ? infoPtr->firstVisible->visibleOrder : -1, viscount); hasFirstVisible ? infoPtr->firstVisible->visibleOrder : -1, viscount);
if (hasFirstVisible) if (hasFirstVisible)
...@@ -4939,7 +4939,7 @@ TREEVIEW_VScroll(TREEVIEW_INFO *infoPtr, WPARAM wParam) ...@@ -4939,7 +4939,7 @@ TREEVIEW_VScroll(TREEVIEW_INFO *infoPtr, WPARAM wParam)
int nScrollCode = LOWORD(wParam); int nScrollCode = LOWORD(wParam);
TRACE("wp %lx\n", wParam); TRACE("wp %Ix\n", wParam);
if (!(infoPtr->uInternalStatus & TV_VSCROLL)) if (!(infoPtr->uInternalStatus & TV_VSCROLL))
return 0; return 0;
...@@ -5009,7 +5009,7 @@ TREEVIEW_HScroll(TREEVIEW_INFO *infoPtr, WPARAM wParam) ...@@ -5009,7 +5009,7 @@ TREEVIEW_HScroll(TREEVIEW_INFO *infoPtr, WPARAM wParam)
int scrollX = infoPtr->scrollX; int scrollX = infoPtr->scrollX;
int nScrollCode = LOWORD(wParam); int nScrollCode = LOWORD(wParam);
TRACE("wp %lx\n", wParam); TRACE("wp %Ix\n", wParam);
if (!(infoPtr->uInternalStatus & TV_HSCROLL)) if (!(infoPtr->uInternalStatus & TV_HSCROLL))
return FALSE; return FALSE;
...@@ -5131,7 +5131,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) ...@@ -5131,7 +5131,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
TREEVIEW_INFO *infoPtr; TREEVIEW_INFO *infoPtr;
LOGFONTW lf; LOGFONTW lf;
TRACE("wnd %p, style 0x%x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE)); TRACE("wnd %p, style %#lx\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE));
infoPtr = heap_alloc_zero(sizeof(TREEVIEW_INFO)); infoPtr = heap_alloc_zero(sizeof(TREEVIEW_INFO));
...@@ -5323,7 +5323,7 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) ...@@ -5323,7 +5323,7 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam)
TREEVIEW_ITEM *prevItem = infoPtr->selectedItem; TREEVIEW_ITEM *prevItem = infoPtr->selectedItem;
NMTVKEYDOWN nmkeydown; NMTVKEYDOWN nmkeydown;
TRACE("%lx\n", wParam); TRACE("%Ix\n", wParam);
nmkeydown.wVKey = wParam; nmkeydown.wVKey = wParam;
nmkeydown.flags = 0; nmkeydown.flags = 0;
...@@ -5538,13 +5538,13 @@ TREEVIEW_Notify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -5538,13 +5538,13 @@ TREEVIEW_Notify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
if (lppgc->dwFlag == PGF_CALCWIDTH) { if (lppgc->dwFlag == PGF_CALCWIDTH) {
lppgc->iWidth = infoPtr->treeWidth; lppgc->iWidth = infoPtr->treeWidth;
TRACE("got PGN_CALCSIZE, returning horz size = %d, client=%d\n", TRACE("got PGN_CALCSIZE, returning horz size = %ld, client= %ld\n",
infoPtr->treeWidth, infoPtr->clientWidth); infoPtr->treeWidth, infoPtr->clientWidth);
} }
else { else {
lppgc->iHeight = infoPtr->treeHeight; lppgc->iHeight = infoPtr->treeHeight;
TRACE("got PGN_CALCSIZE, returning vert size = %d, client=%d\n", TRACE("got PGN_CALCSIZE, returning vert size = %ld, client = %ld\n", infoPtr->treeHeight,
infoPtr->treeHeight, infoPtr->clientHeight); infoPtr->clientHeight);
} }
return 0; return 0;
} }
...@@ -5565,7 +5565,7 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -5565,7 +5565,7 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
} }
else else
{ {
FIXME("WM_SIZE flag %lx %lx not handled\n", wParam, lParam); FIXME("WM_SIZE flag %Ix %Ix not handled\n", wParam, lParam);
} }
TREEVIEW_Invalidate(infoPtr, NULL); TREEVIEW_Invalidate(infoPtr, NULL);
...@@ -5575,7 +5575,7 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -5575,7 +5575,7 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
static LRESULT static LRESULT
TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{ {
TRACE("(%lx %lx)\n", wParam, lParam); TRACE("%Ix, %Ix.\n", wParam, lParam);
if (wParam == GWL_STYLE) if (wParam == GWL_STYLE)
{ {
...@@ -5699,7 +5699,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -5699,7 +5699,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd); TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
TRACE("hwnd %p msg %04x wp=%08lx lp=%08lx\n", hwnd, uMsg, wParam, lParam); TRACE("hwnd %p, msg %04x, wp %Ix, lp %Ix\n", hwnd, uMsg, wParam, lParam);
if (infoPtr) TREEVIEW_VerifyTree(infoPtr); if (infoPtr) TREEVIEW_VerifyTree(infoPtr);
else else
...@@ -5954,7 +5954,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -5954,7 +5954,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
/* This mostly catches MFC and Delphi messages. :( */ /* This mostly catches MFC and Delphi messages. :( */
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
TRACE("Unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); TRACE("Unknown msg %04x wp %Ix lp %Ix\n", uMsg, wParam, lParam);
def: def:
return DefWindowProcW(hwnd, uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam);
} }
......
dlls/comctl32/updown.c
View file @ 8806159b
...@@ -576,8 +576,7 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, ...@@ -576,8 +576,7 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
{ {
UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr((HWND)ref_data); UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr((HWND)ref_data);
TRACE("hwnd=%p, uMsg=%04x, wParam=%08lx, lParam=%08lx\n", TRACE("hwnd %p, uMsg %04x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam);
hwnd, uMsg, wParam, lParam);
switch(uMsg) switch(uMsg)
{ {
...@@ -892,7 +891,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L ...@@ -892,7 +891,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd); UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd);
HTHEME theme; HTHEME theme;
TRACE("hwnd=%p msg=%04x wparam=%08lx lparam=%08lx\n", hwnd, message, wParam, lParam); TRACE("hwnd %p, msg %04x, wparam %Id, lparam %Ix\n", hwnd, message, wParam, lParam);
if (!infoPtr && (message != WM_CREATE)) if (!infoPtr && (message != WM_CREATE))
return DefWindowProcW (hwnd, message, wParam, lParam); return DefWindowProcW (hwnd, message, wParam, lParam);
...@@ -1088,7 +1087,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L ...@@ -1088,7 +1087,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
return infoPtr->Base; return infoPtr->Base;
case UDM_SETBASE: case UDM_SETBASE:
TRACE("UpDown Ctrl new base(%ld), hwnd=%p\n", wParam, hwnd); TRACE("UpDown Ctrl new base(%Id), hwnd=%p\n", wParam, hwnd);
if (wParam==10 || wParam==16) { if (wParam==10 || wParam==16) {
WPARAM old_base = infoPtr->Base; WPARAM old_base = infoPtr->Base;
infoPtr->Base = wParam; infoPtr->Base = wParam;
...@@ -1159,7 +1158,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L ...@@ -1159,7 +1158,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
} }
default: default:
if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message)) if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message))
ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam); ERR("unknown msg %04x wp=%Ix lp=%Ix\n", message, wParam, lParam);
return DefWindowProcW (hwnd, message, wParam, lParam); return DefWindowProcW (hwnd, message, wParam, lParam);
} }
......
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