[PATCH 1/2] comctl32/treeview: Use consistent format for hex values in traces
Nikolay Sivov
nsivov at codeweavers.com
Sun Nov 22 15:25:10 CST 2015
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/comctl32/treeview.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 6adafc4..b45153e 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -558,7 +558,7 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action
NMTREEVIEWW nmhdr;
BOOL ret;
- TRACE("code:%d action:%x olditem:%p newitem:%p\n",
+ TRACE("code:%d action:0x%x olditem:%p newitem:%p\n",
code, action, oldItem, newItem);
memset(&nmhdr, 0, sizeof(NMTREEVIEWW));
@@ -610,7 +610,7 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage,
NMTVCUSTOMDRAW nmcdhdr;
NMCUSTOMDRAW *nmcd;
- TRACE("drawstage:%x hdc:%p\n", dwDrawStage, hdc);
+ TRACE("drawstage:0x%x hdc:%p\n", dwDrawStage, hdc);
nmcd = &nmcdhdr.nmcd;
nmcd->dwDrawStage = dwDrawStage;
@@ -657,7 +657,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc,
nmcd->lItemlParam = item->lParam;
nmcdhdr->iLevel = item->iLevel;
- TRACE("drawstage:%x hdc:%p item:%lx, itemstate:%x, lItemlParam:%lx\n",
+ TRACE("drawstage:0x%x hdc:%p item:%lx, itemstate:0x%x, lItemlParam:0x%lx\n",
nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec,
nmcd->uItemState, nmcd->lItemlParam);
@@ -1192,7 +1192,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
if (tvItem->mask & TVIF_STATE)
{
- TRACE("prevstate,state,mask:%x,%x,%x\n", item->state, tvItem->state,
+ TRACE("prevstate 0x%x, state 0x%x, mask 0x%x\n", item->state, tvItem->state,
tvItem->stateMask);
item->state &= ~tvItem->stateMask;
item->state |= (tvItem->state & tvItem->stateMask);
@@ -1200,7 +1200,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
if (tvItem->mask & TVIF_STATEEX)
{
- FIXME("New extended state: %x\n", tvItem->uStateEx);
+ FIXME("New extended state: 0x%x\n", tvItem->uStateEx);
}
item->callbackMask |= callbackSet;
@@ -1358,7 +1358,7 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL i
}
- TRACE("new item %p; parent %p, mask %x\n", newItem,
+ TRACE("new item %p; parent %p, mask 0x%x\n", newItem,
newItem->parent, tvItem->mask);
newItem->iLevel = newItem->parent->iLevel + 1;
@@ -1983,7 +1983,7 @@ TREEVIEW_SetInsertMarkColor(TREEVIEW_INFO *infoPtr, COLORREF color)
{
COLORREF prevColor = infoPtr->clrInsertMark;
- TRACE("%x\n", color);
+ TRACE("0x%08x\n", color);
infoPtr->clrInsertMark = color;
return (LRESULT)prevColor;
@@ -2155,7 +2155,7 @@ TREEVIEW_GetItemT(const TREEVIEW_INFO *infoPtr, LPTVITEMEXW tvItem, BOOL isW)
tvItem->uStateEx = 0;
}
- TRACE("item <%p>, txt %p, img %d, mask %x\n",
+ TRACE("item <%p>, txt %p, img %d, mask 0x%x\n",
item, tvItem->pszText, tvItem->iImage, tvItem->mask);
return TRUE;
@@ -2171,7 +2171,7 @@ TREEVIEW_SetItemT(TREEVIEW_INFO *infoPtr, const TVITEMEXW *tvItem, BOOL isW)
item = tvItem->hItem;
- TRACE("item %d,mask %x\n", TREEVIEW_GetItemIndex(infoPtr, item),
+ TRACE("item %d, mask 0x%x\n", TREEVIEW_GetItemIndex(infoPtr, item),
tvItem->mask);
if (!TREEVIEW_ValidItem(infoPtr, item))
@@ -2266,7 +2266,7 @@ TREEVIEW_GetNextItem(const TREEVIEW_INFO *infoPtr, UINT which, HTREEITEM item)
if (retval)
{
- TRACE("flags:%x, returns %p\n", which, retval);
+ TRACE("flags:0x%x, returns %p\n", which, retval);
return (LRESULT)retval;
}
@@ -2296,11 +2296,11 @@ TREEVIEW_GetNextItem(const TREEVIEW_INFO *infoPtr, UINT which, HTREEITEM item)
retval = TREEVIEW_GetPrevListItem(infoPtr, item);
break;
default:
- TRACE("Unknown msg %x,item %p\n", which, item);
+ TRACE("Unknown msg 0x%x, item %p\n", which, item);
break;
}
- TRACE("flags:%x, item %p;returns %p\n", which, item, retval);
+ TRACE("flags: 0x%x, item %p;returns %p\n", which, item, retval);
return (LRESULT)retval;
}
@@ -2322,7 +2322,7 @@ TREEVIEW_ToggleItemState(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item)
unsigned int state;
state = STATEIMAGEINDEX(item->state);
- TRACE("state:%x\n", state);
+ TRACE("state: 0x%x\n", state);
item->state &= ~TVIS_STATEIMAGEMASK;
if (state < 3)
@@ -2330,7 +2330,7 @@ TREEVIEW_ToggleItemState(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item)
item->state |= INDEXTOSTATEIMAGEMASK(state);
- TRACE("state:%x\n", state);
+ TRACE("state: 0x%x\n", state);
TREEVIEW_Invalidate(infoPtr, item);
}
}
@@ -3697,7 +3697,7 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht)
}
lpht->hItem = item;
- TRACE("(%d,%d):result %x\n", lpht->pt.x, lpht->pt.y, lpht->flags);
+ TRACE("(%d,%d):result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags);
return (LRESULT)item;
}
@@ -3774,7 +3774,7 @@ TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
static LRESULT
TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- TRACE("code=%x, id=%x, handle=%lx\n", HIWORD(wParam), LOWORD(wParam), lParam);
+ TRACE("code=0x%x, id=0x%x, handle=0x%lx\n", HIWORD(wParam), LOWORD(wParam), lParam);
switch (HIWORD(wParam))
{
@@ -4397,7 +4397,7 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *infoPtr, INT action, HTREEITEM newSelect,
assert(newSelect == NULL || TREEVIEW_ValidItem(infoPtr, newSelect));
- TRACE("Entering item %p (%s), flag %x, cause %x, state %d\n",
+ TRACE("Entering item %p (%s), flag 0x%x, cause 0x%x, state %d\n",
newSelect, TREEVIEW_ItemName(newSelect), action, cause,
newSelect ? newSelect->state : 0);
@@ -5008,7 +5008,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
TREEVIEW_INFO *infoPtr;
LOGFONTW lf;
- TRACE("wnd %p, style %x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE));
+ TRACE("wnd %p, style 0x%x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE));
infoPtr = Alloc(sizeof(TREEVIEW_INFO));
--
2.6.2
More information about the wine-patches
mailing list