ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/treeview: Use consistent format for hex values in traces. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2015-11-23 00:25:10 +03:00 committed by Alexandre Julliard
parent 2f5c0b9321
commit 8d0f060f3b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/comctl32/treeview.c
View File

@ -558,7 +558,7 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action
NMTREEVIEWW nmhdr; NMTREEVIEWW nmhdr;
BOOL ret; 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); code, action, oldItem, newItem);
memset(&nmhdr, 0, sizeof(NMTREEVIEWW)); memset(&nmhdr, 0, sizeof(NMTREEVIEWW));
@ -610,7 +610,7 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage,
NMTVCUSTOMDRAW nmcdhdr; NMTVCUSTOMDRAW nmcdhdr;
NMCUSTOMDRAW *nmcd; NMCUSTOMDRAW *nmcd;
TRACE("drawstage:%x hdc:%p\n", dwDrawStage, hdc); TRACE("drawstage:0x%x hdc:%p\n", dwDrawStage, hdc);
nmcd = &nmcdhdr.nmcd; nmcd = &nmcdhdr.nmcd;
nmcd->dwDrawStage = dwDrawStage; nmcd->dwDrawStage = dwDrawStage;
@ -657,7 +657,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc,
nmcd->lItemlParam = item->lParam; nmcd->lItemlParam = item->lParam;
nmcdhdr->iLevel = item->iLevel; nmcdhdr->iLevel = item->iLevel;
TRACE("drawstage:%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->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec,
nmcd->uItemState, nmcd->lItemlParam); nmcd->uItemState, nmcd->lItemlParam);
@ -1192,7 +1192,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
if (tvItem->mask & TVIF_STATE) 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); tvItem->stateMask);
item->state &= ~tvItem->stateMask; item->state &= ~tvItem->stateMask;
item->state |= (tvItem->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) 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; 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->parent, tvItem->mask);
newItem->iLevel = newItem->parent->iLevel + 1; newItem->iLevel = newItem->parent->iLevel + 1;
@ -1985,7 +1985,7 @@ TREEVIEW_SetInsertMarkColor(TREEVIEW_INFO *infoPtr, COLORREF color)
{ {
COLORREF prevColor = infoPtr->clrInsertMark; COLORREF prevColor = infoPtr->clrInsertMark;
TRACE("%x\n", color); TRACE("0x%08x\n", color);
infoPtr->clrInsertMark = color; infoPtr->clrInsertMark = color;
return (LRESULT)prevColor; return (LRESULT)prevColor;
@ -2157,7 +2157,7 @@ TREEVIEW_GetItemT(const TREEVIEW_INFO *infoPtr, LPTVITEMEXW tvItem, BOOL isW)
tvItem->uStateEx = 0; 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); item, tvItem->pszText, tvItem->iImage, tvItem->mask);
return TRUE; return TRUE;
@ -2173,7 +2173,7 @@ TREEVIEW_SetItemT(TREEVIEW_INFO *infoPtr, const TVITEMEXW *tvItem, BOOL isW)
item = tvItem->hItem; 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); tvItem->mask);
if (!TREEVIEW_ValidItem(infoPtr, item)) if (!TREEVIEW_ValidItem(infoPtr, item))
@ -2268,7 +2268,7 @@ TREEVIEW_GetNextItem(const TREEVIEW_INFO *infoPtr, UINT which, HTREEITEM item)
if (retval) if (retval)
{ {
TRACE("flags:%x, returns %p\n", which, retval); TRACE("flags:0x%x, returns %p\n", which, retval);
return (LRESULT)retval; return (LRESULT)retval;
} }
@ -2298,11 +2298,11 @@ TREEVIEW_GetNextItem(const TREEVIEW_INFO *infoPtr, UINT which, HTREEITEM item)
retval = TREEVIEW_GetPrevListItem(infoPtr, item); retval = TREEVIEW_GetPrevListItem(infoPtr, item);
break; break;
default: default:
TRACE("Unknown msg %x,item %p\n", which, item); TRACE("Unknown msg 0x%x, item %p\n", which, item);
break; 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; return (LRESULT)retval;
} }
@ -2324,7 +2324,7 @@ TREEVIEW_ToggleItemState(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item)
unsigned int state; unsigned int state;
state = STATEIMAGEINDEX(item->state); state = STATEIMAGEINDEX(item->state);
TRACE("state:%x\n", state); TRACE("state: 0x%x\n", state);
item->state &= ~TVIS_STATEIMAGEMASK; item->state &= ~TVIS_STATEIMAGEMASK;
if (state < 3) if (state < 3)
@ -2332,7 +2332,7 @@ TREEVIEW_ToggleItemState(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item)
item->state |= INDEXTOSTATEIMAGEMASK(state); item->state |= INDEXTOSTATEIMAGEMASK(state);
TRACE("state:%x\n", state); TRACE("state: 0x%x\n", state);
TREEVIEW_Invalidate(infoPtr, item); TREEVIEW_Invalidate(infoPtr, item);
} }
} }
@ -3699,7 +3699,7 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht)
} }
lpht->hItem = item; 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; return (LRESULT)item;
} }
@ -3776,7 +3776,7 @@ TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
static LRESULT static LRESULT
TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{ {
TRACE("code=%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)) switch (HIWORD(wParam))
{ {
@ -4399,7 +4399,7 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *infoPtr, INT action, HTREEITEM newSelect,
assert(newSelect == NULL || TREEVIEW_ValidItem(infoPtr, 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, TREEVIEW_ItemName(newSelect), action, cause,
newSelect ? newSelect->state : 0); newSelect ? newSelect->state : 0);
@ -5010,7 +5010,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
TREEVIEW_INFO *infoPtr; TREEVIEW_INFO *infoPtr;
LOGFONTW lf; 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)); infoPtr = Alloc(sizeof(TREEVIEW_INFO));