Dimitrie O. Paun wrote:
Fixing the RECT definition (how come it fell through the cracks,
it's such a fundamental definition in Win32?) in one go doesn't
seem like it's going to happen. A lot of places need fixing, so
unless a Perl wizard (hint, hint) comes up with a magic script,
it's going to be a while until this is fixed.
I had a go at the perl approach, at least for a subset of the changes.
Here's the script I used to generate the initial patch:
#!/bin/sh
rm -rf orig after
#make > log 2>&1 || /bin/true
grep "warning: int format, LONG arg" log | sed -e 's/:.*//' | sort -u | sed 's,\.\./,,g' > fils
find . | fgrep -f fils > absfils
tar -czvf orig.tgz `cat absfils`
mkdir orig
cd orig; tar -xzvf ../orig.tgz; cd ..
mkdir after
cd after; tar -xzvf ../orig.tgz; cd ..
cd after
find . -type f | xargs perl -p -i.bak -e 's/\(%d,%d\)/(%ld,%ld)/g'
cd ..
diff -aur orig after > longify.patch
I then removed any part of the patch that was wrong (first by eye,
then iteratively by looking at compiler logs).
This gets rid of quite a few of the warnings.
The resulting patch is attached.
- Dan
--
Dan Kegel
Linux User #78045
http://www.kegel.com
diff -aur orig/controls/menu.c after/controls/menu.c
--- orig/controls/menu.c 2002-12-21 21:52:08.000000000 -0800
+++ after/controls/menu.c 2002-12-24 05:11:18.000000000 -0800
@@ -965,7 +965,7 @@
- arrow_bitmap_width;
}
}
- TRACE("(%d,%d)-(%d,%d)\n", lpitem->rect.left, lpitem->rect.top,
lpitem->rect.right, lpitem->rect.bottom);
+ TRACE("(%ld,%ld)-(%ld,%ld)\n", lpitem->rect.left, lpitem->rect.top,
+lpitem->rect.right, lpitem->rect.bottom);
}
@@ -2688,7 +2688,7 @@
mt.pt.x = x;
mt.pt.y = y;
- TRACE("hmenu=%p flags=0x%08x (%d,%d) hwnd=%p (%d,%d)-(%d,%d)\n",
+ TRACE("hmenu=%p flags=0x%08x (%d,%d) hwnd=%p (%ld,%ld)-(%ld,%ld)\n",
hmenu, wFlags, x, y, hwnd, (lprect) ? lprect->left : 0, (lprect) ?
lprect->top : 0,
(lprect) ? lprect->right : 0, (lprect) ? lprect->bottom : 0);
diff -aur orig/dlls/comctl32/comboex.c after/dlls/comctl32/comboex.c
--- orig/dlls/comctl32/comboex.c 2002-12-21 21:52:08.000000000 -0800
+++ after/dlls/comctl32/comboex.c 2002-12-24 05:11:18.000000000 -0800
@@ -385,7 +385,7 @@
h = mysize.cy + 1;
y = rect.bottom - h - 1;
- TRACE("Combo client (%d,%d)-(%d,%d), setting Edit to (%d,%d)-(%d,%d)\n",
+ TRACE("Combo client (%ld,%ld)-(%ld,%ld), 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);
@@ -891,10 +891,10 @@
height = cb_wrect.bottom-cb_wrect.top
+ cbx_wrect.bottom-cbx_wrect.top
- (cbx_crect.bottom-cbx_crect.top);
- TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n",
+ TRACE("EX window=(%ld,%ld)-(%ld,%ld), client=(%ld,%ld)-(%ld,%ld)\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=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n",
+ TRACE("CB window=(%ld,%ld)-(%ld,%ld), 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,
@@ -942,7 +942,7 @@
/* create combo box */
GetWindowRect(hwnd, &wnrc1);
GetClientRect(hwnd, &clrc1);
- TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d)\n",
+ TRACE("EX window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld)\n",
wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
clrc1.left, clrc1.top, clrc1.right, clrc1.bottom);
@@ -1033,7 +1033,7 @@
GetWindowRect(hwnd, &wnrc1);
GetClientRect(hwnd, &clrc1);
GetWindowRect(infoPtr->hwndCombo, &cmbwrc);
- TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) CB wnd=(%d,%d)-(%d,%d)\n",
+ TRACE("EX window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) CB
+wnd=(%ld,%ld)-(%ld,%ld)\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);
@@ -1042,7 +1042,7 @@
SWP_NOACTIVATE | SWP_NOREDRAW);
GetWindowRect(infoPtr->hwndCombo, &cmbwrc);
- TRACE("CB window=(%d,%d)-(%d,%d)\n",
+ TRACE("CB window=(%ld,%ld)-(%ld,%ld)\n",
cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
SetWindowPos(hwnd, HWND_TOP,
0, 0, cmbwrc.right-cmbwrc.left, cmbwrc.bottom-cmbwrc.top,
@@ -1291,7 +1291,7 @@
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 (%d,%d)-(%d,%d) itemData=0x%08lx\n",
+ TRACE("hWnd=%p hDC=%p (%ld,%ld)-(%ld,%ld) itemData=0x%08lx\n",
dis->hwndItem, dis->hDC, dis->rcItem.left,
dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom,
dis->itemData);
@@ -1311,7 +1311,7 @@
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=(%d,%d)-(%d,%d)\n",
+ TRACE("drawing item -1 special focus, rect=(%ld,%ld)-(%ld,%ld)\n",
dis->rcItem.left, dis->rcItem.top,
dis->rcItem.right, dis->rcItem.bottom);
}
@@ -1327,14 +1327,14 @@
edrc.left=edrc.top=edrc.right=edrc.bottom=-1;
if (infoPtr->hwndEdit)
GetWindowRect (infoPtr->hwndEdit, &edrc);
- TRACE("window rects ex=(%d,%d)-(%d,%d), cb=(%d,%d)-(%d,%d),
ed=(%d,%d)-(%d,%d)\n",
+ TRACE("window rects ex=(%ld,%ld)-(%ld,%ld), cb=(%ld,%ld)-(%ld,%ld),
+ed=(%ld,%ld)-(%ld,%ld)\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=(%d,%d)-(%d,%d),
action=%08x, state=%08x\n",
+ ERR("NOT drawing item -1 special focus, rect=(%ld,%ld)-(%ld,%ld),
+action=%08x, state=%08x\n",
dis->rcItem.left, dis->rcItem.top,
dis->rcItem.right, dis->rcItem.bottom,
dis->itemAction, dis->itemState);
@@ -1491,7 +1491,7 @@
rect.right = x + txtsize.cx;
rect.top = dis->rcItem.top + 1;
rect.bottom = dis->rcItem.bottom - 1;
- TRACE("drawing item %d text, rect=(%d,%d)-(%d,%d)\n",
+ TRACE("drawing item %d text, rect=(%ld,%ld)-(%ld,%ld)\n",
dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
ExtTextOutW (dis->hDC, x, y, ETO_OPAQUE | ETO_CLIPPED,
&rect, str, len, 0);
@@ -1617,10 +1617,10 @@
TRACE("winpos=(%d,%d %dx%d) flags=0x%08x\n",
wp->x, wp->y, wp->cx, wp->cy, wp->flags);
- TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n",
+ TRACE("EX window=(%ld,%ld)-(%ld,%ld), client=(%ld,%ld)-(%ld,%ld)\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=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n",
+ TRACE("CB window=(%ld,%ld)-(%ld,%ld), 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);
@@ -1702,7 +1702,7 @@
hDC = (HDC) wParam;
obkc = SetBkColor (hDC, GetSysColor (COLOR_WINDOW));
GetClientRect (hwnd, &rect);
- TRACE("erasing (%d,%d)-(%d,%d)\n",
+ TRACE("erasing (%ld,%ld)-(%ld,%ld)\n",
rect.left, rect.top, rect.right, rect.bottom);
ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
SetBkColor (hDC, obkc);
@@ -1907,7 +1907,7 @@
hDC = (HDC) wParam;
obkc = SetBkColor (hDC, GetSysColor (COLOR_WINDOW));
GetClientRect (hwnd, &rect);
- TRACE("erasing (%d,%d)-(%d,%d)\n",
+ TRACE("erasing (%ld,%ld)-(%ld,%ld)\n",
rect.left, rect.top, rect.right, rect.bottom);
ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
SetBkColor (hDC, obkc);
diff -aur orig/dlls/comctl32/listview.c after/dlls/comctl32/listview.c
--- orig/dlls/comctl32/listview.c 2002-12-23 22:59:36.000000000 -0800
+++ after/dlls/comctl32/listview.c 2002-12-24 05:11:18.000000000 -0800
@@ -6462,7 +6462,7 @@
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=(%ld,%ld), ntmH=%d\n",
LOWORD(oldspacing), HIWORD(oldspacing), cx, cy,
infoPtr->iconSize.cx, infoPtr->iconSize.cy,
infoPtr->ntmHeight);
diff -aur orig/dlls/comctl32/pager.c after/dlls/comctl32/pager.c
--- orig/dlls/comctl32/pager.c 2002-12-21 21:52:09.000000000 -0800
+++ after/dlls/comctl32/pager.c 2002-12-24 05:11:18.000000000 -0800
@@ -897,7 +897,7 @@
DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam);
- TRACE("orig rect=(%d,%d)-(%d,%d)\n",
+ TRACE("orig rect=(%ld,%ld)-(%ld,%ld)\n",
lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
if (PAGER_IsHorizontal(hwnd))
@@ -912,7 +912,7 @@
/* Reset buttons and hide any grey ones */
scrollRange = infoPtr->nWidth - (rcmyw.right - rcmyw.left);
- TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d),
cursor=(%ld,%ld)\n",
+ TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%ld,%ld)-(%ld,%ld),
+cursor=(%ld,%ld)\n",
infoPtr->nPos, scrollRange, infoPtr->nHeight,
rcmyw.left, rcmyw.top,
rcmyw.right, rcmyw.bottom,
@@ -926,7 +926,7 @@
ltrc.right = ltrc.left + infoPtr->nButtonSize;
rbrc = wnrc;
rbrc.left = rbrc.right - infoPtr->nButtonSize;
- TRACE("horz lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+ TRACE("horz lt rect=(%ld,%ld)-(%ld,%ld), rb rect=(%ld,%ld)-(%ld,%ld)\n",
ltrc.left, ltrc.top, ltrc.right, ltrc.bottom,
rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
if (PtInRect (<rc, cursor) && infoPtr->TLbtnState)
@@ -961,7 +961,7 @@
/* Reset buttons and hide any grey ones */
scrollRange = infoPtr->nHeight - (rcmyw.bottom - rcmyw.top);
- TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d),
cursor=(%ld,%ld)\n",
+ TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%ld,%ld)-(%ld,%ld),
+cursor=(%ld,%ld)\n",
infoPtr->nPos, scrollRange, infoPtr->nHeight,
rcmyw.left, rcmyw.top,
rcmyw.right, rcmyw.bottom,
@@ -986,7 +986,7 @@
ltrc.right = ltrc.left + infoPtr->nButtonSize;
rbrc = wnrc;
rbrc.left = rbrc.right - infoPtr->nButtonSize;
- TRACE("vert lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+ TRACE("vert lt rect=(%ld,%ld)-(%ld,%ld), rb rect=(%ld,%ld)-(%ld,%ld)\n",
ltrc.left, ltrc.top, ltrc.right, ltrc.bottom,
rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
if (PtInRect (<rc, cursor) && infoPtr->TLbtnState)
@@ -1003,7 +1003,7 @@
lpRect->bottom = infoPtr->nHeight;
}
- TRACE("[%p] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n",
+ TRACE("[%p] client rect set to %dx%d at (%ld,%ld) BtnState[%d,%d]\n",
hwnd, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top,
lpRect->left, lpRect->top,
infoPtr->TLbtnState, infoPtr->BRbtnState);
@@ -1232,7 +1232,7 @@
/* If in one of the buttons the capture and draw buttons */
if (btnrect) {
- TRACE("[%p] draw btn (%d,%d)-(%d,%d), Capture %s, style %08lx\n",
+ TRACE("[%p] draw btn (%ld,%ld)-(%ld,%ld), Capture %s, style %08lx\n",
hwnd, btnrect->left, btnrect->top,
btnrect->right, btnrect->bottom,
(infoPtr->bCapture) ? "TRUE" : "FALSE",
diff -aur orig/dlls/comctl32/propsheet.c after/dlls/comctl32/propsheet.c
--- orig/dlls/comctl32/propsheet.c 2002-12-21 21:52:09.000000000 -0800
+++ after/dlls/comctl32/propsheet.c 2002-12-24 05:11:18.000000000 -0800
@@ -745,7 +745,7 @@
rc.right -= rc.left;
rc.bottom -= rc.top;
- TRACE("setting tab %08lx, rc (0,0)-(%d,%d)\n",
+ TRACE("setting tab %08lx, rc (0,0)-(%ld,%ld)\n",
(DWORD)hwndTabCtrl, rc.right, rc.bottom);
SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -761,7 +761,7 @@
/*
* Resize the property sheet.
*/
- TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n",
+ TRACE("setting dialog %08lx, rc (0,0)-(%ld,%ld)\n",
(DWORD)hwndDlg, rc.right, rc.bottom);
SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -830,7 +830,7 @@
/*
* Resize the property sheet.
*/
- TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n",
+ TRACE("setting dialog %08lx, rc (0,0)-(%ld,%ld)\n",
(DWORD)hwndDlg, rc.right, rc.bottom);
SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -1422,7 +1422,7 @@
pageHeight = rc.bottom - rc.top;
padding = PROPSHEET_GetPaddingInfoWizard(hwndParent, psInfo);
- TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d, padx=%d, pady=%d\n",
+ TRACE("setting page %08lx, rc (%ld,%ld)-(%ld,%ld) w=%d, h=%d, padx=%d,
+pady=%d\n",
(DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom,
pageWidth, pageHeight, padding.x, padding.y);
SetWindowPos(hwndPage, HWND_TOP,
@@ -1438,7 +1438,7 @@
PROPSHEET_GetPageRect(psInfo, hwndParent, &rc);
pageWidth = rc.right - rc.left;
pageHeight = rc.bottom - rc.top;
- TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d\n",
+ TRACE("setting page %08lx, rc (%ld,%ld)-(%ld,%ld) w=%d, h=%d\n",
(DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom,
pageWidth, pageHeight);
SetWindowPos(hwndPage, HWND_TOP,
diff -aur orig/dlls/comctl32/rebar.c after/dlls/comctl32/rebar.c
--- orig/dlls/comctl32/rebar.c 2002-12-21 21:52:09.000000000 -0800
+++ after/dlls/comctl32/rebar.c 2002-12-24 05:11:18.000000000 -0800
@@ -466,11 +466,11 @@
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",
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=(%d,%d)-(%d,%d),
Grip=(%d,%d)-(%d,%d)\n",
+ TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%ld,%ld)-(%ld,%ld),
+Grip=(%ld,%ld)-(%ld,%ld)\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=(%d,%d)-(%d,%d), Txt=(%d,%d)-(%d,%d),
Child=(%d,%d)-(%d,%d)\n",
+ TRACE("band # %u: Img=(%ld,%ld)-(%ld,%ld), Txt=(%ld,%ld)-(%ld,%ld),
+Child=(%ld,%ld)-(%ld,%ld)\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,
@@ -679,7 +679,7 @@
(lpBand->rcoldBand.right !=lpBand->rcBand.right) ||
(lpBand->rcoldBand.bottom !=lpBand->rcBand.bottom)) {
lpBand->fDraw |= NTF_INVALIDATE;
- TRACE("band %d row=%d: changed to (%d,%d)-(%d,%d) from (%d,%d)-(%d,%d)\n",
+ TRACE("band %d row=%d: changed to (%ld,%ld)-(%ld,%ld) from
+(%ld,%ld)-(%ld,%ld)\n",
i, lpBand->iRow,
lpBand->rcBand.left, lpBand->rcBand.top,
lpBand->rcBand.right, lpBand->rcBand.bottom,
@@ -687,7 +687,7 @@
lpBand->rcoldBand.right, lpBand->rcoldBand.bottom);
}
else
- TRACE("band %d row=%d: unchanged (%d,%d)-(%d,%d)\n",
+ TRACE("band %d row=%d: unchanged (%ld,%ld)-(%ld,%ld)\n",
i, lpBand->iRow,
lpBand->rcBand.left, lpBand->rcBand.top,
lpBand->rcBand.right, lpBand->rcBand.bottom);
@@ -763,7 +763,7 @@
lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth;
else
lpBand->rcBand.right = lpBand->rcBand.left + curwidth;
- TRACE("Phase 1 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n",
+ TRACE("Phase 1 band %d, (%ld,%ld)-(%ld,%ld), orig x=%d, xsep=%d\n",
i, lpBand->rcBand.left, lpBand->rcBand.top,
lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep);
x = rcBrb(lpBand);
@@ -833,7 +833,7 @@
lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth;
else
lpBand->rcBand.right = lpBand->rcBand.left + curwidth;
- TRACE("Phase 2 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n",
+ TRACE("Phase 2 band %d, (%ld,%ld)-(%ld,%ld), orig x=%d, xsep=%d\n",
i, lpBand->rcBand.left, lpBand->rcBand.top,
lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep);
x = rcBrb(lpBand);
@@ -961,14 +961,14 @@
((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 (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n",
+ TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\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 (%d,%d)-(%d,%d)\n",
+ TRACE("invalidating (%ld,%ld)-(%ld,%ld)\n",
lpBand->rcBand.left,
lpBand->rcBand.top,
lpBand->rcBand.right + ((lpBand->fDraw & DRAW_RIGHTSEP) ?
SEP_WIDTH_SIZE : 0),
@@ -1100,14 +1100,14 @@
((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 (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n",
+ TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\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 (%d,%d)-(%d,%d)\n",
+ TRACE("invalidating (%ld,%ld)-(%ld,%ld)\n",
lpBand->rcBand.left,
lpBand->rcBand.top,
lpBand->rcBand.right + ((lpBand->fDraw & DRAW_BOTTOMSEP) ?
SEP_WIDTH_SIZE : 0),
@@ -1264,7 +1264,7 @@
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 (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n",
+ TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\n",
lpBand->rcChild.left, lpBand->rcChild.top,
lpBand->rcChild.right, lpBand->rcChild.bottom,
rbcz.rcChild.left, rbcz.rcChild.top,
@@ -1310,7 +1310,7 @@
ERR("DeferWindowPos returned NULL\n");
}
else {
- TRACE("moving child (Other) %p to (%d,%d) for (%d,%d)\n",
+ TRACE("moving child (Other) %p to (%ld,%ld) for (%ld,%ld)\n",
lpBand->hwndChild,
lpBand->rcChild.left, lpBand->rcChild.top,
lpBand->rcChild.right - lpBand->rcChild.left,
@@ -1370,12 +1370,12 @@
if (!infoPtr->DoRedraw) infoPtr->fStatus |= BAND_NEEDS_REDRAW;
GetClientRect (infoPtr->hwndSelf, &rcClient);
- TRACE("Client is (%d,%d)-(%d,%d)\n",
+ TRACE("Client is (%ld,%ld)-(%ld,%ld)\n",
rcClient.left, rcClient.top, rcClient.right, rcClient.bottom);
if (lpRect) {
rcAdj = *lpRect;
- TRACE("adjustment rect is (%d,%d)-(%d,%d)\n",
+ TRACE("adjustment rect is (%ld,%ld)-(%ld,%ld)\n",
rcAdj.left, rcAdj.top, rcAdj.right, rcAdj.bottom);
}
else {
@@ -1531,7 +1531,7 @@
lpBand->uMinHeight = lpBand->lcy;
x = rightx;
}
- TRACE("P1 band %u, row %d, (%d,%d)-(%d,%d)\n",
+ TRACE("P1 band %u, row %d, (%ld,%ld)-(%ld,%ld)\n",
i, row,
lpBand->rcBand.left, lpBand->rcBand.top,
lpBand->rcBand.right, lpBand->rcBand.bottom);
@@ -1672,11 +1672,11 @@
current->rcBand.bottom = current->rcBand.top + new_rh;
y += adj_rh;
}
- TRACE("P2 moving band %d to own row at (%d,%d)-(%d,%d)\n",
+ TRACE("P2 moving band %d to own row at (%ld,%ld)-(%ld,%ld)\n",
current_idx,
current->rcBand.left, current->rcBand.top,
current->rcBand.right, current->rcBand.bottom);
- TRACE("P2 prev band %d at (%d,%d)-(%d,%d)\n",
+ TRACE("P2 prev band %d at (%ld,%ld)-(%ld,%ld)\n",
prev_idx,
prev->rcBand.left, prev->rcBand.top,
prev->rcBand.right, prev->rcBand.bottom);
@@ -1779,7 +1779,7 @@
lpBand->rcBand.right = lpBand->rcBand.left + j;
else
lpBand->rcBand.bottom = lpBand->rcBand.top + j;
- TRACE("P2b band %d, row %d changed to (%d,%d)-(%d,%d)\n",
+ TRACE("P2b band %d, row %d changed to (%ld,%ld)-(%ld,%ld)\n",
iband, lpBand->iRow,
lpBand->rcBand.left, lpBand->rcBand.top,
lpBand->rcBand.right, lpBand->rcBand.bottom);
@@ -2141,7 +2141,7 @@
rcRowSep.right = infoPtr->calcSize.cx;
DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_BOTTOM);
}
- TRACE ("drawing band separator bottom (%d,%d)-(%d,%d)\n",
+ TRACE ("drawing band separator bottom (%ld,%ld)-(%ld,%ld)\n",
rcRowSep.left, rcRowSep.top,
rcRowSep.right, rcRowSep.bottom);
}
@@ -2159,7 +2159,7 @@
rcSep.right += SEP_WIDTH_SIZE;
DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_RIGHT);
}
- TRACE("drawing band separator right (%d,%d)-(%d,%d)\n",
+ TRACE("drawing band separator right (%ld,%ld)-(%ld,%ld)\n",
rcSep.left, rcSep.top, rcSep.right, rcSep.bottom);
}
@@ -2186,7 +2186,7 @@
old = SetBkColor (hdc, new);
rect = lpBand->rcBand;
- TRACE("%s background color=0x%06lx, band (%d,%d)-(%d,%d), clip
(%d,%d)-(%d,%d)\n",
+ TRACE("%s background color=0x%06lx, band (%ld,%ld)-(%ld,%ld), clip
+(%ld,%ld)-(%ld,%ld)\n",
(lpBand->clrBack == CLR_NONE) ? "none" :
((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""),
GetBkColor(hdc),
@@ -2340,7 +2340,7 @@
LEADJ(band, Leadjust);
READJ(band, Readjust);
- TRACE("band %d: left=%d, right=%d, move=%d, rtn=%d, rcBand=(%d,%d)-(%d,%d)\n",
+ TRACE("band %d: left=%d, right=%d, move=%d, rtn=%d,
+rcBand=(%ld,%ld)-(%ld,%ld)\n",
i, Leadjust, Readjust, movement, ret,
band->rcBand.left, band->rcBand.top,
band->rcBand.right, band->rcBand.bottom);
@@ -2422,7 +2422,7 @@
infoPtr->ihitoffset);
infoPtr->dragNow = *ptsmove;
- TRACE("before: movement=%d (%d,%d), imindBand=%d, ihitBand=%d, imaxdBand=%d,
LSum=%d, RSum=%d\n",
+ TRACE("before: movement=%d (%ld,%ld), imindBand=%d, ihitBand=%d, imaxdBand=%d,
+LSum=%d, RSum=%d\n",
movement, ptsmove->x, ptsmove->y, imindBand, ihitBand,
imaxdBand, LHeaderSum, RHeaderSum);
REBAR_DumpBand (infoPtr);
@@ -2864,7 +2864,7 @@
lpBand = &infoPtr->bands[iBand];
CopyRect (lprc, &lpBand->rcBand);
- TRACE("band %d, (%d,%d)-(%d,%d)\n", iBand,
+ TRACE("band %d, (%ld,%ld)-(%ld,%ld)\n", iBand,
lprc->left, lprc->top, lprc->right, lprc->bottom);
return TRUE;
@@ -3208,7 +3208,7 @@
movement = lpBand->rcBand.right - lpBand->rcBand.left -
lpBand->cxHeader;
if (movement < 0) {
- ERR("something is wrong, band=(%d,%d)-(%d,%d), cxheader=%d\n",
+ ERR("something is wrong, band=(%ld,%ld)-(%ld,%ld), cxheader=%d\n",
lpBand->rcBand.left, lpBand->rcBand.top,
lpBand->rcBand.right, lpBand->rcBand.bottom,
lpBand->cxHeader);
@@ -3650,7 +3650,7 @@
if (TRACE_ON(rebar)) {
GetWindowRect(infoPtr->hwndSelf, &wnrc1);
GetClientRect(infoPtr->hwndSelf, &clrc1);
- TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n",
+ TRACE("window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) 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);
@@ -3827,7 +3827,7 @@
InflateRect((LPRECT)lParam, -GetSystemMetrics(SM_CXEDGE),
-GetSystemMetrics(SM_CYEDGE));
}
- TRACE("new client=(%d,%d)-(%d,%d)\n",
+ TRACE("new client=(%ld,%ld)-(%ld,%ld)\n",
((LPRECT)lParam)->left, ((LPRECT)lParam)->top,
((LPRECT)lParam)->right, ((LPRECT)lParam)->bottom);
return 0;
@@ -3852,7 +3852,7 @@
if (TRACE_ON(rebar)) {
GetWindowRect(hwnd, &wnrc1);
GetClientRect(hwnd, &clrc1);
- TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n",
+ TRACE("window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) 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);
@@ -3985,7 +3985,7 @@
return 0;
GetWindowRect (infoPtr->hwndSelf, &rcWindow);
OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
- TRACE("rect (%d,%d)-(%d,%d)\n",
+ TRACE("rect (%ld,%ld)-(%ld,%ld)\n",
rcWindow.left, rcWindow.top,
rcWindow.right, rcWindow.bottom);
DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT);
@@ -4026,7 +4026,7 @@
GetClientRect(infoPtr->hwndSelf, &rc);
hdc = wParam==0 ? BeginPaint (infoPtr->hwndSelf, &ps) : (HDC)wParam;
- TRACE("painting (%d,%d)-(%d,%d) client (%d,%d)-(%d,%d)\n",
+ TRACE("painting (%ld,%ld)-(%ld,%ld) client (%ld,%ld)-(%ld,%ld)\n",
ps.rcPaint.left, ps.rcPaint.top,
ps.rcPaint.right, ps.rcPaint.bottom,
rc.left, rc.top, rc.right, rc.bottom);
@@ -4151,14 +4151,14 @@
TRACE("still in CreateWindow\n");
infoPtr->fStatus &= ~CREATE_RUNNING;
GetWindowRect ( infoPtr->hwndSelf, &rcWin);
- TRACE("win rect (%d,%d)-(%d,%d)\n",
+ TRACE("win rect (%ld,%ld)-(%ld,%ld)\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 (%d,%d)\n",
+ TRACE("sizing rebar, message and client zero, parent client (%ld,%ld)\n",
rcClient.right, rcClient.bottom);
}
else {
@@ -4172,7 +4172,7 @@
/* do the actual WM_SIZE request */
GetClientRect (infoPtr->hwndSelf, &rcClient);
- TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n",
+ TRACE("sizing rebar from (%ld,%ld) to (%ld,%ld), client (%ld,%ld)\n",
infoPtr->calcSize.cx, infoPtr->calcSize.cy,
LOWORD(lParam), HIWORD(lParam),
rcClient.right, rcClient.bottom);
@@ -4192,11 +4192,11 @@
/* on a WM_SIZE to zero and current client not zero and AUTOSIZE */
/* native seems to use the current client rect for the size */
infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
- TRACE("sizing rebar to client (%d,%d) size is zero but AUTOSIZE set\n",
+ TRACE("sizing rebar to client (%ld,%ld) size is zero but AUTOSIZE set\n",
rcClient.right, rcClient.bottom);
}
else {
- TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n",
+ TRACE("sizing rebar from (%ld,%ld) to (%ld,%ld), client (%ld,%ld)\n",
infoPtr->calcSize.cx, infoPtr->calcSize.cy,
LOWORD(lParam), HIWORD(lParam),
rcClient.right, rcClient.bottom);
@@ -4210,7 +4210,7 @@
autosize.fChanged = 0; /* ??? */
autosize.rcActual = autosize.rcTarget; /* ??? */
REBAR_Notify((NMHDR *) &autosize, infoPtr, RBN_AUTOSIZE);
- TRACE("RBN_AUTOSIZE client=(%d,%d), lp=%08lx\n",
+ TRACE("RBN_AUTOSIZE client=(%ld,%ld), lp=%08lx\n",
autosize.rcTarget.right, autosize.rcTarget.bottom, lParam);
}
@@ -4251,7 +4251,7 @@
ret = DefWindowProcA(infoPtr->hwndSelf, WM_WINDOWPOSCHANGED,
wParam, lParam);
GetWindowRect(infoPtr->hwndSelf, &rc);
- TRACE("hwnd %p new pos (%d,%d)-(%d,%d)\n",
+ TRACE("hwnd %p new pos (%ld,%ld)-(%ld,%ld)\n",
infoPtr->hwndSelf, rc.left, rc.top, rc.right, rc.bottom);
return ret;
}
diff -aur orig/dlls/comctl32/tab.c after/dlls/comctl32/tab.c
--- orig/dlls/comctl32/tab.c 2002-12-21 21:52:09.000000000 -0800
+++ after/dlls/comctl32/tab.c 2002-12-24 05:11:18.000000000 -0800
@@ -366,7 +366,7 @@
SELECTED_TAB_OFFSET,
0);
}
- TRACE("item %d tab h=%d, rect=(%d,%d)-(%d,%d)\n",
+ TRACE("item %d tab h=%d, rect=(%ld,%ld)-(%ld,%ld)\n",
itemIndex, infoPtr->tabHeight,
itemRect->left, itemRect->top, itemRect->right, itemRect->bottom);
@@ -487,7 +487,7 @@
*/
if (isVisible)
{
- TRACE("invalidate (%d,%d)-(%d,%d)\n",
+ TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n",
selectedRect.left,selectedRect.top,
selectedRect.right,selectedRect.bottom);
InvalidateRect(hwnd, &selectedRect, TRUE);
@@ -1571,7 +1571,7 @@
else
center_offset = ((drawRect->right - drawRect->left) - (cx +
HORIZONTAL_ITEM_PADDING + (rcText.right - rcText.left))) / 2;
- TRACE("for <%s>, c_o=%d, draw=(%d,%d)-(%d,%d), textlen=%d\n",
+ TRACE("for <%s>, c_o=%d, draw=(%ld,%ld)-(%ld,%ld), textlen=%d\n",
debugstr_w(infoPtr->items[iItem].pszText), center_offset,
drawRect->left, drawRect->top, drawRect->right, drawRect->bottom,
(rcText.right-rcText.left));
@@ -1855,7 +1855,7 @@
/* Adjust both rectangles to match native */
r.left += (1-ZZ);
- TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+ TRACE("<left> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
iItem,
fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
r.left,r.top,r.right,r.bottom);
@@ -1899,7 +1899,7 @@
/* Adjust both rectangles to match native */
fillRect.right += (1-ZZ);
- TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+ TRACE("<left> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
iItem,
fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
r.left,r.top,r.right,r.bottom);
@@ -1956,7 +1956,7 @@
r.bottom--;
r.top -= ZZ;
- TRACE("<bottom> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+ TRACE("<bottom> item=%d, fill=(%ld,%ld)-(%ld,%ld),
+edge=(%ld,%ld)-(%ld,%ld)\n",
iItem,
fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
r.left,r.top,r.right,r.bottom);
@@ -2001,7 +2001,7 @@
/* Adjust both rectangles to match native */
fillRect.bottom += (1-ZZ);
- TRACE("<top> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+ TRACE("<top> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
iItem,
fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
r.left,r.top,r.right,r.bottom);
@@ -2096,7 +2096,7 @@
}
}
- TRACE("border=(%d,%d)-(%d,%d)\n",
+ TRACE("border=(%ld,%ld)-(%ld,%ld)\n",
rect.left, rect.top, rect.right, rect.bottom);
DrawEdge(hdc, &rect, EDGE_RAISED, BF_SOFT|BF_RECT);
@@ -2348,7 +2348,7 @@
((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) + 2;
}
- TRACE("invalidate (%d,%d)-(%d,%d)\n",
+ TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n",
clientRect.left,clientRect.top,
clientRect.right,clientRect.bottom);
InvalidateRect(hwnd, &clientRect, TRUE);
@@ -2362,7 +2362,7 @@
hdc = wParam== 0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
- TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n",
+ TRACE("erase %d, rect=(%ld,%ld)-(%ld,%ld)\n",
ps.fErase,
ps.rcPaint.left,ps.rcPaint.top,ps.rcPaint.right,ps.rcPaint.bottom);
diff -aur orig/dlls/comctl32/toolbar.c after/dlls/comctl32/toolbar.c
--- orig/dlls/comctl32/toolbar.c 2002-12-21 21:52:09.000000000 -0800
+++ after/dlls/comctl32/toolbar.c 2002-12-24 05:11:18.000000000 -0800
@@ -231,7 +231,7 @@
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=(%d,%d)-(%d,%d)\n",
+ TRACE("button %d id %d, hot=%s, row=%d, rect=(%ld,%ld)-(%ld,%ld)\n",
btn_num, bP->idCommand,
(bP->bHot) ? "TRUE":"FALSE", bP->nRow,
bP->rect.left, bP->rect.top,
@@ -474,7 +474,7 @@
InflateRect (&myrect, -2, 0);
- TRACE("rect=(%d,%d)-(%d,%d)\n",
+ TRACE("rect=(%ld,%ld)-(%ld,%ld)\n",
myrect.left, myrect.top, myrect.right, myrect.bottom);
newcolor = (infoPtr->clrBtnShadow == CLR_DEFAULT) ?
@@ -530,7 +530,7 @@
/* draw text */
if (lpText) {
- TRACE("string rect=(%d,%d)-(%d,%d)\n",
+ TRACE("string rect=(%ld,%ld)-(%ld,%ld)\n",
rcText->left, rcText->top, rcText->right, rcText->bottom);
hOldFont = SelectObject (hdc, infoPtr->hFont);
@@ -677,7 +677,7 @@
else
rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2;
- TRACE("iBitmap: %d, start=(%d,%d) w=%d, h=%d\n",
+ TRACE("iBitmap: %d, start=(%ld,%ld) w=%d, h=%d\n",
btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,
infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
TRACE ("iString: %x\n", btnPtr->iString);
@@ -4578,7 +4578,7 @@
InvalidateRect(hwnd, 0, 1);
GetWindowRect(hwnd, &rc);
MapWindowPoints(0, hwndParent, (LPPOINT)&rc, 2);
- TRACE("mapped to (%d,%d)-(%d,%d)\n",
+ TRACE("mapped to (%ld,%ld)-(%ld,%ld)\n",
rc.left, rc.top, rc.right, rc.bottom);
lpsize->cx = max(rc.right-rc.left,
infoPtr->rcBound.right - infoPtr->rcBound.left);
@@ -5397,7 +5397,7 @@
hdc = wParam==0 ? BeginPaint(hwnd, &ps) : (HDC)wParam;
- TRACE("psrect=(%d,%d)-(%d,%d)\n",
+ TRACE("psrect=(%ld,%ld)-(%ld,%ld)\n",
ps.rcPaint.left, ps.rcPaint.top,
ps.rcPaint.right, ps.rcPaint.bottom);
diff -aur orig/dlls/comctl32/treeview.c after/dlls/comctl32/treeview.c
--- orig/dlls/comctl32/treeview.c 2002-12-21 21:52:09.000000000 -0800
+++ after/dlls/comctl32/treeview.c 2002-12-24 05:11:18.000000000 -0800
@@ -2554,7 +2554,7 @@
InflateRect(&rcText, -2, -1); /* allow for the focus rect */
- TRACE("drawing text %s at (%d,%d)-(%d,%d)\n",
+ TRACE("drawing text %s at (%ld,%ld)-(%ld,%ld)\n",
debugstr_a(wineItem->pszText),
rcText.left, rcText.top, rcText.right, rcText.bottom);
diff -aur orig/dlls/d3d8/device.c after/dlls/d3d8/device.c
--- orig/dlls/d3d8/device.c 2002-12-23 22:59:37.000000000 -0800
+++ after/dlls/d3d8/device.c 2002-12-24 05:11:18.000000000 -0800
@@ -1048,7 +1048,7 @@
int copyperline = (r->right - r->left) * bytesPerPixel;
int j;
- TRACE("Copying rect %d (%d,%d),(%d,%d) -> (%ld,%ld)\n", i, r->left,
r->top,
+ TRACE("Copying rect %d (%ld,%ld),(%ld,%ld) -> (%ld,%ld)\n", i, r->left,
+r->top,
r->right, r->bottom, p->x, p->y);
/* Find where to start */
diff -aur orig/dlls/oleaut32/olepicture.c after/dlls/oleaut32/olepicture.c
--- orig/dlls/oleaut32/olepicture.c 2002-11-11 11:54:22.000000000 -0800
+++ after/dlls/oleaut32/olepicture.c 2002-12-24 05:11:18.000000000 -0800
@@ -498,7 +498,7 @@
TRACE("(%p)->(%p, (%ld,%ld), (%ld,%ld) <- (%ld,%ld), (%ld,%ld), %p)\n",
This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds);
if(prcWBounds)
- TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top,
+ TRACE("prcWBounds (%ld,%ld) - (%ld,%ld)\n", prcWBounds->left, prcWBounds->top,
prcWBounds->right, prcWBounds->bottom);
/*
diff -aur orig/dlls/user/text.c after/dlls/user/text.c
--- orig/dlls/user/text.c 2002-11-22 13:22:15.000000000 -0800
+++ after/dlls/user/text.c 2002-12-24 05:11:18.000000000 -0800
@@ -846,7 +846,7 @@
int prefix_offset;
ellipsis_data ellip;
- TRACE("%s, %d , [(%d,%d),(%d,%d)]\n", debugstr_wn (str, count), count,
+ TRACE("%s, %d , [(%ld,%ld),(%ld,%ld)]\n", debugstr_wn (str, count), count,
rect->left, rect->top, rect->right, rect->bottom);
if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n",
diff -aur orig/dlls/wineps/escape.c after/dlls/wineps/escape.c
--- orig/dlls/wineps/escape.c 2002-11-14 16:02:13.000000000 -0800
+++ after/dlls/wineps/escape.c 2002-12-24 05:11:18.000000000 -0800
@@ -182,7 +182,7 @@
WARN("cbInput != sizeof(RECT) (=%d) for SET_BOUNDS\n", cbInput);
return 0;
}
- TRACE("SET_BOUNDS (%d,%d) - (%d,%d)\n", r->left, r->top,
+ TRACE("SET_BOUNDS (%ld,%ld) - (%ld,%ld)\n", r->left, r->top,
r->right, r->bottom);
return 0;
}
diff -aur orig/dlls/x11drv/winpos.c after/dlls/x11drv/winpos.c
--- orig/dlls/x11drv/winpos.c 2002-12-21 21:52:19.000000000 -0800
+++ after/dlls/x11drv/winpos.c 2002-12-24 05:11:18.000000000 -0800
@@ -1589,7 +1589,7 @@
GetWindowRect( hwnd, &rect );
if (rect.left == winpos.x && rect.top == winpos.y) winpos.flags |= SWP_NOMOVE;
else
- TRACE( "%p moving from (%d,%d) to (%d,%d)\n",
+ TRACE( "%p moving from (%ld,%ld) to (%d,%d)\n",
hwnd, rect.left, rect.top, winpos.x, winpos.y );
if ((rect.right - rect.left == winpos.cx && rect.bottom - rect.top == winpos.cy)
||
diff -aur orig/windows/nonclient.c after/windows/nonclient.c
--- orig/windows/nonclient.c 2002-12-21 21:52:39.000000000 -0800
+++ after/windows/nonclient.c 2002-12-24 05:11:18.000000000 -0800
@@ -424,7 +424,7 @@
WS_EX_STATICEDGE | WS_EX_TOOLWINDOW);
if (exStyle & WS_EX_DLGMODALFRAME) style &= ~WS_THICKFRAME;
- TRACE("(%d,%d)-(%d,%d) %08lx %d %08lx\n",
+ TRACE("(%ld,%ld)-(%ld,%ld) %08lx %d %08lx\n",
rect->left, rect->top, rect->right, rect->bottom,
style, menu, exStyle );
diff -aur orig/windows/spy.c after/windows/spy.c
--- orig/windows/spy.c 2002-12-21 21:52:39.000000000 -0800
+++ after/windows/spy.c 2002-12-24 05:11:18.000000000 -0800
@@ -2106,7 +2106,7 @@
{
LPRECT rc = (LPRECT) sp_e->lParam;
if (rc) {
- TRACE("lParam rect (%d,%d)-(%d,%d)\n",
+ TRACE("lParam rect (%ld,%ld)-(%ld,%ld)\n",
rc->left, rc->top, rc->right, rc->bottom);
}
break;
@@ -2149,7 +2149,7 @@
lpdis->CtlType, lpdis->CtlID);
TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n",
lpdis->itemID, lpdis->itemAction, lpdis->itemState);
- TRACE("hWnd=%p hDC=%p (%d,%d)-(%d,%d) itemData=0x%08lx\n",
+ TRACE("hWnd=%p hDC=%p (%ld,%ld)-(%ld,%ld) itemData=0x%08lx\n",
lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left,
lpdis->rcItem.top, lpdis->rcItem.right,
lpdis->rcItem.bottom, lpdis->itemData);
@@ -2187,7 +2187,7 @@
case WM_NCCALCSIZE:
{
RECT *rc = (RECT *)sp_e->lParam;
- TRACE("Rect (%d,%d)-(%d,%d)\n",
+ TRACE("Rect (%ld,%ld)-(%ld,%ld)\n",
rc->left, rc->top, rc->right, rc->bottom);
}
break;
diff -aur orig/windows/win.c after/windows/win.c
--- orig/windows/win.c 2002-12-21 21:52:40.000000000 -0800
+++ after/windows/win.c 2002-12-24 05:11:18.000000000 -0800
@@ -576,7 +576,7 @@
win->rectWindow = *rectWindow;
win->rectClient = *rectClient;
- TRACE( "win %p window (%d,%d)-(%d,%d) client (%d,%d)-(%d,%d)\n", hwnd,
+ TRACE( "win %p window (%ld,%ld)-(%ld,%ld) client (%ld,%ld)-(%ld,%ld)\n", hwnd,
rectWindow->left, rectWindow->top, rectWindow->right,
rectWindow->bottom,
rectClient->left, rectClient->top, rectClient->right,
rectClient->bottom );
}
diff -aur orig/windows/winpos.c after/windows/winpos.c
--- orig/windows/winpos.c 2002-12-21 21:52:40.000000000 -0800
+++ after/windows/winpos.c 2002-12-24 05:11:18.000000000 -0800
@@ -158,7 +158,7 @@
if (ret)
{
MapWindowPoints( GetAncestor( hwnd, GA_PARENT ), 0, (POINT *)rect, 2 );
- TRACE( "hwnd %p (%d,%d)-(%d,%d)\n",
+ TRACE( "hwnd %p (%ld,%ld)-(%ld,%ld)\n",
hwnd, rect->left, rect->top, rect->right, rect->bottom);
}
return ret;
