From 1c16d833796e94eaf1e95e301c6a4a47945a262d Mon Sep 17 00:00:00 2001 From: Michael Ploujnikov Date: Fri, 13 Oct 2006 09:34:21 -0400 Subject: [PATCH] comctl32: Win64 printf format warning fixes. --- dlls/comctl32/Makefile.in | 2 +- dlls/comctl32/animate.c | 64 +++++++++---------- dlls/comctl32/comboex.c | 42 ++++++------- dlls/comctl32/comctl32undoc.c | 20 +++--- dlls/comctl32/commctrl.c | 8 +-- dlls/comctl32/datetime.c | 6 +- dlls/comctl32/dpa.c | 6 +- dlls/comctl32/draglist.c | 2 +- dlls/comctl32/hotkey.c | 4 +- dlls/comctl32/imagelist.c | 6 +- dlls/comctl32/listview.c | 30 ++++----- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/pager.c | 12 ++-- dlls/comctl32/propsheet.c | 30 ++++----- dlls/comctl32/rebar.c | 114 +++++++++++++++++----------------- dlls/comctl32/smoothscroll.c | 2 +- dlls/comctl32/status.c | 8 +-- dlls/comctl32/tab.c | 54 ++++++++-------- dlls/comctl32/theming.c | 2 +- dlls/comctl32/toolbar.c | 58 ++++++++--------- dlls/comctl32/tooltips.c | 12 ++-- dlls/comctl32/trackbar.c | 8 +-- dlls/comctl32/treeview.c | 22 +++---- 23 files changed, 257 insertions(+), 257 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 820143cfc5e..2c9e057975b 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_COMCTL32_ -DWINE_NO_LONG_AS_INT +EXTRADEFS = -D_COMCTL32_ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index b6309cddf7d..f2655fc68d2 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -498,16 +498,16 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) mmioRead(infoPtr->hMMio, (LPSTR)&infoPtr->mah, sizeof(infoPtr->mah)); - TRACE("mah.dwMicroSecPerFrame=%ld\n", infoPtr->mah.dwMicroSecPerFrame); - TRACE("mah.dwMaxBytesPerSec=%ld\n", infoPtr->mah.dwMaxBytesPerSec); - TRACE("mah.dwPaddingGranularity=%ld\n", infoPtr->mah.dwPaddingGranularity); - TRACE("mah.dwFlags=%ld\n", infoPtr->mah.dwFlags); - TRACE("mah.dwTotalFrames=%ld\n", infoPtr->mah.dwTotalFrames); - TRACE("mah.dwInitialFrames=%ld\n", infoPtr->mah.dwInitialFrames); - TRACE("mah.dwStreams=%ld\n", infoPtr->mah.dwStreams); - TRACE("mah.dwSuggestedBufferSize=%ld\n", infoPtr->mah.dwSuggestedBufferSize); - TRACE("mah.dwWidth=%ld\n", infoPtr->mah.dwWidth); - TRACE("mah.dwHeight=%ld\n", infoPtr->mah.dwHeight); + TRACE("mah.dwMicroSecPerFrame=%d\n", infoPtr->mah.dwMicroSecPerFrame); + TRACE("mah.dwMaxBytesPerSec=%d\n", infoPtr->mah.dwMaxBytesPerSec); + TRACE("mah.dwPaddingGranularity=%d\n", infoPtr->mah.dwPaddingGranularity); + TRACE("mah.dwFlags=%d\n", infoPtr->mah.dwFlags); + TRACE("mah.dwTotalFrames=%d\n", infoPtr->mah.dwTotalFrames); + TRACE("mah.dwInitialFrames=%d\n", infoPtr->mah.dwInitialFrames); + TRACE("mah.dwStreams=%d\n", infoPtr->mah.dwStreams); + TRACE("mah.dwSuggestedBufferSize=%d\n", infoPtr->mah.dwSuggestedBufferSize); + TRACE("mah.dwWidth=%d\n", infoPtr->mah.dwWidth); + TRACE("mah.dwHeight=%d\n", infoPtr->mah.dwHeight); mmioAscend(infoPtr->hMMio, &mmckInfo, 0); @@ -533,17 +533,17 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) HIBYTE(LOWORD(infoPtr->ash.fccHandler)), LOBYTE(HIWORD(infoPtr->ash.fccHandler)), HIBYTE(HIWORD(infoPtr->ash.fccHandler))); - TRACE("ash.dwFlags=%ld\n", infoPtr->ash.dwFlags); + TRACE("ash.dwFlags=%d\n", infoPtr->ash.dwFlags); TRACE("ash.wPriority=%d\n", infoPtr->ash.wPriority); TRACE("ash.wLanguage=%d\n", infoPtr->ash.wLanguage); - TRACE("ash.dwInitialFrames=%ld\n", infoPtr->ash.dwInitialFrames); - TRACE("ash.dwScale=%ld\n", infoPtr->ash.dwScale); - TRACE("ash.dwRate=%ld\n", infoPtr->ash.dwRate); - TRACE("ash.dwStart=%ld\n", infoPtr->ash.dwStart); - TRACE("ash.dwLength=%ld\n", infoPtr->ash.dwLength); - TRACE("ash.dwSuggestedBufferSize=%ld\n", infoPtr->ash.dwSuggestedBufferSize); - TRACE("ash.dwQuality=%ld\n", infoPtr->ash.dwQuality); - TRACE("ash.dwSampleSize=%ld\n", infoPtr->ash.dwSampleSize); + TRACE("ash.dwInitialFrames=%d\n", infoPtr->ash.dwInitialFrames); + TRACE("ash.dwScale=%d\n", infoPtr->ash.dwScale); + TRACE("ash.dwRate=%d\n", infoPtr->ash.dwRate); + TRACE("ash.dwStart=%d\n", infoPtr->ash.dwStart); + TRACE("ash.dwLength=%d\n", infoPtr->ash.dwLength); + TRACE("ash.dwSuggestedBufferSize=%d\n", infoPtr->ash.dwSuggestedBufferSize); + TRACE("ash.dwQuality=%d\n", infoPtr->ash.dwQuality); + TRACE("ash.dwSampleSize=%d\n", infoPtr->ash.dwSampleSize); TRACE("ash.rcFrame=(%d,%d,%d,%d)\n", infoPtr->ash.rcFrame.top, infoPtr->ash.rcFrame.left, infoPtr->ash.rcFrame.bottom, infoPtr->ash.rcFrame.right); @@ -563,17 +563,17 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) mmioRead(infoPtr->hMMio, (LPSTR)infoPtr->inbih, mmckInfo.cksize); - TRACE("bih.biSize=%ld\n", infoPtr->inbih->biSize); - TRACE("bih.biWidth=%ld\n", infoPtr->inbih->biWidth); - TRACE("bih.biHeight=%ld\n", infoPtr->inbih->biHeight); + TRACE("bih.biSize=%d\n", infoPtr->inbih->biSize); + TRACE("bih.biWidth=%d\n", infoPtr->inbih->biWidth); + TRACE("bih.biHeight=%d\n", infoPtr->inbih->biHeight); TRACE("bih.biPlanes=%d\n", infoPtr->inbih->biPlanes); TRACE("bih.biBitCount=%d\n", infoPtr->inbih->biBitCount); - TRACE("bih.biCompression=%ld\n", infoPtr->inbih->biCompression); - TRACE("bih.biSizeImage=%ld\n", infoPtr->inbih->biSizeImage); - TRACE("bih.biXPelsPerMeter=%ld\n", infoPtr->inbih->biXPelsPerMeter); - TRACE("bih.biYPelsPerMeter=%ld\n", infoPtr->inbih->biYPelsPerMeter); - TRACE("bih.biClrUsed=%ld\n", infoPtr->inbih->biClrUsed); - TRACE("bih.biClrImportant=%ld\n", infoPtr->inbih->biClrImportant); + TRACE("bih.biCompression=%d\n", infoPtr->inbih->biCompression); + TRACE("bih.biSizeImage=%d\n", infoPtr->inbih->biSizeImage); + TRACE("bih.biXPelsPerMeter=%d\n", infoPtr->inbih->biXPelsPerMeter); + TRACE("bih.biYPelsPerMeter=%d\n", infoPtr->inbih->biYPelsPerMeter); + TRACE("bih.biClrUsed=%d\n", infoPtr->inbih->biClrUsed); + TRACE("bih.biClrImportant=%d\n", infoPtr->inbih->biClrImportant); mmioAscend(infoPtr->hMMio, &mmckInfo, 0); @@ -616,11 +616,11 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) mmioAscend(infoPtr->hMMio, &mmckInfo, 0); } if (numFrame != infoPtr->mah.dwTotalFrames) { - WARN("Found %ld frames (/%ld)\n", numFrame, infoPtr->mah.dwTotalFrames); + WARN("Found %d frames (/%d)\n", numFrame, infoPtr->mah.dwTotalFrames); return FALSE; } if (insize > infoPtr->ash.dwSuggestedBufferSize) { - WARN("insize=%ld suggestedSize=%ld\n", insize, infoPtr->ash.dwSuggestedBufferSize); + WARN("insize=%d suggestedSize=%d\n", insize, infoPtr->ash.dwSuggestedBufferSize); infoPtr->ash.dwSuggestedBufferSize = insize; } @@ -801,7 +801,7 @@ static BOOL ANIMATE_Create(HWND hWnd, LPCREATESTRUCTW lpcs) infoPtr->hbmPrevFrame = 0; infoPtr->dwStyle = lpcs->style; - TRACE("Animate style=0x%08lx, parent=%p\n", infoPtr->dwStyle, infoPtr->hwndNotify); + TRACE("Animate style=0x%08x, parent=%p\n", infoPtr->dwStyle, infoPtr->hwndNotify); InitializeCriticalSection(&infoPtr->cs); @@ -844,7 +844,7 @@ static BOOL ANIMATE_EraseBackground(ANIMATE_INFO *infoPtr, HDC hdc) static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, LPSTYLESTRUCT lpss) { - TRACE("(styletype=%x, styleOld=0x%08lx, styleNew=0x%08lx)\n", + TRACE("(styletype=%x, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 00c5fc30b33..2499b800894 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -352,7 +352,7 @@ static void COMBOEX_GetComboFontSize (COMBOEX_INFO *infoPtr, SIZE *size) GetTextExtentPointW (mydc, strA, 1, size); SelectObject (mydc, ofont); ReleaseDC (0, mydc); - TRACE("selected font hwnd=%p, height=%ld\n", nfont, size->cy); + TRACE("selected font hwnd=%p, height=%d\n", nfont, size->cy); } @@ -406,13 +406,13 @@ static void COMBOEX_AdjustEditPos (COMBOEX_INFO *infoPtr) /* reposition the Edit control based on whether icon exists */ COMBOEX_GetComboFontSize (infoPtr, &mysize); - TRACE("Combo font x=%ld, y=%ld\n", mysize.cx, mysize.cy); + TRACE("Combo font x=%d, y=%d\n", mysize.cx, mysize.cy); x = xioff + CBE_STARTOFFSET + 1; w = rect.right-rect.left - x - GetSystemMetrics(SM_CXVSCROLL) - 1; h = mysize.cy + 1; y = rect.bottom - h - 1; - TRACE("Combo client (%ld,%ld)-(%ld,%ld), setting Edit to (%d,%d)-(%d,%d)\n", + TRACE("Combo client (%d,%d)-(%d,%d), setting Edit to (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom, x, y, x + w, y + h); SetWindowPos(infoPtr->hwndEdit, HWND_TOP, x, y, w, h, SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER); @@ -429,7 +429,7 @@ static void COMBOEX_ReSize (COMBOEX_INFO *infoPtr) cy = mysize.cy + CBE_EXTRA; if (infoPtr->himl && ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo)) { cy = max (iinfo.rcImage.bottom - iinfo.rcImage.top, cy); - TRACE("upgraded height due to image: height=%ld\n", cy); + TRACE("upgraded height due to image: height=%d\n", cy); } SendMessageW (infoPtr->hwndSelf, CB_SETITEMHEIGHT, (WPARAM)-1, (LPARAM)cy); if (infoPtr->hwndCombo) { @@ -712,7 +712,7 @@ COMBOEX_SetExtendedStyle (COMBOEX_INFO *infoPtr, DWORD mask, DWORD style) { DWORD dwTemp; - TRACE("(mask=x%08lx, style=0x%08lx)\n", mask, style); + TRACE("(mask=x%08x, style=0x%08x)\n", mask, style); dwTemp = infoPtr->dwExtStyle; @@ -730,7 +730,7 @@ COMBOEX_SetExtendedStyle (COMBOEX_INFO *infoPtr, DWORD mask, DWORD style) mask = CBES_EX_NOEDITIMAGE | CBES_EX_NOEDITIMAGEINDENT; if ((infoPtr->dwExtStyle & mask) != (dwTemp & mask)) { /* if state of EX_NOEDITIMAGE changes, invalidate all */ - TRACE("EX_NOEDITIMAGE state changed to %ld\n", + TRACE("EX_NOEDITIMAGE state changed to %d\n", infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE); InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); COMBOEX_AdjustEditPos (infoPtr); @@ -942,10 +942,10 @@ static INT COMBOEX_SetItemHeight (COMBOEX_INFO *infoPtr, INT index, UINT height) height = cb_wrect.bottom-cb_wrect.top + cbx_wrect.bottom-cbx_wrect.top - (cbx_crect.bottom-cbx_crect.top); - TRACE("EX window=(%ld,%ld)-(%ld,%ld), client=(%ld,%ld)-(%ld,%ld)\n", + TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n", cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom, cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom); - TRACE("CB window=(%ld,%ld)-(%ld,%ld), EX setting=(0,0)-(%ld,%d)\n", + TRACE("CB window=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n", cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom, cbx_wrect.right-cbx_wrect.left, height); SetWindowPos (infoPtr->hwndSelf, HWND_TOP, 0, 0, @@ -994,7 +994,7 @@ static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs) /* create combo box */ GetWindowRect(hwnd, &wnrc1); GetClientRect(hwnd, &clrc1); - TRACE("EX window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld)\n", + TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom); @@ -1085,7 +1085,7 @@ static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs) GetWindowRect(hwnd, &wnrc1); GetClientRect(hwnd, &clrc1); GetWindowRect(infoPtr->hwndCombo, &cmbwrc); - TRACE("EX window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) CB wnd=(%ld,%ld)-(%ld,%ld)\n", + TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) CB wnd=(%d,%d)-(%d,%d)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom, cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom); @@ -1094,7 +1094,7 @@ static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs) SWP_NOACTIVATE | SWP_NOREDRAW); GetWindowRect(infoPtr->hwndCombo, &cmbwrc); - TRACE("CB window=(%ld,%ld)-(%ld,%ld)\n", + TRACE("CB window=(%d,%d)-(%d,%d)\n", cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom); SetWindowPos(hwnd, HWND_TOP, 0, 0, cmbwrc.right-cmbwrc.left, cmbwrc.bottom-cmbwrc.top, @@ -1343,7 +1343,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT *dis) dis->CtlType, dis->CtlID); TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", dis->itemID, dis->itemAction, dis->itemState); - TRACE("hWnd=%p hDC=%p (%ld,%ld)-(%ld,%ld) itemData=0x%08lx\n", + TRACE("hWnd=%p hDC=%p (%d,%d)-(%d,%d) itemData=0x%08lx\n", dis->hwndItem, dis->hDC, dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom, dis->itemData); @@ -1363,7 +1363,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT *dis) if ( ( (dis->itemAction & ODA_FOCUS) && (dis->itemState & ODS_SELECTED)) || ( (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) && (dis->itemState & ODS_FOCUS) ) ) { - TRACE("drawing item -1 special focus, rect=(%ld,%ld)-(%ld,%ld)\n", + TRACE("drawing item -1 special focus, rect=(%d,%d)-(%d,%d)\n", dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom); } @@ -1379,14 +1379,14 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT *dis) edrc.left=edrc.top=edrc.right=edrc.bottom=-1; if (infoPtr->hwndEdit) GetWindowRect (infoPtr->hwndEdit, &edrc); - TRACE("window rects ex=(%ld,%ld)-(%ld,%ld), cb=(%ld,%ld)-(%ld,%ld), ed=(%ld,%ld)-(%ld,%ld)\n", + TRACE("window rects ex=(%d,%d)-(%d,%d), cb=(%d,%d)-(%d,%d), ed=(%d,%d)-(%d,%d)\n", exrc.left, exrc.top, exrc.right, exrc.bottom, cbrc.left, cbrc.top, cbrc.right, cbrc.bottom, edrc.left, edrc.top, edrc.right, edrc.bottom); } } else { - ERR("NOT drawing item -1 special focus, rect=(%ld,%ld)-(%ld,%ld), action=%08x, state=%08x\n", + ERR("NOT drawing item -1 special focus, rect=(%d,%d)-(%d,%d), action=%08x, state=%08x\n", dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom, dis->itemAction, dis->itemState); @@ -1546,7 +1546,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT *dis) rect.right = x + txtsize.cx; rect.top = dis->rcItem.top + 1; rect.bottom = dis->rcItem.bottom - 1; - TRACE("drawing item %d text, rect=(%ld,%ld)-(%ld,%ld)\n", + TRACE("drawing item %d text, rect=(%d,%d)-(%d,%d)\n", dis->itemID, rect.left, rect.top, rect.right, rect.bottom); ExtTextOutW (dis->hDC, x, y, ETO_OPAQUE | ETO_CLIPPED, &rect, str, len, 0); @@ -1626,7 +1626,7 @@ static LRESULT COMBOEX_NCCreate (HWND hwnd) oldstyle = (DWORD)GetWindowLongW (hwnd, GWL_STYLE); newstyle = oldstyle & ~(WS_VSCROLL | WS_HSCROLL | WS_BORDER); if (newstyle != oldstyle) { - TRACE("req style %08lx, reseting style %08lx\n", + TRACE("req style %08x, reseting style %08x\n", oldstyle, newstyle); SetWindowLongW (hwnd, GWL_STYLE, newstyle); } @@ -1673,10 +1673,10 @@ static LRESULT COMBOEX_WindowPosChanging (COMBOEX_INFO *infoPtr, WINDOWPOS *wp) TRACE("winpos=(%d,%d %dx%d) flags=0x%08x\n", wp->x, wp->y, wp->cx, wp->cy, wp->flags); - TRACE("EX window=(%ld,%ld)-(%ld,%ld), client=(%ld,%ld)-(%ld,%ld)\n", + TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n", cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom, cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom); - TRACE("CB window=(%ld,%ld)-(%ld,%ld), EX setting=(0,0)-(%d,%ld)\n", + TRACE("CB window=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n", cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom, width, cb_wrect.bottom-cb_wrect.top); @@ -1734,7 +1734,7 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) hDC = (HDC) wParam; obkc = SetBkColor (hDC, GetSysColor (COLOR_WINDOW)); GetClientRect (hwnd, &rect); - TRACE("erasing (%ld,%ld)-(%ld,%ld)\n", + TRACE("erasing (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0); SetBkColor (hDC, obkc); @@ -1938,7 +1938,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) hDC = (HDC) wParam; obkc = SetBkColor (hDC, GetSysColor (COLOR_WINDOW)); GetClientRect (hwnd, &rect); - TRACE("erasing (%ld,%ld)-(%ld,%ld)\n", + TRACE("erasing (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0); SetBkColor (hDC, obkc); diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index 4a4d6fbd921..aff2103273f 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -319,7 +319,7 @@ static void MRU_SaveChanged ( LPWINEMRULIST mp ) if (err) { ERR("error saving /%s/, err=%d\n", debugstr_w(realname), err); } - TRACE("saving value for name /%s/ size=%ld\n", + TRACE("saving value for name /%s/ size=%d\n", debugstr_w(realname), witem->size); } } @@ -431,7 +431,7 @@ INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, if (lpRegNum && (ret != -1)) *lpRegNum = 'a' + i; - TRACE("(%p, %p, %ld, %p) returning %d\n", + TRACE("(%p, %p, %d, %p) returning %d\n", hList, lpData, cbData, lpRegNum, ret); return ret; @@ -497,7 +497,7 @@ INT WINAPI AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData) mp->wineFlags |= WMRUF_CHANGED; mp->realMRU[0] = replace + 'a'; - TRACE("(%p, %p, %ld) adding data, /%c/ now most current\n", + TRACE("(%p, %p, %d) adding data, /%c/ now most current\n", hList, lpData, cbData, replace+'a'); if (!(mp->extview.dwFlags & MRUF_DELAYED_SAVE)) { @@ -671,7 +671,7 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) &newkey, &dwdisp))) { /* error - what to do ??? */ - ERR("(%lu %lu %lx %p %s %p): Could not open key, error=%d\n", + ERR("(%u %u %x %p %s %p): Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.lpfnCompare, err); @@ -690,7 +690,7 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) else datasize /= sizeof(WCHAR); - TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize); + TRACE("MRU list = %s, datasize = %d\n", debugstr_w(mp->realMRU), datasize); mp->cursize = datasize - 1; /* datasize now has number of items in the MRUList */ @@ -716,7 +716,7 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) else mp->cursize = 0; - TRACE("(%lu %lu %lx %p %s %p): Current Size = %ld\n", + TRACE("(%u %u %x %p %s %p): Current Size = %d\n", mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.lpfnCompare, mp->cursize); @@ -844,7 +844,7 @@ INT WINAPI EnumMRUListW (HANDLE hList, INT nItemPos, LPVOID lpBuffer, witem = mp->array[desired]; datasize = min( witem->size, nBufferSize ); memcpy( lpBuffer, &witem->datastart, datasize); - TRACE("(%p, %d, %p, %ld): returning len=%d\n", + TRACE("(%p, %d, %p, %d): returning len=%d\n", hList, nItemPos, lpBuffer, nBufferSize, datasize); return datasize; } @@ -878,7 +878,7 @@ INT WINAPI EnumMRUListA (HANDLE hList, INT nItemPos, LPVOID lpBuffer, WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&witem->datastart, -1, lpBuffer, datasize, NULL, NULL); } - TRACE("(%p, %d, %p, %ld): returning len=%d\n", + TRACE("(%p, %d, %p, %d): returning len=%d\n", hList, nItemPos, lpBuffer, nBufferSize, datasize); return datasize; } @@ -1173,7 +1173,7 @@ static LRESULT DoNotify (LPNOTIFYDATA lpNotify, UINT uCode, LPNMHDR lpHdr) LPNMHDR lpNmh = NULL; UINT idFrom = 0; - TRACE("(%p %p %d %p 0x%08lx)\n", + TRACE("(%p %p %d %p 0x%08x)\n", lpNotify->hwndFrom, lpNotify->hwndTo, uCode, lpHdr, lpNotify->dwParam5); @@ -1262,7 +1262,7 @@ LRESULT WINAPI SendNotifyEx (HWND hwndTo, HWND hwndFrom, UINT uCode, NOTIFYDATA notify; HWND hwndNotify; - TRACE("(%p %p %d %p 0x%08lx)\n", + TRACE("(%p %p %d %p 0x%08x)\n", hwndFrom, hwndTo, uCode, lpHdr, dwParam5); hwndNotify = hwndTo; diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 81f5f86e000..2925cc2e41d 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -110,7 +110,7 @@ static const WCHAR strCC32SubclassInfo[] = { BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -637,7 +637,7 @@ InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls) if (lpInitCtrls->dwSize != sizeof(INITCOMMONCONTROLSEX)) return FALSE; - TRACE("(0x%08lx)\n", lpInitCtrls->dwICC); + TRACE("(0x%08x)\n", lpInitCtrls->dwICC); for (cCount = 0; cCount < 32; cCount++) { dwMask = 1 << cCount; @@ -687,7 +687,7 @@ InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls) break; default: - FIXME("Unknown class! dwICC=0x%lX\n", dwMask); + FIXME("Unknown class! dwICC=0x%X\n", dwMask); break; } } @@ -949,7 +949,7 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) pdvi->dwBuildNumber = 2919; pdvi->dwPlatformID = 6304; - TRACE("%lu.%lu.%lu.%lu\n", + TRACE("%u.%u.%u.%u\n", pdvi->dwMajorVersion, pdvi->dwMinorVersion, pdvi->dwBuildNumber, pdvi->dwPlatformID); diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index b5596ba71ae..8649c2fce18 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -667,7 +667,7 @@ DATETIME_HitTest (DATETIME_INFO *infoPtr, POINT pt) { int i; - TRACE ("%ld, %ld\n", pt.x, pt.y); + TRACE ("%d, %d\n", pt.x, pt.y); if (PtInRect (&infoPtr->calbutton, pt)) return DTHT_MCPOPUP; if (PtInRect (&infoPtr->checkbox, pt)) return DTHT_CHECKBOX; @@ -1095,7 +1095,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, WORD flags, INT width, INT height) infoPtr->rcClient.bottom = height; infoPtr->rcClient.right = width; - TRACE("Height=%ld, Width=%ld\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right); + TRACE("Height=%d, Width=%d\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right); infoPtr->rcDraw = infoPtr->rcClient; @@ -1132,7 +1132,7 @@ DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, LPSTYLESTRUCT l { static const WCHAR buttonW[] = { 'b', 'u', 't', 't', 'o', 'n', 0 }; - TRACE("(styletype=%x, styleOld=0x%08lx, styleNew=0x%08lx)\n", + TRACE("(styletype=%x, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index e4e60b6ba09..4df556eaf26 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -123,7 +123,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, if (errCode != S_OK) return errCode; - FIXME ("dwSize=%lu dwData2=%lu dwItems=%lu\n", + FIXME ("dwSize=%u dwData2=%u dwItems=%u\n", streamData.dwSize, streamData.dwData2, streamData.dwItems); if ( ulRead < sizeof(STREAMDATA) || @@ -162,7 +162,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, /* store the handle to the dpa */ *phDpa = hDpa; - FIXME ("new hDpa=%p, errorcode=%lx\n", hDpa, errCode); + FIXME ("new hDpa=%p, errorcode=%x\n", hDpa, errCode); return errCode; } @@ -226,7 +226,7 @@ BOOL WINAPI DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags, INT nResult, i; INT nIndex; - TRACE("%p %p %08lx %p %p %08lx)\n", + TRACE("%p %p %08x %p %p %08lx)\n", hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam); if (IsBadWritePtr (hdpa1, sizeof(*hdpa1))) diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c index c8e5e136c6a..9ecade558c1 100644 --- a/dlls/comctl32/draglist.c +++ b/dlls/comctl32/draglist.c @@ -292,7 +292,7 @@ INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll) INT nIndex; DWORD dwScrollTime; - TRACE("(%p %ld x %ld %s)\n", + TRACE("(%p %d x %d %s)\n", hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE"); ScreenToClient (hwndLB, &pt); diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index e55d0753344..aa6ca4ca290 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -289,7 +289,7 @@ HOTKEY_KeyDown (HOTKEY_INFO *infoPtr, DWORD key, DWORD flags) if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) return 0; - TRACE("() Key: %ld\n", key); + TRACE("() Key: %d\n", key); wOldHotKey = infoPtr->HotKey; bOldMod = infoPtr->CurrMod; @@ -349,7 +349,7 @@ HOTKEY_KeyUp (HOTKEY_INFO *infoPtr, DWORD key, DWORD flags) if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) return 0; - TRACE("() Key: %ld\n", key); + TRACE("() Key: %d\n", key); bOldMod = infoPtr->CurrMod; diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index faf537183bb..abea860f6f3 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -285,7 +285,7 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) HBITMAP hMaskBitmap=0; COLORREF bkColor; - TRACE("himl=%p hbitmap=%p clrmask=%lx\n", himl, hBitmap, clrMask); + TRACE("himl=%p hbitmap=%p clrmask=%x\n", himl, hBitmap, clrMask); if (!is_valid(himl)) return -1; @@ -2440,7 +2440,7 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag, BOOL WINAPI ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter) { - FIXME("(%p 0x%x 0x%lx):empty stub!\n", himl, i, dwFilter); + FIXME("(%p 0x%x 0x%x):empty stub!\n", himl, i, dwFilter); return FALSE; } @@ -2465,7 +2465,7 @@ ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter) DWORD WINAPI ImageList_SetFlags(HIMAGELIST himl, DWORD flags) { - FIXME("(%p %08lx):empty stub\n", himl, flags); + FIXME("(%p %08x):empty stub\n", himl, flags); return 0; } diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7c6c7a3bec3..427e8bc237c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -395,13 +395,13 @@ typedef struct tagLISTVIEW_INFO /* Dump the LISTVIEW_INFO structure to the debug channel */ #define LISTVIEW_DUMP(iP) do { \ - TRACE("hwndSelf=%p, clrBk=0x%06lx, clrText=0x%06lx, clrTextBk=0x%06lx, ItemHeight=%d, ItemWidth=%d, Style=0x%08lx\n", \ + TRACE("hwndSelf=%p, clrBk=0x%06x, clrText=0x%06x, clrTextBk=0x%06x, ItemHeight=%d, ItemWidth=%d, Style=0x%08x\n", \ iP->hwndSelf, iP->clrBk, iP->clrText, iP->clrTextBk, \ iP->nItemHeight, iP->nItemWidth, iP->dwStyle); \ - TRACE("hwndSelf=%p, himlNor=%p, himlSml=%p, himlState=%p, Focused=%d, Hot=%d, exStyle=0x%08lx, Focus=%d\n", \ + TRACE("hwndSelf=%p, himlNor=%p, himlSml=%p, himlState=%p, Focused=%d, Hot=%d, exStyle=0x%08x, Focus=%d\n", \ iP->hwndSelf, iP->himlNormal, iP->himlSmall, iP->himlState, \ iP->nFocusedItem, iP->nHotItem, iP->dwLvExStyle, iP->bFocus ); \ - TRACE("hwndSelf=%p, ntmH=%d, icSz.cx=%ld, icSz.cy=%ld, icSp.cx=%ld, icSp.cy=%ld, notifyFmt=%d\n", \ + TRACE("hwndSelf=%p, ntmH=%d, icSz.cx=%d, icSz.cy=%d, icSp.cx=%d, icSp.cy=%d, notifyFmt=%d\n", \ iP->hwndSelf, iP->ntmHeight, iP->iconSize.cx, iP->iconSize.cy, \ iP->iconSpacing.cx, iP->iconSpacing.cy, iP->notifyFormat); \ TRACE("hwndSelf=%p, rcList=%s\n", iP->hwndSelf, wine_dbgstr_rect(&iP->rcList)); \ @@ -5592,7 +5592,7 @@ static BOOL LISTVIEW_GetItemRect(LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lprc) break; default: - WARN("Unknown value: %ld\n", lprc->left); + WARN("Unknown value: %d\n", lprc->left); return FALSE; } @@ -5631,7 +5631,7 @@ static BOOL LISTVIEW_GetSubItemRect(LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lp nColumn = lprc->top; - TRACE("(nItem=%d, nSubItem=%ld)\n", nItem, lprc->top); + TRACE("(nItem=%d, nSubItem=%d)\n", nItem, lprc->top); /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */ if (lprc->top == 0) return LISTVIEW_GetItemRect(infoPtr, nItem, lprc); @@ -5659,7 +5659,7 @@ static BOOL LISTVIEW_GetSubItemRect(LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lp break; default: - ERR("Unknown bounds=%ld\n", lprc->left); + ERR("Unknown bounds=%d\n", lprc->left); return FALSE; } @@ -6444,7 +6444,7 @@ static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *infoPtr, INT dx, INT dy) */ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF clrBk) { - TRACE("(clrBk=%lx)\n", clrBk); + TRACE("(clrBk=%x)\n", clrBk); if(infoPtr->clrBk != clrBk) { if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); @@ -7017,7 +7017,7 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) infoPtr->iconSpacing.cx = cx; infoPtr->iconSpacing.cy = cy; - TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%ld,%ld), ntmH=%d\n", + TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%d,%d), ntmH=%d\n", LOWORD(oldspacing), HIWORD(oldspacing), cx, cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy, infoPtr->ntmHeight); @@ -7114,7 +7114,7 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG */ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFlags) { - TRACE("(nItems=%d, dwFlags=%lx)\n", nItems, dwFlags); + TRACE("(nItems=%d, dwFlags=%x)\n", nItems, dwFlags); if (infoPtr->dwStyle & LVS_OWNERDATA) { @@ -7381,7 +7381,7 @@ static INT LISTVIEW_SetSelectionMark(LISTVIEW_INFO *infoPtr, INT nIndex) */ static BOOL LISTVIEW_SetTextBkColor(LISTVIEW_INFO *infoPtr, COLORREF clrTextBk) { - TRACE("(clrTextBk=%lx)\n", clrTextBk); + TRACE("(clrTextBk=%x)\n", clrTextBk); if (infoPtr->clrTextBk != clrTextBk) { @@ -7406,7 +7406,7 @@ static BOOL LISTVIEW_SetTextBkColor(LISTVIEW_INFO *infoPtr, COLORREF clrTextBk) */ static BOOL LISTVIEW_SetTextColor (LISTVIEW_INFO *infoPtr, COLORREF clrText) { - TRACE("(clrText=%lx)\n", clrText); + TRACE("(clrText=%x)\n", clrText); if (infoPtr->clrText != clrText) { @@ -8117,7 +8117,7 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW_INFO *infoPtr, INT nVirtualKey, LONG lK INT nItem = -1; NMLVKEYDOWN nmKeyDown; - TRACE("(nVirtualKey=%d, lKeyData=%ld)\n", nVirtualKey, lKeyData); + TRACE("(nVirtualKey=%d, lKeyData=%d)\n", nVirtualKey, lKeyData); /* send LVN_KEYDOWN notification */ nmKeyDown.wVKey = nVirtualKey; @@ -8755,7 +8755,7 @@ static LRESULT LISTVIEW_Paint(LISTVIEW_INFO *infoPtr, HDC hdc) */ static LRESULT LISTVIEW_PrintClient(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD options) { - FIXME("Partial Stub: (hdc=%p options=0x%08lx)\n", hdc, options); + FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options); if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwndSelf)) return 0; @@ -9123,7 +9123,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, UINT uNewView = lpss->styleNew & LVS_TYPEMASK; UINT uOldView = lpss->styleOld & LVS_TYPEMASK; - TRACE("(styletype=%x, styleOld=0x%08lx, styleNew=0x%08lx)\n", + TRACE("(styletype=%x, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; @@ -9161,7 +9161,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, { if ((infoPtr->iconSize.cx != oldIconSize.cx) || (infoPtr->iconSize.cy != oldIconSize.cy)) { - TRACE("icon old size=(%ld,%ld), new size=(%ld,%ld)\n", + TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); LISTVIEW_SetIconSpacing(infoPtr, 0, 0); } diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 908eb831fde..a63fede7b62 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -343,7 +343,7 @@ static void MONTHCAL_DrawDay(MONTHCAL_INFO *infoPtr, HDC hdc, int day, int month RECT r2; TRACE("%d %d %d\n",day, infoPtr->minSel.wDay, infoPtr->maxSel.wDay); - TRACE("%ld %ld %ld %ld\n", r.left, r.top, r.right, r.bottom); + TRACE("%d %d %d %d\n", r.left, r.top, r.right, r.bottom); oldCol = SetTextColor(hdc, infoPtr->monthbk); oldBk = SetBkColor(hdc, infoPtr->trailingtxt); hbr = GetSysColorBrush(COLOR_GRAYTEXT); diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 3c193e07c24..4edaf573136 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -337,7 +337,7 @@ PAGER_GetBorder(PAGER_INFO *infoPtr) static inline COLORREF PAGER_GetBkColor(PAGER_INFO *infoPtr) { - TRACE("[%p] returns %06lx\n", infoPtr->hwndSelf, infoPtr->clrBk); + TRACE("[%p] returns %06x\n", infoPtr->hwndSelf, infoPtr->clrBk); return infoPtr->clrBk; } @@ -654,7 +654,7 @@ PAGER_SetBkColor (PAGER_INFO* infoPtr, COLORREF clrBk) COLORREF clrTemp = infoPtr->clrBk; infoPtr->clrBk = clrBk; - TRACE("[%p] %06lx\n", infoPtr->hwndSelf, infoPtr->clrBk); + TRACE("[%p] %06x\n", infoPtr->hwndSelf, infoPtr->clrBk); /* the native control seems to do things this way */ SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, @@ -889,7 +889,7 @@ PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) infoPtr->nPos, infoPtr->nHeight, wine_dbgstr_rect(&rcWindow)); - TRACE("[%p] client rect set to %ldx%ld at (%ld,%ld) BtnState[%d,%d]\n", + TRACE("[%p] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n", infoPtr->hwndSelf, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top, lpRect->left, lpRect->top, infoPtr->TLbtnState, infoPtr->BRbtnState); @@ -1010,7 +1010,7 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) /* If in one of the buttons the capture and draw buttons */ if (btnrect) { - TRACE("[%p] draw btn (%ld,%ld)-(%ld,%ld), Capture %s, style %08lx\n", + TRACE("[%p] draw btn (%d,%d)-(%d,%d), Capture %s, style %08x\n", infoPtr->hwndSelf, btnrect->left, btnrect->top, btnrect->right, btnrect->bottom, (infoPtr->bCapture) ? "TRUE" : "FALSE", @@ -1179,7 +1179,7 @@ PAGER_Timer (PAGER_INFO* infoPtr, INT nTimerId) else dir = (infoPtr->dwStyle & PGS_HORZ) ? PGF_SCROLLRIGHT : PGF_SCROLLDOWN; - TRACE("[%p] TIMERID1: style=%08lx, dir=%d\n", + TRACE("[%p] TIMERID1: style=%08x, dir=%d\n", infoPtr->hwndSelf, infoPtr->dwStyle, dir); KillTimer(infoPtr->hwndSelf, TIMERID1); SetTimer(infoPtr->hwndSelf, TIMERID1, REPEAT_DELAY, 0); @@ -1241,7 +1241,7 @@ PAGER_StyleChanged(PAGER_INFO *infoPtr, WPARAM wStyleType, LPSTYLESTRUCT lpss) { DWORD oldStyle = infoPtr->dwStyle; - TRACE("(styletype=%x, styleOld=0x%08lx, styleNew=0x%08lx)\n", + TRACE("(styletype=%x, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 6a27d7a1b1b..1fd5caf71be 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -303,7 +303,7 @@ static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh, psInfo->isModeless = dwFlags & PSH_MODELESS; memcpy(&psInfo->ppshheader,lppsh,dwSize); - TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n", + 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", lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_a(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback); @@ -359,7 +359,7 @@ static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, psInfo->isModeless = dwFlags & PSH_MODELESS; memcpy(&psInfo->ppshheader,lppsh,dwSize); - TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n", + 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", lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_w(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback); PROPSHEET_UnImplementedFlags(lppsh->dwFlags); @@ -707,7 +707,7 @@ static BOOL PROPSHEET_SizeMismatch(HWND hwndDlg, PropSheetInfo* psInfo) * Original tab size. */ GetClientRect(hwndTabCtrl, &rcOrigTab); - TRACE("orig tab %ld %ld %ld %ld\n", rcOrigTab.left, rcOrigTab.top, + TRACE("orig tab %d %d %d %d\n", rcOrigTab.left, rcOrigTab.top, rcOrigTab.right, rcOrigTab.bottom); /* @@ -719,7 +719,7 @@ static BOOL PROPSHEET_SizeMismatch(HWND hwndDlg, PropSheetInfo* psInfo) rcPage.bottom = psInfo->height; MapDialogRect(hwndDlg, &rcPage); - TRACE("biggest page %ld %ld %ld %ld\n", rcPage.left, rcPage.top, + TRACE("biggest page %d %d %d %d\n", rcPage.left, rcPage.top, rcPage.right, rcPage.bottom); if ( (rcPage.right - rcPage.left) != (rcOrigTab.right - rcOrigTab.left) ) @@ -789,14 +789,14 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) rc.right -= rc.left; rc.bottom -= rc.top; - TRACE("setting tab %p, rc (0,0)-(%ld,%ld)\n", + TRACE("setting tab %p, rc (0,0)-(%d,%d)\n", hwndTabCtrl, rc.right, rc.bottom); SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); GetClientRect(hwndTabCtrl, &rc); - TRACE("tab client rc %ld %ld %ld %ld\n", + TRACE("tab client rc %d %d %d %d\n", rc.left, rc.top, rc.right, rc.bottom); rc.right += ((padding.x * 2) + tabOffsetX); @@ -805,7 +805,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) /* * Resize the property sheet. */ - TRACE("setting dialog %p, rc (0,0)-(%ld,%ld)\n", + TRACE("setting dialog %p, rc (0,0)-(%d,%d)\n", hwndDlg, rc.right, rc.bottom); SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -829,7 +829,7 @@ static BOOL PROPSHEET_AdjustSizeWizard(HWND hwndDlg, PropSheetInfo* psInfo) rc.bottom = psInfo->height; MapDialogRect(hwndDlg, &rc); - TRACE("Biggest page %ld %ld %ld %ld\n", rc.left, rc.top, rc.right, rc.bottom); + TRACE("Biggest page %d %d %d %d\n", rc.left, rc.top, rc.right, rc.bottom); /* Add space for the buttons row */ GetWindowRect(hwndLine, &lineRect); @@ -841,7 +841,7 @@ static BOOL PROPSHEET_AdjustSizeWizard(HWND hwndDlg, PropSheetInfo* psInfo) AdjustWindowRect(&rc, GetWindowLongW(hwndDlg, GWL_STYLE), FALSE); /* Resize the property sheet */ - TRACE("setting dialog %p, rc (0,0)-(%ld,%ld)\n", + TRACE("setting dialog %p, rc (0,0)-(%d,%d)\n", hwndDlg, rc.right, rc.bottom); SetWindowPos(hwndDlg, 0, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -1336,7 +1336,7 @@ static UINT GetTemplateSize(DLGTEMPLATE* pTemplate) p++; break; case 0xffff: - TRACE("class ordinal 0x%08lx\n",*(DWORD*)p); + TRACE("class ordinal 0x%08x\n",*(DWORD*)p); p += 2; break; default: @@ -1352,7 +1352,7 @@ static UINT GetTemplateSize(DLGTEMPLATE* pTemplate) p++; break; case 0xffff: - TRACE("text ordinal 0x%08lx\n",*(DWORD*)p); + TRACE("text ordinal 0x%08x\n",*(DWORD*)p); p += 2; break; default: @@ -1444,7 +1444,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, if (!temp) return FALSE; - TRACE("copying pTemplate %p into temp %p (%ld)\n", pTemplate, temp, resSize); + TRACE("copying pTemplate %p into temp %p (%d)\n", pTemplate, temp, resSize); memcpy(temp, pTemplate, resSize); pTemplate = temp; @@ -2044,7 +2044,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, * NOTE: The resizing happens every time the page is selected and * not only when it's created (some applications depend on it). */ PROPSHEET_GetPageRect(psInfo, hwndDlg, &rc, ppshpage); - TRACE("setting page %p, rc (%ld,%ld)-(%ld,%ld) w=%ld, h=%ld\n", + TRACE("setting page %p, rc (%d,%d)-(%d,%d) w=%d, h=%d\n", psInfo->proppage[index].hwndPage, rc.left, rc.top, rc.right, rc.bottom, rc.right - rc.left, rc.bottom - rc.top); SetWindowPos(psInfo->proppage[index].hwndPage, HWND_TOP, @@ -2152,7 +2152,7 @@ static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText) PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr); WCHAR szTitle[256]; - TRACE("'%s' (style %08lx)\n", debugstr_w(lpszText), dwStyle); + TRACE("'%s' (style %08x)\n", debugstr_w(lpszText), dwStyle); if (HIWORD(lpszText) == 0) { if (!LoadStringW(psInfo->ppshheader.hInstance, LOWORD(lpszText), szTitle, sizeof(szTitle)-sizeof(WCHAR))) @@ -2442,7 +2442,7 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON); HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); - TRACE("%ld\n", dwFlags); + TRACE("%d\n", dwFlags); EnableWindow(hwndBack, FALSE); EnableWindow(hwndNext, FALSE); diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index df6ef19f901..b74dc15a965 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -369,7 +369,7 @@ REBAR_DumpBandInfo( LPREBARBANDINFOA pB) TRACE("ID=%u, ", pB->wID); TRACE("size=%u, child=%p", pB->cbSize, pB->hwndChild); if (pB->fMask & RBBIM_COLORS) - TRACE(", clrF=0x%06lx, clrB=0x%06lx", pB->clrFore, pB->clrBack); + TRACE(", clrF=0x%06x, clrB=0x%06x", pB->clrFore, pB->clrBack); TRACE("\n"); TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(pB->fMask)); @@ -401,14 +401,14 @@ REBAR_DumpBand (REBAR_INFO *iP) if(! TRACE_ON(rebar) ) return; - TRACE("hwnd=%p: color=%08lx/%08lx, bands=%u, rows=%u, cSize=%ld,%ld\n", + TRACE("hwnd=%p: color=%08x/%08x, bands=%u, rows=%u, cSize=%d,%d\n", iP->hwndSelf, iP->clrText, iP->clrBk, iP->uNumBands, iP->uNumRows, iP->calcSize.cx, iP->calcSize.cy); - TRACE("hwnd=%p: flags=%08x, dragStart=%ld,%ld, dragNow=%ld,%ld, iGrabbedBand=%d\n", + TRACE("hwnd=%p: flags=%08x, dragStart=%d,%d, dragNow=%d,%d, iGrabbedBand=%d\n", iP->hwndSelf, iP->fStatus, iP->dragStart.x, iP->dragStart.y, iP->dragNow.x, iP->dragNow.y, iP->iGrabbedBand); - TRACE("hwnd=%p: style=%08lx, I'm Unicode=%s, notify in Unicode=%s, redraw=%s\n", + TRACE("hwnd=%p: style=%08x, I'm Unicode=%s, notify in Unicode=%s, redraw=%s\n", iP->hwndSelf, iP->dwStyle, (iP->bUnicode)?"TRUE":"FALSE", (iP->NtfUnicode)?"TRUE":"FALSE", (iP->DoRedraw)?"TRUE":"FALSE"); for (i = 0; i < iP->uNumBands; i++) { @@ -419,7 +419,7 @@ REBAR_DumpBand (REBAR_INFO *iP) if (pB->fMask & RBBIM_CHILD) TRACE(" child=%p", pB->hwndChild); if (pB->fMask & RBBIM_COLORS) - TRACE(" clrF=0x%06lx clrB=0x%06lx", pB->clrFore, pB->clrBack); + TRACE(" clrF=0x%06x clrB=0x%06x", pB->clrFore, pB->clrBack); TRACE("\n"); TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(pB->fMask)); if (pB->fMask & RBBIM_STYLE) @@ -442,13 +442,13 @@ REBAR_DumpBand (REBAR_INFO *iP) if (pB->fMask & RBBIM_TEXT) TRACE("band # %u: text=%s\n", i, (pB->lpText) ? debugstr_w(pB->lpText) : "(null)"); - TRACE("band # %u: lcx=%u, ccx=%u, hcx=%u, lcy=%u, ccy=%u, hcy=%u, offChild=%ld,%ld\n", + TRACE("band # %u: lcx=%u, ccx=%u, hcx=%u, lcy=%u, ccy=%u, hcy=%u, offChild=%d,%d\n", i, pB->lcx, pB->ccx, pB->hcx, pB->lcy, pB->ccy, pB->hcy, pB->offChild.cx, pB->offChild.cy); - TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%ld,%ld)-(%ld,%ld), Grip=(%ld,%ld)-(%ld,%ld)\n", + TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%d,%d)-(%d,%d), Grip=(%d,%d)-(%d,%d)\n", i, pB->fStatus, pB->fDraw, pB->rcBand.left, pB->rcBand.top, pB->rcBand.right, pB->rcBand.bottom, pB->rcGripper.left, pB->rcGripper.top, pB->rcGripper.right, pB->rcGripper.bottom); - TRACE("band # %u: Img=(%ld,%ld)-(%ld,%ld), Txt=(%ld,%ld)-(%ld,%ld), Child=(%ld,%ld)-(%ld,%ld)\n", + TRACE("band # %u: Img=(%d,%d)-(%d,%d), Txt=(%d,%d)-(%d,%d), Child=(%d,%d)-(%d,%d)\n", i, pB->rcCapImage.left, pB->rcCapImage.top, pB->rcCapImage.right, pB->rcCapImage.bottom, pB->rcCapText.left, pB->rcCapText.top, pB->rcCapText.right, pB->rcCapText.bottom, @@ -718,7 +718,7 @@ REBAR_FixVert (REBAR_INFO *infoPtr, UINT rowstart, UINT rowend, (lpBand->rcoldBand.right !=lpBand->rcBand.right) || (lpBand->rcoldBand.bottom !=lpBand->rcBand.bottom)) { lpBand->fDraw |= NTF_INVALIDATE; - TRACE("band %d row=%d: changed to (%ld,%ld)-(%ld,%ld) from (%ld,%ld)-(%ld,%ld)\n", + TRACE("band %d row=%d: changed to (%d,%d)-(%d,%d) from (%d,%d)-(%d,%d)\n", i, lpBand->iRow, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, @@ -726,7 +726,7 @@ REBAR_FixVert (REBAR_INFO *infoPtr, UINT rowstart, UINT rowend, lpBand->rcoldBand.right, lpBand->rcoldBand.bottom); } else - TRACE("band %d row=%d: unchanged (%ld,%ld)-(%ld,%ld)\n", + TRACE("band %d row=%d: unchanged (%d,%d)-(%d,%d)\n", i, lpBand->iRow, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom); @@ -802,7 +802,7 @@ REBAR_AdjustBands (REBAR_INFO *infoPtr, UINT rowstart, UINT rowend, lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth; else lpBand->rcBand.right = lpBand->rcBand.left + curwidth; - TRACE("Phase 1 band %d, (%ld,%ld)-(%ld,%ld), orig x=%d, xsep=%d\n", + TRACE("Phase 1 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n", i, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep); x = rcBrb(lpBand); @@ -872,7 +872,7 @@ REBAR_AdjustBands (REBAR_INFO *infoPtr, UINT rowstart, UINT rowend, lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth; else lpBand->rcBand.right = lpBand->rcBand.left + curwidth; - TRACE("Phase 2 band %d, (%ld,%ld)-(%ld,%ld), orig x=%d, xsep=%d\n", + TRACE("Phase 2 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n", i, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep); x = rcBrb(lpBand); @@ -1007,14 +1007,14 @@ REBAR_CalcHorzBand (REBAR_INFO *infoPtr, UINT rstart, UINT rend, BOOL notify) ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) || (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) { TRACE("Child rectangle changed for band %u\n", i); - TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\n", + TRACE(" from (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n", oldChild.left, oldChild.top, oldChild.right, oldChild.bottom, lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right, lpBand->rcChild.bottom); } if (lpBand->fDraw & NTF_INVALIDATE) { - TRACE("invalidating (%ld,%ld)-(%ld,%ld)\n", + TRACE("invalidating (%d,%d)-(%d,%d)\n", lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right + ((lpBand->fDraw & DRAW_RIGHTSEP) ? SEP_WIDTH_SIZE : 0), @@ -1146,14 +1146,14 @@ REBAR_CalcVertBand (REBAR_INFO *infoPtr, UINT rstart, UINT rend, BOOL notify) ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) || (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) { TRACE("Child rectangle changed for band %u\n", i); - TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\n", + TRACE(" from (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n", oldChild.left, oldChild.top, oldChild.right, oldChild.bottom, lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right, lpBand->rcChild.bottom); } if (lpBand->fDraw & NTF_INVALIDATE) { - TRACE("invalidating (%ld,%ld)-(%ld,%ld)\n", + TRACE("invalidating (%d,%d)-(%d,%d)\n", lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right + ((lpBand->fDraw & DRAW_BOTTOMSEP) ? SEP_WIDTH_SIZE : 0), @@ -1181,7 +1181,7 @@ REBAR_ForceResize (REBAR_INFO *infoPtr) GetClientRect (infoPtr->hwndSelf, &rc); - TRACE( " old [%ld x %ld], new [%ld x %ld], client [%ld x %ld]\n", + TRACE( " old [%d x %d], new [%d x %d], client [%d x %d]\n", infoPtr->oldSize.cx, infoPtr->oldSize.cy, infoPtr->calcSize.cx, infoPtr->calcSize.cy, rc.right, rc.bottom); @@ -1264,7 +1264,7 @@ REBAR_ForceResize (REBAR_INFO *infoPtr) y = infoPtr->origin.y; } - TRACE("hwnd %p, style=%08lx, setting at (%d,%d) for (%d,%d)\n", + TRACE("hwnd %p, style=%08x, setting at (%d,%d) for (%d,%d)\n", infoPtr->hwndSelf, infoPtr->dwStyle, x, y, width, height); SetWindowPos (infoPtr->hwndSelf, 0, x, y, width, height, @@ -1307,7 +1307,7 @@ REBAR_MoveChildWindows (REBAR_INFO *infoPtr, UINT start, UINT endplus) REBAR_Notify ((NMHDR *)&rbcz, infoPtr, RBN_CHILDSIZE); if (!EqualRect (&lpBand->rcChild, &rbcz.rcChild)) { TRACE("Child rect changed by NOTIFY for band %u\n", i); - TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\n", + TRACE(" from (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n", lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right, lpBand->rcChild.bottom, rbcz.rcChild.left, rbcz.rcChild.top, @@ -1338,7 +1338,7 @@ REBAR_MoveChildWindows (REBAR_INFO *infoPtr, UINT start, UINT endplus) yPos = (lpBand->rcChild.bottom + lpBand->rcChild.top - nEditHeight)/2; /* center combo box inside child area */ - TRACE("moving child (Combo(Ex)) %p to (%ld,%d) for (%ld,%d)\n", + TRACE("moving child (Combo(Ex)) %p to (%d,%d) for (%d,%d)\n", lpBand->hwndChild, lpBand->rcChild.left, yPos, lpBand->rcChild.right - lpBand->rcChild.left, @@ -1353,7 +1353,7 @@ REBAR_MoveChildWindows (REBAR_INFO *infoPtr, UINT start, UINT endplus) ERR("DeferWindowPos returned NULL\n"); } else { - TRACE("moving child (Other) %p to (%ld,%ld) for (%ld,%ld)\n", + TRACE("moving child (Other) %p to (%d,%d) for (%d,%d)\n", lpBand->hwndChild, lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right - lpBand->rcChild.left, @@ -1419,12 +1419,12 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient) if (!infoPtr->DoRedraw) infoPtr->fStatus |= BAND_NEEDS_REDRAW; GetClientRect (infoPtr->hwndSelf, &rcClient); - TRACE("Client is (%ld,%ld)-(%ld,%ld)\n", + TRACE("Client is (%d,%d)-(%d,%d)\n", rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); if (lpRect) { rcAdj = *lpRect; - TRACE("adjustment rect is (%ld,%ld)-(%ld,%ld)\n", + TRACE("adjustment rect is (%d,%d)-(%d,%d)\n", rcAdj.left, rcAdj.top, rcAdj.right, rcAdj.bottom); } else { @@ -1580,7 +1580,7 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient) lpBand->uMinHeight = lpBand->lcy; x = rightx; } - TRACE("P1 band %u, row %d, (%ld,%ld)-(%ld,%ld)\n", + TRACE("P1 band %u, row %d, (%d,%d)-(%d,%d)\n", i, row, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom); @@ -1722,11 +1722,11 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient) current->rcBand.bottom = current->rcBand.top + new_rh; y += adj_rh; } - TRACE("P2 moving band %d to own row at (%ld,%ld)-(%ld,%ld)\n", + TRACE("P2 moving band %d to own row at (%d,%d)-(%d,%d)\n", current_idx, current->rcBand.left, current->rcBand.top, current->rcBand.right, current->rcBand.bottom); - TRACE("P2 prev band %d at (%ld,%ld)-(%ld,%ld)\n", + TRACE("P2 prev band %d at (%d,%d)-(%d,%d)\n", prev_idx, prev->rcBand.left, prev->rcBand.top, prev->rcBand.right, prev->rcBand.bottom); @@ -1824,7 +1824,7 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient) lpBand->rcBand.right = lpBand->rcBand.left + j; else lpBand->rcBand.bottom = lpBand->rcBand.top + j; - TRACE("P2b band %d, row %d changed to (%ld,%ld)-(%ld,%ld)\n", + TRACE("P2b band %d, row %d changed to (%d,%d)-(%d,%d)\n", i, lpBand->iRow, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom); @@ -2266,7 +2266,7 @@ REBAR_InternalEraseBkGnd (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, REC else DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_BOTTOM); } - TRACE ("drawing band separator bottom (%ld,%ld)-(%ld,%ld)\n", + TRACE ("drawing band separator bottom (%d,%d)-(%d,%d)\n", rcRowSep.left, rcRowSep.top, rcRowSep.right, rcRowSep.bottom); } @@ -2290,7 +2290,7 @@ REBAR_InternalEraseBkGnd (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, REC else DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_RIGHT); } - TRACE("drawing band separator right (%ld,%ld)-(%ld,%ld)\n", + TRACE("drawing band separator right (%d,%d)-(%d,%d)\n", rcSep.left, rcSep.top, rcSep.right, rcSep.bottom); } @@ -2326,7 +2326,7 @@ REBAR_InternalEraseBkGnd (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, REC else { old = SetBkColor (hdc, new); - TRACE("%s background color=0x%06lx, band (%ld,%ld)-(%ld,%ld), clip (%ld,%ld)-(%ld,%ld)\n", + TRACE("%s background color=0x%06x, band (%d,%d)-(%d,%d), clip (%d,%d)-(%d,%d)\n", (lpBand->clrBack == CLR_NONE) ? "none" : ((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""), GetBkColor(hdc), @@ -2481,7 +2481,7 @@ REBAR_Shrink (REBAR_INFO *infoPtr, REBAR_BAND *band, INT movement, INT i) LEADJ(band, Leadjust); READJ(band, Readjust); - TRACE("band %d: left=%d, right=%d, move=%d, rtn=%d, rcBand=(%ld,%ld)-(%ld,%ld)\n", + TRACE("band %d: left=%d, right=%d, move=%d, rtn=%d, rcBand=(%d,%d)-(%d,%d)\n", i, Leadjust, Readjust, movement, ret, band->rcBand.left, band->rcBand.top, band->rcBand.right, band->rcBand.bottom); @@ -2563,7 +2563,7 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) infoPtr->ihitoffset); infoPtr->dragNow = *ptsmove; - TRACE("before: movement=%d (%ld,%ld), imindBand=%d, ihitBand=%d, imaxdBand=%d, LSum=%d, RSum=%d\n", + TRACE("before: movement=%d (%d,%d), imindBand=%d, ihitBand=%d, imaxdBand=%d, LSum=%d, RSum=%d\n", movement, ptsmove->x, ptsmove->y, imindBand, ihitBand, imaxdBand, LHeaderSum, RHeaderSum); REBAR_DumpBand (infoPtr); @@ -2971,7 +2971,7 @@ REBAR_GetBkColor (REBAR_INFO *infoPtr) if (clr == CLR_DEFAULT) clr = infoPtr->clrBtnFace; - TRACE("background color 0x%06lx!\n", clr); + TRACE("background color 0x%06x!\n", clr); return clr; } @@ -3005,7 +3005,7 @@ REBAR_GetRect (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) lpBand = &infoPtr->bands[iBand]; CopyRect (lprc, &lpBand->rcBand); - TRACE("band %d, (%ld,%ld)-(%ld,%ld)\n", iBand, + TRACE("band %d, (%d,%d)-(%d,%d)\n", iBand, lprc->left, lprc->top, lprc->right, lprc->bottom); return TRUE; @@ -3049,7 +3049,7 @@ REBAR_GetRowHeight (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) inline static LRESULT REBAR_GetTextColor (REBAR_INFO *infoPtr) { - TRACE("text color 0x%06lx!\n", infoPtr->clrText); + TRACE("text color 0x%06x!\n", infoPtr->clrText); return infoPtr->clrText; } @@ -3349,7 +3349,7 @@ REBAR_MinimizeBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) movement = lpBand->rcBand.right - lpBand->rcBand.left - lpBand->cxHeader; if (movement < 0) { - ERR("something is wrong, band=(%ld,%ld)-(%ld,%ld), cxheader=%d\n", + ERR("something is wrong, band=(%d,%d)-(%d,%d), cxheader=%d\n", lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, lpBand->cxHeader); @@ -3659,7 +3659,7 @@ REBAR_SetBarInfo (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) infoPtr->imageSize.cx = 0; infoPtr->imageSize.cy = 0; } - TRACE("new image cx=%ld, cy=%ld\n", infoPtr->imageSize.cx, + TRACE("new image cx=%d, cy=%d\n", infoPtr->imageSize.cx, infoPtr->imageSize.cy); } @@ -3681,7 +3681,7 @@ REBAR_SetBkColor (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) clrTemp = infoPtr->clrBk; infoPtr->clrBk = (COLORREF)lParam; - TRACE("background color 0x%06lx!\n", infoPtr->clrBk); + TRACE("background color 0x%06x!\n", infoPtr->clrBk); return clrTemp; } @@ -3710,7 +3710,7 @@ REBAR_SetTextColor (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) clrTemp = infoPtr->clrText; infoPtr->clrText = (COLORREF)lParam; - TRACE("text color 0x%06lx!\n", infoPtr->clrText); + TRACE("text color 0x%06x!\n", infoPtr->clrText); return clrTemp; } @@ -3790,15 +3790,15 @@ REBAR_SizeToRect (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (lpRect == NULL) return FALSE; - TRACE("[%ld %ld %ld %ld]\n", + TRACE("[%d %d %d %d]\n", lpRect->left, lpRect->top, lpRect->right, lpRect->bottom); /* what is going on???? */ GetWindowRect(infoPtr->hwndSelf, &t1); - TRACE("window rect [%ld %ld %ld %ld]\n", + TRACE("window rect [%d %d %d %d]\n", t1.left, t1.top, t1.right, t1.bottom); GetClientRect(infoPtr->hwndSelf, &t1); - TRACE("client rect [%ld %ld %ld %ld]\n", + TRACE("client rect [%d %d %d %d]\n", t1.left, t1.top, t1.right, t1.bottom); /* force full _Layout processing */ @@ -3821,7 +3821,7 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (TRACE_ON(rebar)) { GetWindowRect(infoPtr->hwndSelf, &wnrc1); GetClientRect(infoPtr->hwndSelf, &clrc1); - TRACE("window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) cs=(%d,%d %dx%d)\n", + TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom, cs->x, cs->y, cs->cx, cs->cy); @@ -4127,7 +4127,7 @@ REBAR_NCCalcSize (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { ((LPRECT)lParam)->top++; } - TRACE("new client=(%ld,%ld)-(%ld,%ld)\n", + TRACE("new client=(%d,%d)-(%d,%d)\n", ((LPRECT)lParam)->left, ((LPRECT)lParam)->top, ((LPRECT)lParam)->right, ((LPRECT)lParam)->bottom); return 0; @@ -4152,7 +4152,7 @@ REBAR_NCCreate (HWND hwnd, WPARAM wParam, LPARAM lParam) if (TRACE_ON(rebar)) { GetWindowRect(hwnd, &wnrc1); GetClientRect(hwnd, &clrc1); - TRACE("window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) cs=(%d,%d %dx%d)\n", + TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom, cs->x, cs->y, cs->cx, cs->cy); @@ -4264,7 +4264,7 @@ REBAR_NCHitTest (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ret, i); ret = (LRESULT) i; } - TRACE("returning %ld, client point (%ld,%ld)\n", ret, clpt.x, clpt.y); + TRACE("returning %ld, client point (%d,%d)\n", ret, clpt.x, clpt.y); return ret; } @@ -4286,7 +4286,7 @@ REBAR_NCPaint (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) return 0; GetWindowRect (infoPtr->hwndSelf, &rcWindow); OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); - TRACE("rect (%ld,%ld)-(%ld,%ld)\n", + TRACE("rect (%d,%d)-(%d,%d)\n", rcWindow.left, rcWindow.top, rcWindow.right, rcWindow.bottom); DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT); @@ -4299,7 +4299,7 @@ REBAR_NCPaint (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) return 0; GetWindowRect (infoPtr->hwndSelf, &rcWindow); OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); - TRACE("rect (%ld,%ld)-(%ld,%ld)\n", + TRACE("rect (%d,%d)-(%d,%d)\n", rcWindow.left, rcWindow.top, rcWindow.right, rcWindow.bottom); DrawThemeEdge (theme, hdc, 0, 0, &rcWindow, BDR_RAISEDINNER, BF_TOP, NULL); @@ -4339,7 +4339,7 @@ REBAR_Paint (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) GetClientRect(infoPtr->hwndSelf, &rc); hdc = wParam==0 ? BeginPaint (infoPtr->hwndSelf, &ps) : (HDC)wParam; - TRACE("painting (%ld,%ld)-(%ld,%ld) client (%ld,%ld)-(%ld,%ld)\n", + TRACE("painting (%d,%d)-(%d,%d) client (%d,%d)-(%d,%d)\n", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom, rc.left, rc.top, rc.right, rc.bottom); @@ -4464,14 +4464,14 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TRACE("still in CreateWindow\n"); infoPtr->fStatus &= ~CREATE_RUNNING; GetWindowRect ( infoPtr->hwndSelf, &rcWin); - TRACE("win rect (%ld,%ld)-(%ld,%ld)\n", + TRACE("win rect (%d,%d)-(%d,%d)\n", rcWin.left, rcWin.top, rcWin.right, rcWin.bottom); if ((lParam == 0) && (rcWin.right-rcWin.left == 0) && (rcWin.bottom-rcWin.top == 0)) { /* native control seems to do this */ GetClientRect (GetParent(infoPtr->hwndSelf), &rcClient); - TRACE("sizing rebar, message and client zero, parent client (%ld,%ld)\n", + TRACE("sizing rebar, message and client zero, parent client (%d,%d)\n", rcClient.right, rcClient.bottom); } else { @@ -4485,7 +4485,7 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) /* do the actual WM_SIZE request */ GetClientRect (infoPtr->hwndSelf, &rcClient); - TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%ld,%ld)\n", + TRACE("sizing rebar from (%d,%d) to (%d,%d), client (%d,%d)\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy, LOWORD(lParam), HIWORD(lParam), rcClient.right, rcClient.bottom); @@ -4510,11 +4510,11 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) rcClient.right = 0; else rcClient.bottom = 0; - TRACE("sizing rebar to parent (%ld,%ld) size is zero but AUTOSIZE set\n", + TRACE("sizing rebar to parent (%d,%d) size is zero but AUTOSIZE set\n", rcClient.right, rcClient.bottom); } else { - TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%ld,%ld)\n", + TRACE("sizing rebar from (%d,%d) to (%d,%d), client (%d,%d)\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy, LOWORD(lParam), HIWORD(lParam), rcClient.right, rcClient.bottom); @@ -4528,7 +4528,7 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) autosize.fChanged = 0; /* ??? */ autosize.rcActual = autosize.rcTarget; /* ??? */ REBAR_Notify((NMHDR *) &autosize, infoPtr, RBN_AUTOSIZE); - TRACE("RBN_AUTOSIZE client=(%ld,%ld), lp=%08lx\n", + TRACE("RBN_AUTOSIZE client=(%d,%d), lp=%08lx\n", autosize.rcTarget.right, autosize.rcTarget.bottom, lParam); } @@ -4547,7 +4547,7 @@ REBAR_StyleChanged (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { STYLESTRUCT *ss = (STYLESTRUCT *)lParam; - TRACE("current style=%08lx, styleOld=%08lx, style being set to=%08lx\n", + TRACE("current style=%08x, styleOld=%08x, style being set to=%08x\n", infoPtr->dwStyle, ss->styleOld, ss->styleNew); infoPtr->orgStyle = infoPtr->dwStyle = ss->styleNew; if (GetWindowTheme (infoPtr->hwndSelf)) @@ -4582,7 +4582,7 @@ REBAR_WindowPosChanged (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ret = DefWindowProcW(infoPtr->hwndSelf, WM_WINDOWPOSCHANGED, wParam, lParam); GetWindowRect(infoPtr->hwndSelf, &rc); - TRACE("hwnd %p new pos (%ld,%ld)-(%ld,%ld)\n", + TRACE("hwnd %p new pos (%d,%d)-(%d,%d)\n", infoPtr->hwndSelf, rc.left, rc.top, rc.right, rc.bottom); return ret; } diff --git a/dlls/comctl32/smoothscroll.c b/dlls/comctl32/smoothscroll.c index 37e08cdb3cf..4c57ea94ac8 100644 --- a/dlls/comctl32/smoothscroll.c +++ b/dlls/comctl32/smoothscroll.c @@ -112,7 +112,7 @@ BOOL WINAPI SmoothScrollWindow( SMOOTHSCROLLSTRUCT *smooth ) { ); } - FIXME("(hwnd=%p,flags=%lx,x2=%lx): should smooth scroll here.\n", + FIXME("(hwnd=%p,flags=%x,x2=%x): should smooth scroll here.\n", smooth->hwnd,flags,smooth->x2 ); /* FIXME: do timer based smooth scrolling */ diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 9e7efbfdb5c..5e8f8338c85 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -114,7 +114,7 @@ STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) POINT pt; INT i; - TRACE("draw size grip %ld,%ld - %ld,%ld\n", lpRect->left, lpRect->top, lpRect->right, lpRect->bottom); + TRACE("draw size grip %d,%d - %d,%d\n", lpRect->left, lpRect->top, lpRect->right, lpRect->bottom); if (theme) { @@ -175,7 +175,7 @@ STATUSBAR_DrawPart (STATUS_INFO *infoPtr, HDC hdc, STATUSWINDOWPART *part, int i HTHEME theme = GetWindowTheme (infoPtr->Self); int themePart = SP_PANE; - TRACE("part bound %ld,%ld - %ld,%ld\n", r.left, r.top, r.right, r.bottom); + TRACE("part bound %d,%d - %d,%d\n", r.left, r.top, r.right, r.bottom); if (part->style & SBT_POPOUT) border = BDR_RAISEDOUTER; else if (part->style & SBT_NOBORDERS) @@ -319,7 +319,7 @@ STATUSBAR_SetPartBounds (STATUS_INFO *infoPtr) /* get our window size */ GetClientRect (infoPtr->Self, &rect); - TRACE("client wnd size is %ld,%ld - %ld,%ld\n", rect.left, rect.top, rect.right, rect.bottom); + TRACE("client wnd size is %d,%d - %d,%d\n", rect.left, rect.top, rect.right, rect.bottom); rect.left += infoPtr->horizontalBorder; rect.top += infoPtr->verticalBorder; @@ -575,7 +575,7 @@ STATUSBAR_SetBkColor (STATUS_INFO *infoPtr, COLORREF color) infoPtr->clrBk = color; InvalidateRect(infoPtr->Self, NULL, FALSE); - TRACE("CREF: %08lx -> %08lx\n", oldBkColor, infoPtr->clrBk); + TRACE("CREF: %08x -> %08x\n", oldBkColor, infoPtr->clrBk); return oldBkColor; } diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index c43fa0be3da..31c8d9d8425 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -203,7 +203,7 @@ static void TAB_DumpItemExternalT(TCITEMW *pti, UINT iItem, BOOL isW) { if (TRACE_ON(tab)) { - TRACE("external tab %d, mask=0x%08x, dwState=0x%08lx, dwStateMask=0x%08lx, cchTextMax=0x%08x\n", + TRACE("external tab %d, mask=0x%08x, dwState=0x%08x, dwStateMask=0x%08x, cchTextMax=0x%08x\n", iItem, pti->mask, pti->dwState, pti->dwStateMask, pti->cchTextMax); TRACE("external tab %d, iImage=%d, lParam=0x%08lx, pszTextW=%s\n", iItem, pti->iImage, pti->lParam, isW ? debugstr_w(pti->pszText) : debugstr_a((LPSTR)pti->pszText)); @@ -217,10 +217,10 @@ TAB_DumpItemInternal(TAB_INFO *infoPtr, UINT iItem) TAB_ITEM *ti; ti = TAB_GetItem(infoPtr, iItem); - TRACE("tab %d, mask=0x%08x, dwState=0x%08lx, pszText=%s, iImage=%d\n", + TRACE("tab %d, mask=0x%08x, dwState=0x%08x, pszText=%s, iImage=%d\n", iItem, ti->mask, ti->dwState, debugstr_w(ti->pszText), ti->iImage); - TRACE("tab %d, rect.left=%ld, rect.top(row)=%ld\n", + TRACE("tab %d, rect.left=%d, rect.top(row)=%d\n", iItem, ti->rect.left, ti->rect.top); } } @@ -419,7 +419,7 @@ static BOOL TAB_InternalGetItemRect( SELECTED_TAB_OFFSET, 0); } - TRACE("item %d tab h=%d, rect=(%ld,%ld)-(%ld,%ld)\n", + TRACE("item %d tab h=%d, rect=(%d,%d)-(%d,%d)\n", itemIndex, infoPtr->tabHeight, itemRect->left, itemRect->top, itemRect->right, itemRect->bottom); @@ -534,7 +534,7 @@ static void TAB_FocusChanging(const TAB_INFO *infoPtr) */ if (isVisible) { - TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n", + TRACE("invalidate (%d,%d)-(%d,%d)\n", selectedRect.left,selectedRect.top, selectedRect.right,selectedRect.bottom); InvalidateRect(infoPtr->hwnd, &selectedRect, TRUE); @@ -876,7 +876,7 @@ static LRESULT TAB_AdjustRect( DWORD lStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); LONG *iRightBottom, *iLeftTop; - TRACE ("hwnd=%p fLarger=%d (%ld,%ld)-(%ld,%ld)\n", infoPtr->hwnd, fLarger, prc->left, prc->top, prc->right, prc->bottom); + TRACE ("hwnd=%p fLarger=%d (%d,%d)-(%d,%d)\n", infoPtr->hwnd, fLarger, prc->left, prc->top, prc->right, prc->bottom); if(lStyle & TCS_VERTICAL) { @@ -1145,11 +1145,11 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) ((lStyle & TCS_BUTTONS) ? 2 : 1) * infoPtr->uVItemPadding; - TRACE("tabH=%d, tmH=%ld, iconh=%d\n", + TRACE("tabH=%d, tmH=%d, iconh=%d\n", infoPtr->tabHeight, fontMetrics.tmHeight, icon_height); } - TRACE("client right=%ld\n", clientRect.right); + TRACE("client right=%d\n", clientRect.right); /* Get the icon width */ if (infoPtr->himl) @@ -1206,7 +1206,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) tabwidth = max(tabwidth, infoPtr->tabMinWidth); curr->rect.right = curr->rect.left + tabwidth; - TRACE("for <%s>, l,r=%ld,%ld\n", + TRACE("for <%s>, l,r=%d,%d\n", debugstr_w(curr->pszText), curr->rect.left, curr->rect.right); } @@ -1226,14 +1226,14 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) curr->rect.left = 0; curItemRowCount++; - TRACE("wrapping <%s>, l,r=%ld,%ld\n", debugstr_w(curr->pszText), + TRACE("wrapping <%s>, l,r=%d,%d\n", debugstr_w(curr->pszText), curr->rect.left, curr->rect.right); } curr->rect.bottom = 0; curr->rect.top = curItemRowCount - 1; - TRACE("Rect: T %li, L %li, B %li, R %li\n", curr->rect.top, + TRACE("Rect: T %i, L %i, B %i, R %i\n", curr->rect.top, curr->rect.left, curr->rect.bottom, curr->rect.right); /* @@ -1304,7 +1304,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) curr->rect.right -= curr->rect.left; curr->rect.left = 0; - TRACE("r=%ld, cl=%d, cl.r=%ld, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n", + TRACE("r=%d, cl=%d, cl.r=%d, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n", curr->rect.right, curItemLeftPos, clientRect.right, iCount, iRow, infoPtr->uNumRows, remTab, tabPerRow); @@ -1341,7 +1341,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) else curItemLeftPos = curr->rect.right; - TRACE("arranging <%s>, l,r=%ld,%ld, row=%ld\n", + TRACE("arranging <%s>, l,r=%d,%d, row=%d\n", debugstr_w(curr->pszText), curr->rect.left, curr->rect.right, curr->rect.top); } @@ -1393,7 +1393,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) item->rect.left += iCount * widthDiff; item->rect.right += (iCount + 1) * widthDiff; - TRACE("adjusting 1 <%s>, l,r=%ld,%ld\n", + TRACE("adjusting 1 <%s>, l,r=%d,%d\n", debugstr_w(item->pszText), item->rect.left, item->rect.right); @@ -1405,7 +1405,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) start->rect.left = clientRect.left; start->rect.right = clientRect.right - 4; - TRACE("adjusting 2 <%s>, l,r=%ld,%ld\n", + TRACE("adjusting 2 <%s>, l,r=%d,%d\n", debugstr_w(start->pszText), start->rect.left, start->rect.right); @@ -1626,7 +1626,7 @@ TAB_DrawItemInterior } } } - TRACE("drawRect=(%ld,%ld)-(%ld,%ld)\n", + TRACE("drawRect=(%d,%d)-(%d,%d)\n", drawRect->left, drawRect->top, drawRect->right, drawRect->bottom); /* Clear interior */ @@ -1770,7 +1770,7 @@ TAB_DrawItemInterior if (center_offset_v < 0) center_offset_v = 0; - TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%ld,%ld)-(%ld,%ld), textlen=%ld\n", + TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%d,%d)-(%d,%d), textlen=%d\n", debugstr_w(item->pszText), center_offset_h, center_offset_v, drawRect->left, drawRect->top, drawRect->right, drawRect->bottom, (rcText.right-rcText.left)); @@ -1797,7 +1797,7 @@ TAB_DrawItemInterior drawRect->left += cx + infoPtr->uHItemPadding; } - TRACE("drawing image=%d, left=%ld, top=%ld\n", + TRACE("drawing image=%d, left=%d, top=%d\n", item->iImage, rcImage.left, rcImage.top-1); ImageList_Draw ( @@ -1901,7 +1901,7 @@ TAB_DrawItemInterior } else { - TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%ld,%ld)-(%ld,%ld), textlen=%ld\n", + TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%d,%d)-(%d,%d), textlen=%d\n", debugstr_w(item->pszText), center_offset_h, center_offset_v, drawRect->left, drawRect->top, drawRect->right, drawRect->bottom, (rcText.right-rcText.left)); @@ -2092,7 +2092,7 @@ static void TAB_DrawItem( /* Adjust both rectangles to match native */ r.left += (1-ZZ); - TRACE(" item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", + TRACE(" item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -2133,7 +2133,7 @@ static void TAB_DrawItem( } else { - TRACE(" item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", + TRACE(" item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -2187,7 +2187,7 @@ static void TAB_DrawItem( r.top -= 1; } - TRACE(" item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", + TRACE(" item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -2241,7 +2241,7 @@ static void TAB_DrawItem( r.bottom += 2; } - TRACE(" item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", + TRACE(" item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -2312,7 +2312,7 @@ static void TAB_DrawBorder (TAB_INFO *infoPtr, HDC hdc) rect.top += infoPtr->tabHeight * infoPtr->uNumRows + CONTROL_BORDER_SIZEX; } - TRACE("border=(%ld,%ld)-(%ld,%ld)\n", + TRACE("border=(%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); if (theme) @@ -2554,7 +2554,7 @@ static void TAB_InvalidateTabArea(TAB_INFO* infoPtr) rInvalidate.right = clientRect.right - r.left; } - TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n", + TRACE("invalidate (%d,%d)-(%d,%d)\n", rInvalidate.left, rInvalidate.top, rInvalidate.right, rInvalidate.bottom); @@ -2571,7 +2571,7 @@ static inline LRESULT TAB_Paint (TAB_INFO *infoPtr, HDC hdcPaint) else { hdc = BeginPaint (infoPtr->hwnd, &ps); - TRACE("erase %d, rect=(%ld,%ld)-(%ld,%ld)\n", + TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n", ps.fErase, ps.rcPaint.left,ps.rcPaint.top,ps.rcPaint.right,ps.rcPaint.bottom); } @@ -2593,7 +2593,7 @@ TAB_InsertItemT (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnicode) RECT rect; GetClientRect (infoPtr->hwnd, &rect); - TRACE("Rect: %p T %li, L %li, B %li, R %li\n", infoPtr->hwnd, + TRACE("Rect: %p T %i, L %i, B %i, R %i\n", infoPtr->hwnd, rect.top, rect.left, rect.bottom, rect.right); pti = (TCITEMW *)lParam; diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index 87b4db30650..6cbd30a259d 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -138,7 +138,7 @@ void THEMING_Initialize (void) if (!RegisterClassExW (&class)) { - ERR("Could not re-register class %s: %lx\n", + ERR("Could not re-register class %s: %x\n", debugstr_w (subclasses[i].className), GetLastError ()); } else diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 100af6265ce..6a702927422 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -272,12 +272,12 @@ static void TOOLBAR_DumpButton(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *bP, INT btn_num, BOOL internal) { if (TRACE_ON(toolbar)){ - TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08x\n", + TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08x, stringid=0x%08x\n", btn_num, bP->idCommand, GETIBITMAP(infoPtr, bP->iBitmap), bP->fsState, bP->fsStyle, bP->dwData, bP->iString); TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP))); if (internal) - TRACE("button %d id %d, hot=%s, row=%d, rect=(%ld,%ld)-(%ld,%ld)\n", + TRACE("button %d id %d, hot=%s, row=%d, rect=(%d,%d)-(%d,%d)\n", btn_num, bP->idCommand, (bP->bHot) ? "TRUE":"FALSE", bP->nRow, bP->rect.left, bP->rect.top, @@ -292,7 +292,7 @@ TOOLBAR_DumpToolbar(TOOLBAR_INFO *iP, INT line) if (TRACE_ON(toolbar)) { INT i; - TRACE("toolbar %p at line %d, exStyle=%08lx, buttons=%d, bitmaps=%d, strings=%d, style=%08lx\n", + TRACE("toolbar %p at line %d, exStyle=%08x, buttons=%d, bitmaps=%d, strings=%d, style=%08x\n", iP->hwndSelf, line, iP->dwExStyle, iP->nNumButtons, iP->nNumBitmaps, iP->nNumStrings, iP->dwStyle); @@ -365,7 +365,7 @@ TOOLBAR_GetBitmapIndex(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr) if (nmgd.dwMask & TBNF_DI_SETITEM) btnPtr->iBitmap = nmgd.iImage; ret = nmgd.iImage; - TRACE("TBN_GETDISPINFO returned bitmap id %d, mask=%08lx, nNumBitmaps=%d\n", + TRACE("TBN_GETDISPINFO returned bitmap id %d, mask=%08x, nNumBitmaps=%d\n", ret, nmgd.dwMask, infoPtr->nNumBitmaps); } @@ -501,7 +501,7 @@ TOOLBAR_DrawDDFlatSeparator (LPRECT lpRect, HDC hdc, TBUTTON_INFO *btnPtr, TOOLB InflateRect (&myrect, -2, 0); - TRACE("rect=(%ld,%ld)-(%ld,%ld)\n", + TRACE("rect=(%d,%d)-(%d,%d)\n", myrect.left, myrect.top, myrect.right, myrect.bottom); newcolor = (infoPtr->clrBtnShadow == CLR_DEFAULT) ? @@ -560,7 +560,7 @@ TOOLBAR_DrawString (TOOLBAR_INFO *infoPtr, RECT *rcText, LPWSTR lpText, /* draw text */ if (lpText) { - TRACE("string=%s rect=(%ld,%ld)-(%ld,%ld)\n", debugstr_w(lpText), + TRACE("string=%s rect=(%d,%d)-(%d,%d)\n", debugstr_w(lpText), rcText->left, rcText->top, rcText->right, rcText->bottom); hOldFont = SelectObject (hdc, infoPtr->hFont); @@ -893,11 +893,11 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc, DWORD dwBaseCustDr rcBitmap.top += infoPtr->szPadding.cy / 2; - TRACE("iBitmap=%d, start=(%ld,%ld) w=%d, h=%d\n", + TRACE("iBitmap=%d, start=(%d,%d) w=%d, h=%d\n", btnPtr->iBitmap, rcBitmap.left, rcBitmap.top, infoPtr->nBitmapWidth, infoPtr->nBitmapHeight); TRACE("Text=%s\n", debugstr_w(lpText)); - TRACE("iListGap=%d, padding = { %ld, %ld }\n", infoPtr->iListGap, infoPtr->szPadding.cx, infoPtr->szPadding.cy); + TRACE("iListGap=%d, padding = { %d, %d }\n", infoPtr->iListGap, infoPtr->szPadding.cx, infoPtr->szPadding.cy); /* calculate text position */ if (lpText) @@ -1196,7 +1196,7 @@ TOOLBAR_MeasureString(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, } } - TRACE("string size %ld x %ld!\n", lpSize->cx, lpSize->cy); + TRACE("string size %d x %d!\n", lpSize->cx, lpSize->cy); } /*********************************************************************** @@ -1247,7 +1247,7 @@ TOOLBAR_CalcStrings (HWND hwnd, LPSIZE lpSize) SelectObject (hdc, hOldFont); ReleaseDC (hwnd, hdc); - TRACE("max string size %ld x %ld!\n", lpSize->cx, lpSize->cy); + TRACE("max string size %d x %d!\n", lpSize->cx, lpSize->cy); } /*********************************************************************** @@ -3012,7 +3012,7 @@ TOOLBAR_AutoSize (HWND hwnd) INT x, y; INT cx, cy; - TRACE("auto sizing, style=%lx!\n", infoPtr->dwStyle); + TRACE("auto sizing, style=%x!\n", infoPtr->dwStyle); parent = GetParent (hwnd); @@ -3630,7 +3630,7 @@ TOOLBAR_GetMaxSize (HWND hwnd, WPARAM wParam, LPARAM lParam) lpSize->cx = infoPtr->rcBound.right - infoPtr->rcBound.left; lpSize->cy = infoPtr->rcBound.bottom - infoPtr->rcBound.top; - TRACE("maximum size %ld x %ld\n", + TRACE("maximum size %d x %d\n", infoPtr->rcBound.right - infoPtr->rcBound.left, infoPtr->rcBound.bottom - infoPtr->rcBound.top); @@ -4601,7 +4601,7 @@ TOOLBAR_SetButtonSize (HWND hwnd, WPARAM wParam, LPARAM lParam) if ((cx < 0) || (cy < 0)) { - ERR("invalid parameter 0x%08lx\n", (DWORD)lParam); + ERR("invalid parameter 0x%08x\n", (DWORD)lParam); return FALSE; } @@ -4702,7 +4702,7 @@ TOOLBAR_SetDrawTextFlags (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); DWORD dwTemp; - TRACE("hwnd = %p, dwMask = 0x%08lx, dwDTFlags = 0x%08lx\n", hwnd, (DWORD)wParam, (DWORD)lParam); + TRACE("hwnd = %p, dwMask = 0x%08x, dwDTFlags = 0x%08x\n", hwnd, (DWORD)wParam, (DWORD)lParam); dwTemp = infoPtr->dwDTFlags; infoPtr->dwDTFlags = @@ -4727,10 +4727,10 @@ TOOLBAR_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam) infoPtr->dwExStyle &= ~wParam; infoPtr->dwExStyle |= (DWORD)lParam; - TRACE("new style 0x%08lx\n", infoPtr->dwExStyle); + TRACE("new style 0x%08x\n", infoPtr->dwExStyle); if (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL) - FIXME("Unknown Toolbar Extended Style 0x%08lx. Please report.\n", + FIXME("Unknown Toolbar Extended Style 0x%08x. Please report.\n", (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL)); TOOLBAR_CalcToolbar (hwnd); @@ -4904,11 +4904,11 @@ TOOLBAR_SetInsertMark (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); TBINSERTMARK *lptbim = (TBINSERTMARK*)lParam; - TRACE("hwnd = %p, lptbim = { %d, 0x%08lx}\n", hwnd, lptbim->iButton, lptbim->dwFlags); + TRACE("hwnd = %p, lptbim = { %d, 0x%08x}\n", hwnd, lptbim->iButton, lptbim->dwFlags); if ((lptbim->dwFlags & ~TBIMHT_AFTER) != 0) { - FIXME("Unrecognized flag(s): 0x%08lx\n", (lptbim->dwFlags & ~TBIMHT_AFTER)); + FIXME("Unrecognized flag(s): 0x%08x\n", (lptbim->dwFlags & ~TBIMHT_AFTER)); return 0; } @@ -4973,7 +4973,7 @@ TOOLBAR_SetPadding (HWND hwnd, WPARAM wParam, LPARAM lParam) oldPad = MAKELONG(infoPtr->szPadding.cx, infoPtr->szPadding.cy); infoPtr->szPadding.cx = min(LOWORD((DWORD)lParam), GetSystemMetrics(SM_CXEDGE)); infoPtr->szPadding.cy = min(HIWORD((DWORD)lParam), GetSystemMetrics(SM_CYEDGE)); - TRACE("cx=%ld, cy=%ld\n", + TRACE("cx=%d, cy=%d\n", infoPtr->szPadding.cx, infoPtr->szPadding.cy); return (LRESULT) oldPad; } @@ -5117,7 +5117,7 @@ TOOLBAR_SetColorScheme (HWND hwnd, LPCOLORSCHEME lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); - TRACE("new colors Hl=%lx Shd=%lx, old colors Hl=%lx Shd=%lx\n", + TRACE("new colors Hl=%x Shd=%x, old colors Hl=%x Shd=%x\n", lParam->clrBtnHighlight, lParam->clrBtnShadow, infoPtr->clrBtnHighlight, infoPtr->clrBtnShadow); @@ -5198,7 +5198,7 @@ TOOLBAR_GetStringW (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT TOOLBAR_Unkwn45D(HWND hwnd, WPARAM wParam, LPARAM lParam) { SIZE * pSize = (SIZE*)lParam; - FIXME("hwnd=%p, wParam=0x%08x, size.cx=%ld, size.cy=%ld stub!\n", hwnd, wParam, pSize->cx, pSize->cy); + FIXME("hwnd=%p, wParam=0x%08x, size.cx=%d, size.cy=%d stub!\n", hwnd, wParam, pSize->cx, pSize->cy); return 0; } @@ -5213,7 +5213,7 @@ TOOLBAR_Unkwn45E (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd); INT nOldHotItem = infoPtr->nHotItem; - TRACE("old item=%d, new item=%d, flags=%08lx\n", + TRACE("old item=%d, new item=%d, flags=%08x\n", nOldHotItem, infoPtr->nHotItem, (DWORD)lParam); if ((INT) wParam < 0 || (INT)wParam > infoPtr->nNumButtons) @@ -5275,7 +5275,7 @@ TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam) * lParam pointer to SIZE structure * */ - TRACE("[0463] wParam %d, lParam 0x%08lx -> 0x%08lx 0x%08lx\n", + TRACE("[0463] wParam %d, lParam 0x%08lx -> 0x%08x 0x%08x\n", wParam, lParam, lpsize->cx, lpsize->cy); switch(wParam) { @@ -5290,7 +5290,7 @@ TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam) GetWindowRect(hwnd, &rc); MapWindowPoints(0, hwndParent, (LPPOINT)&rc, 2); - TRACE("mapped to (%ld,%ld)-(%ld,%ld)\n", + TRACE("mapped to (%d,%d)-(%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom); lpsize->cx = max(rc.right-rc.left, infoPtr->rcBound.right - infoPtr->rcBound.left); @@ -5307,7 +5307,7 @@ TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam) wParam); return 0; } - TRACE("[0463] set to -> 0x%08lx 0x%08lx\n", + TRACE("[0463] set to -> 0x%08x 0x%08x\n", lpsize->cx, lpsize->cy); return 1; } @@ -5457,7 +5457,7 @@ TOOLBAR_EraseBackground (HWND hwnd, WPARAM wParam, LPARAM lParam) case CDRF_SKIPDEFAULT: return TRUE; default: - FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n", + FIXME("[%p] response %d not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n", hwnd, ntfret); } } @@ -5494,7 +5494,7 @@ TOOLBAR_EraseBackground (HWND hwnd, WPARAM wParam, LPARAM lParam) case CDRF_SKIPDEFAULT: return TRUE; default: - FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_POSTERASE)\n", + FIXME("[%p] response %d not handled to NM_CUSTOMDRAW (CDDS_POSTERASE)\n", hwnd, ntfret); } } @@ -6430,7 +6430,7 @@ TOOLBAR_Paint (HWND hwnd, WPARAM wParam) hdc = wParam==0 ? BeginPaint(hwnd, &ps) : (HDC)wParam; - TRACE("psrect=(%ld,%ld)-(%ld,%ld)\n", + TRACE("psrect=(%d,%d)-(%d,%d)\n", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom); @@ -6553,7 +6553,7 @@ TOOLBAR_StyleChanged (HWND hwnd, INT nType, LPSTYLESTRUCT lpStyle) TOOLBAR_CheckStyle (hwnd, lpStyle->styleNew); - TRACE("new style 0x%08lx\n", lpStyle->styleNew); + TRACE("new style 0x%08x\n", lpStyle->styleNew); infoPtr->dwStyle = lpStyle->styleNew; diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 83064f26795..3462ef9bc30 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -530,7 +530,7 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr) TRACE("%s\n", debugstr_w(infoPtr->szTipText)); TOOLTIPS_CalcTipSize (hwnd, infoPtr, &size); - TRACE("size %ld x %ld\n", size.cx, size.cy); + TRACE("size %d x %d\n", size.cx, size.cy); if (toolPtr->uFlags & TTF_CENTERTIP) { RECT rc; @@ -587,7 +587,7 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr) } } - TRACE("pos %ld - %ld\n", rect.left, rect.top); + TRACE("pos %d - %d\n", rect.left, rect.top); rect.right = rect.left + size.cx; rect.bottom = rect.top + size.cy; @@ -744,7 +744,7 @@ TOOLTIPS_TrackShow (HWND hwnd, TOOLTIPS_INFO *infoPtr) TRACE("%s\n", debugstr_w(infoPtr->szTipText)); TOOLTIPS_CalcTipSize (hwnd, infoPtr, &size); - TRACE("size %ld x %ld\n", size.cx, size.cy); + TRACE("size %d x %d\n", size.cx, size.cy); if (toolPtr->uFlags & TTF_ABSOLUTE) { rect.left = infoPtr->xTrackPos; @@ -779,7 +779,7 @@ TOOLTIPS_TrackShow (HWND hwnd, TOOLTIPS_INFO *infoPtr) rect.left = rcTool.right; } - TRACE("pos %ld - %ld\n", rect.left, rect.top); + TRACE("pos %d - %d\n", rect.left, rect.top); rect.right = rect.left + size.cx; rect.bottom = rect.top + size.cy; @@ -1364,7 +1364,7 @@ TOOLTIPS_GetBubbleSize (HWND hwnd, WPARAM wParam, LPARAM lParam) TRACE("tool %d\n", nTool); TOOLTIPS_CalcTipSize (hwnd, infoPtr, &size); - TRACE("size %ld x %ld\n", size.cx, size.cy); + TRACE("size %d x %d\n", size.cx, size.cy); return MAKELRESULT(size.cx, size.cy); } @@ -1794,7 +1794,7 @@ TOOLTIPS_RelayEvent (HWND hwnd, WPARAM wParam, LPARAM lParam) &pt); TRACE("tool (%p) %d %d %d\n", hwnd, nOldTool, infoPtr->nTool, infoPtr->nCurrentTool); - TRACE("WM_MOUSEMOVE (%p %ld %ld)\n", hwnd, pt.x, pt.y); + TRACE("WM_MOUSEMOVE (%p %d %d)\n", hwnd, pt.x, pt.y); if (infoPtr->nTool != nOldTool) { if(infoPtr->nTool == -1) { /* Moved out of all tools */ diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 615df572a50..765a9ff9e78 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -441,7 +441,7 @@ TRACKBAR_CalcSelection (TRACKBAR_INFO *infoPtr) } } - TRACE("selection[left=%ld, top=%ld, right=%ld, bottom=%ld]\n", + TRACE("selection[left=%d, top=%d, right=%d, bottom=%d]\n", selection->left, selection->top, selection->right, selection->bottom); } @@ -451,7 +451,7 @@ TRACKBAR_AutoPage (TRACKBAR_INFO *infoPtr, POINT clickPoint) LONG dir = TRACKBAR_GetAutoPageDirection(infoPtr, clickPoint); LONG prevPos = infoPtr->lPos; - TRACE("x=%ld, y=%ld, dir=%ld\n", clickPoint.x, clickPoint.y, dir); + TRACE("x=%d, y=%d, dir=%d\n", clickPoint.x, clickPoint.y, dir); if (dir > 0 && (infoPtr->flags & TB_AUTO_PAGE_RIGHT)) TRACKBAR_PageDown(infoPtr); @@ -1051,7 +1051,7 @@ static int comp_tics(const void *ap, const void *bp) const DWORD a = *(const DWORD *)ap; const DWORD b = *(const DWORD *)bp; - TRACE("(a=%ld, b=%ld)\n", a, b); + TRACE("(a=%d, b=%d)\n", a, b); if (a < b) return -1; if (a > b) return 1; return 0; @@ -1292,7 +1292,7 @@ TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos) if ((lPos < infoPtr->lRangeMin) || (lPos> infoPtr->lRangeMax)) return FALSE; - TRACE("lPos=%ld\n", lPos); + TRACE("lPos=%d\n", lPos); infoPtr->uNumTics++; infoPtr->tics=ReAlloc( infoPtr->tics, diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 6aca6263819..2151f8ce7ae 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -627,7 +627,7 @@ TREEVIEW_SendCustomDrawNotify(TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, NMTVCUSTOMDRAW nmcdhdr; LPNMCUSTOMDRAW nmcd; - TRACE("drawstage:%lx hdc:%p\n", dwDrawStage, hdc); + TRACE("drawstage:%x hdc:%p\n", dwDrawStage, hdc); nmcd = &nmcdhdr.nmcd; nmcd->hdr.hwndFrom = hwnd; @@ -686,7 +686,7 @@ TREEVIEW_SendCustomDrawItemNotify(TREEVIEW_INFO *infoPtr, HDC hdc, nmcd->lItemlParam = wineItem->lParam; nmcdhdr->iLevel = wineItem->iLevel; - TRACE("drawstage:%lx hdc:%p item:%lx, itemstate:%x, lItemlParam:%lx\n", + TRACE("drawstage:%x hdc:%p item:%lx, itemstate:%x, lItemlParam:%lx\n", nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); @@ -1966,7 +1966,7 @@ TREEVIEW_SetInsertMarkColor(TREEVIEW_INFO *infoPtr, COLORREF color) { COLORREF prevColor = infoPtr->clrInsertMark; - TRACE("%lx\n", color); + TRACE("%x\n", color); infoPtr->clrInsertMark = color; return (LRESULT)prevColor; @@ -2030,7 +2030,7 @@ TREEVIEW_GetItemRect(TREEVIEW_INFO *infoPtr, BOOL fTextRect, LPRECT lpRect) *lpRect = wineItem->rect; } - TRACE("%s [L:%ld R:%ld T:%ld B:%ld]\n", fTextRect ? "text" : "item", + TRACE("%s [L:%d R:%d T:%d B:%d]\n", fTextRect ? "text" : "item", lpRect->left, lpRect->right, lpRect->top, lpRect->bottom); return TRUE; @@ -2575,7 +2575,7 @@ TREEVIEW_DrawItem(TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem) rcText.left = wineItem->textOffset; rcText.right = rcText.left + wineItem->textWidth + 4; - TRACE("drawing text %s at (%ld,%ld)-(%ld,%ld)\n", + TRACE("drawing text %s at (%d,%d)-(%d,%d)\n", debugstr_w(wineItem->pszText), rcText.left, rcText.top, rcText.right, rcText.bottom); @@ -3494,7 +3494,7 @@ TREEVIEW_HitTest(TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) } lpht->hItem = wineItem; - TRACE("(%ld,%ld):result %x\n", lpht->pt.x, lpht->pt.y, lpht->flags); + TRACE("(%d,%d):result %x\n", lpht->pt.x, lpht->pt.y, lpht->flags); return (LRESULT)wineItem; } @@ -4172,7 +4172,7 @@ TREEVIEW_CreateDragImage(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) hOldFont = SelectObject(hdc, infoPtr->hFont); GetTextExtentPoint32W(hdc, dragItem->pszText, strlenW(dragItem->pszText), &size); - TRACE("%ld %ld %s %d\n", size.cx, size.cy, debugstr_w(dragItem->pszText), + TRACE("%d %d %s %d\n", size.cx, size.cy, debugstr_w(dragItem->pszText), strlenW(dragItem->pszText)); hbmp = CreateCompatibleBitmap(htopdc, size.cx, size.cy); hOldbmp = SelectObject(hdc, hbmp); @@ -4509,7 +4509,7 @@ TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr, HTREEITEM item, BOOL bHScroll) viscount = TREEVIEW_GetVisibleCount(infoPtr); - TRACE("%p (%s) %ld - %ld viscount(%d)\n", item, TREEVIEW_ItemName(item), item->visibleOrder, + TRACE("%p (%s) %d - %d viscount(%d)\n", item, TREEVIEW_ItemName(item), item->visibleOrder, hasFirstVisible ? infoPtr->firstVisible->visibleOrder : -1, viscount); if (hasFirstVisible) @@ -4828,7 +4828,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) TREEVIEW_INFO *infoPtr; LOGFONTW lf; - TRACE("wnd %p, style %lx\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE)); + TRACE("wnd %p, style %x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE)); infoPtr = (TREEVIEW_INFO *)Alloc(sizeof(TREEVIEW_INFO)); @@ -5266,12 +5266,12 @@ TREEVIEW_Notify(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (lppgc->dwFlag == PGF_CALCWIDTH) { lppgc->iWidth = infoPtr->treeWidth; - TRACE("got PGN_CALCSIZE, returning horz size = %ld, client=%ld\n", + TRACE("got PGN_CALCSIZE, returning horz size = %d, client=%d\n", infoPtr->treeWidth, infoPtr->clientWidth); } else { lppgc->iHeight = infoPtr->treeHeight; - TRACE("got PGN_CALCSIZE, returning vert size = %ld, client=%ld\n", + TRACE("got PGN_CALCSIZE, returning vert size = %d, client=%d\n", infoPtr->treeHeight, infoPtr->clientHeight); } return 0;