Change RECT to use LONG to match win32 standard headers and fix format
strings to use %ld for RECT elements.
diff --git a/controls/combo.c b/controls/combo.c
index cacf44c..223a1cf 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -420,13 +420,13 @@
lprLB->right = lprLB->left + lphc->droppedWidth;
}
- TRACE("\ttext\t= (%i,%i-%i,%i)\n",
+ TRACE("\ttext\t= (%ld,%ld-%ld,%ld)\n",
lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom);
- TRACE("\tbutton\t= (%i,%i-%i,%i)\n",
+ TRACE("\tbutton\t= (%ld,%ld-%ld,%ld)\n",
lprButton->left, lprButton->top, lprButton->right, lprButton->bottom);
- TRACE("\tlbox\t= (%i,%i-%i,%i)\n",
+ TRACE("\tlbox\t= (%ld,%ld-%ld,%ld)\n",
lprLB->left, lprLB->top, lprLB->right, lprLB->bottom );
}
@@ -477,7 +477,7 @@
*/
if (posChanging->cy != newComboHeight)
{
- TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n",
+ TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%ld, oldtop=%ld\n",
posChanging->cy, newComboHeight, lphc->droppedRect.bottom,
lphc->droppedRect.top);
lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight;
diff --git a/controls/listbox.c b/controls/listbox.c
index d2d931f..1b625b5 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -589,7 +589,7 @@
if (!IsWindowEnabled(hwnd)) dis.itemState |= ODS_DISABLED;
dis.itemData = item ? item->data : 0;
dis.rcItem = *rect;
- TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%d,%d-%d,%d\n",
+ TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%ld,%ld-%ld,%ld\n",
hwnd, index, item ? debugstr_w(item->str) : "", action,
dis.itemState, rect->left, rect->top, rect->right, rect->bottom );
SendMessageW(descr->owner, WM_DRAWITEM, id, (LPARAM)&dis);
@@ -609,7 +609,7 @@
oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
}
- TRACE("[%p]: painting %d (%s) action=%02x rect=%d,%d-%d,%d\n",
+ TRACE("[%p]: painting %d (%s) action=%02x rect=%ld,%ld-%ld,%ld\n",
hwnd, index, item ? debugstr_w(item->str) : "", action,
rect->left, rect->top, rect->right, rect->bottom );
if (!item)
diff --git a/controls/menu.c b/controls/menu.c
index 8be53a1..f90ed2c 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -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);
}
@@ -1058,8 +1058,8 @@
if ((lprect == NULL) || (lppop == NULL)) return;
if (lppop->nItems == 0) return;
- TRACE("left=%d top=%d right=%d bottom=%d\n",
- lprect->left, lprect->top, lprect->right, lprect->bottom);
+ TRACE("left=%ld top=%ld right=%ld bottom=%ld\n",
+ lprect->left, lprect->top, lprect->right, lprect->bottom);
lppop->Width = lprect->right - lprect->left;
lppop->Height = 0;
maxY = lprect->top+1;
@@ -1169,7 +1169,7 @@
dis.hDC = hdc;
dis.rcItem = lpitem->rect;
TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, "
- "hwndItem=%p, hdc=%p, rcItem={%d,%d,%d,%d}\n", hwndOwner,
+ "hwndItem=%p, hdc=%p, rcItem={%ld,%ld,%ld,%ld}\n", hwndOwner,
dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem,
dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right,
dis.rcItem.bottom);
@@ -1177,7 +1177,7 @@
/* Fall through to draw popup-menu arrow */
}
- TRACE("rect={%d,%d,%d,%d}\n", lpitem->rect.left, lpitem->rect.top,
+ TRACE("rect={%ld,%ld,%ld,%ld}\n", lpitem->rect.left, lpitem->rect.top,
lpitem->rect.right,lpitem->rect.bottom);
if (menuBar && (lpitem->fType & MF_SEPARATOR)) return;
@@ -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 --git a/controls/uitools.c b/controls/uitools.c
index abc0640..2592125 100644
--- a/controls/uitools.c
+++ b/controls/uitools.c
@@ -580,7 +580,7 @@
*/
BOOL WINAPI DrawEdge( HDC hdc, LPRECT rc, UINT edge, UINT flags )
{
- TRACE("%p %d,%d-%d,%d %04x %04x\n",
+ TRACE("%p %ld,%ld-%ld,%ld %04x %04x\n",
hdc, rc->left, rc->top, rc->right, rc->bottom, edge, flags );
if(flags & BF_DIAGONAL)
