November 2015 - Wine-Commits

Nikolay Sivov : sc: Fix service handle leak on error path (Coverity).
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: 0a3e54480a509d5d323a31440af67a63a990d80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3e54480a509d5d323a31440… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 22 17:48:04 2015 +0300 sc: Fix service handle leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 2cfe91c..0bf5d06 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -285,15 +285,14 @@ int wmain( int argc, const WCHAR *argv[] ) if (service) { SERVICE_FAILURE_ACTIONSW sfa; - if (!parse_failure_params( argc - 3, argv + 3, &sfa )) + if (parse_failure_params( argc - 3, argv + 3, &sfa )) { - WINE_WARN("failed to parse failure parameters\n"); - CloseServiceHandle( manager ); - return 1; + ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); + if (!ret) WINE_TRACE("failed to set service failure actions %u\n", GetLastError()); + HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } - ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); - if (!ret) WINE_TRACE("failed to set service failure actions %u\n", GetLastError()); - HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); + else + WINE_WARN("failed to parse failure parameters\n"); CloseServiceHandle( service ); } else WINE_TRACE("failed to open service %u\n", GetLastError());

1 0

Thomas Faber : quartz: Fix IEnumMoniker reference leak in FilterGraph2_Connect.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: b700634b0c20d40aa993416e16fdd0c4b820e271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b700634b0c20d40aa993416e1… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 20 15:38:35 2015 +0100 quartz: Fix IEnumMoniker reference leak in FilterGraph2_Connect. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0b25259..495f4be 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1169,6 +1169,8 @@ error: CoTaskMemFree(ppins); } + IEnumMoniker_Release(pEnumMoniker); + out: if (penummt) IEnumMediaTypes_Release(penummt);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.8-rc1
by Jeremy Newman Nov. 23, 2015

Nov. 23, 2015

Module: website Branch: master Commit: a3917574bb6bdf4fec4822dbfde9fd1a9c348e96 URL: http://source.winehq.org/git/website.git/?a=commit;h=a3917574bb6bdf4fec4822… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 21 06:59:58 2015 +0100 Polish translation for release 1.8-rc1 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2015112001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/pl/2015112001.xml b/news/pl/2015112001.xml new file mode 100644 index 0000000..6613e98 --- /dev/null +++ b/news/pl/2015112001.xml @@ -0,0 +1,13 @@ +<news> +<date>Listopad 20, 2015</date> +<title>Wydano Wine 1.8-rc1</title> +<body> + Wydanie rozwojowe Wine 1.8-rc1 jest już dostępne. + Jest to pierwsze wydanie kandydujące do nadchodzącego Wine 1.8. Prosimy dobrze je przetestować, aby pomóc nam uczynić wydanie 1.8 tak dobrym, jak to tylko możliwe. + <a href="{$root}/announce/1.8-rc1">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc1.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Julian Rüger : German translation for release 1.8-rc1
by Jeremy Newman Nov. 23, 2015

Nov. 23, 2015

Module: website Branch: master Commit: 13ded8689f27bbd8321c04afd093d34395fca390 URL: http://source.winehq.org/git/website.git/?a=commit;h=13ded8689f27bbd8321c04… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 23 17:15:13 2015 +0100 German translation for release 1.8-rc1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015112001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2015112001.xml b/news/de/2015112001.xml new file mode 100644 index 0000000..04a79cd --- /dev/null +++ b/news/de/2015112001.xml @@ -0,0 +1,13 @@ +<news> +<date>20. November 2015</date> +<title>Wine 1.8-rc1 freigegeben</title> +<body> + Die Entwicklungsversion 1.8-rc1 von Wine ist jetzt verfügbar. + Dies ist der erste Release Candidate der bevorstehenden stabilen Version Wine 1.8. Bitte helfen Sie uns, dieses Release ausführlich zu testen, um 1.8 so gut wie möglich zu machen. + <a href="{$root}/announce/1.8-rc1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc1.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Bruno Jesus : comctl32: Respect an assert in TREEVIEW_RemoveAllChildren.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 2f5c0b93219058b5e1610475b04be8dddc6acd89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5c0b93219058b5e1610475b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 23 21:47:56 2015 +0800 comctl32: Respect an assert in TREEVIEW_RemoveAllChildren. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 6adafc4..dc19655 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1441,11 +1441,13 @@ TREEVIEW_RemoveAllChildren(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *parentIt static void TREEVIEW_UnlinkItem(const TREEVIEW_ITEM *item) { - TREEVIEW_ITEM *parentItem = item->parent; + TREEVIEW_ITEM *parentItem; assert(item != NULL); assert(item->parent != NULL); /* i.e. it must not be the root */ + parentItem = item->parent; + if (parentItem->firstChild == item) parentItem->firstChild = item->nextSibling;

1 0

Alexandre Julliard : kernel32/tests: Avoid testing the D: drive which may not exist.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 9ae90b354c61c82819cd64177ab62c267e8d6b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae90b354c61c82819cd64177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 00:23:12 2015 +0900 kernel32/tests: Avoid testing the D: drive which may not exist. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 44794f1..91eb162 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -664,9 +664,9 @@ static void test_GetVolumePathNameA(void) "\\\\ReallyBogus\\InvalidDrive:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_INVALID_NAME, NO_ERROR }, - { /* test 15: poor quality input, valid output, valid output length, different drive */ - "D::", "D:\\", sizeof(volume_path), - NO_ERROR, NO_ERROR + { /* test 15: poor quality input, valid output, valid (but short) output length */ + "C::", "C:\\", 4, + NO_ERROR, ERROR_MORE_DATA }, { /* test 16: unused drive letter */ "M::", "C:\\", 4,

1 0

Francois Gouget : d2d1: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: d08a1da22ad41a62bb902858e51ee2dc7e54b60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08a1da22ad41a62bb902858e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 22 19:34:25 2015 +0100 d2d1: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 4dd94cb..21c3125 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -672,7 +672,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGeometry(ID2D1RenderTarg iface, geometry, brush, stroke_width, stroke_style); } -static void STDMETHODCALLTYPE d2d_rt_fill_geometry(struct d2d_d3d_render_target *render_target, +static void d2d_rt_fill_geometry(struct d2d_d3d_render_target *render_target, const struct d2d_geometry *geometry, struct d2d_brush *brush, struct d2d_brush *opacity_brush) { ID3D10Buffer *ib, *vb, *vs_cb, *ps_cb;

1 0

Bruno Jesus : ws2_32: Add a couple of options to sockopt debug.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 958ed34f16cb1b669744865972c1e9ead025399f URL: http://source.winehq.org/git/wine.git/?a=commit;h=958ed34f16cb1b66974486597… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 23 20:15:33 2015 +0800 ws2_32: Add a couple of options to sockopt debug. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 +++- include/winsock.h | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9e8510d..d31f0b4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -373,6 +373,7 @@ static inline const char *debugstr_sockopt(int level, int optname) DEBUG_SOCKOPT(WS_SO_SNDBUF); DEBUG_SOCKOPT(WS_SO_SNDTIMEO); DEBUG_SOCKOPT(WS_SO_TYPE); + DEBUG_SOCKOPT(WS_SO_UPDATE_CONNECT_CONTEXT); } break; @@ -409,6 +410,7 @@ static inline const char *debugstr_sockopt(int level, int optname) switch(optname) { DEBUG_SOCKOPT(WS_IP_ADD_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IP_DONTFRAGMENT); DEBUG_SOCKOPT(WS_IP_DROP_MEMBERSHIP); DEBUG_SOCKOPT(WS_IP_HDRINCL); DEBUG_SOCKOPT(WS_IP_MULTICAST_IF); @@ -416,10 +418,10 @@ static inline const char *debugstr_sockopt(int level, int optname) DEBUG_SOCKOPT(WS_IP_MULTICAST_TTL); DEBUG_SOCKOPT(WS_IP_OPTIONS); DEBUG_SOCKOPT(WS_IP_PKTINFO); + DEBUG_SOCKOPT(WS_IP_RECEIVE_BROADCAST); DEBUG_SOCKOPT(WS_IP_TOS); DEBUG_SOCKOPT(WS_IP_TTL); DEBUG_SOCKOPT(WS_IP_UNICAST_IF); - DEBUG_SOCKOPT(WS_IP_DONTFRAGMENT); } break; diff --git a/include/winsock.h b/include/winsock.h index 50237e8..cf9adf5 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -730,16 +730,18 @@ typedef struct WS(WSAData) # define IP_TTL 7 # define IP_TOS 8 # define IP_DONTFRAGMENT 9 +# define IP_RECEIVE_BROADCAST 22 # else -# define WS_IP_OPTIONS 1 -# define WS_IP_MULTICAST_IF 2 -# define WS_IP_MULTICAST_TTL 3 -# define WS_IP_MULTICAST_LOOP 4 -# define WS_IP_ADD_MEMBERSHIP 5 -# define WS_IP_DROP_MEMBERSHIP 6 -# define WS_IP_TTL 7 -# define WS_IP_TOS 8 -# define WS_IP_DONTFRAGMENT 9 +# define WS_IP_OPTIONS 1 +# define WS_IP_MULTICAST_IF 2 +# define WS_IP_MULTICAST_TTL 3 +# define WS_IP_MULTICAST_LOOP 4 +# define WS_IP_ADD_MEMBERSHIP 5 +# define WS_IP_DROP_MEMBERSHIP 6 +# define WS_IP_TTL 7 +# define WS_IP_TOS 8 +# define WS_IP_DONTFRAGMENT 9 +# define WS_IP_RECEIVE_BROADCAST 22 # endif #endif

1 0

Nikolay Sivov : comctl32: Item with negative cChildren acts as if it actually had children.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 1d19eb15d4abfdd14dccc5ac05b83c0ee1a1ace1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d19eb15d4abfdd14dccc5ac0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 00:25:11 2015 +0300 comctl32: Item with negative cChildren acts as if it actually had children. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 22 +++++++++++++++++++++- dlls/comctl32/treeview.c | 5 +++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 917df23..92504c1 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1193,7 +1193,9 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, case TVN_ENDLABELEDITA: return TRUE; case TVN_ITEMEXPANDINGA: - ok(pTreeView->itemNew.mask == + { + UINT newmask = pTreeView->itemNew.mask & ~TVIF_CHILDREN; + ok(newmask == (TVIF_HANDLE | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_PARAM | TVIF_STATE), "got wrong mask %x\n", pTreeView->itemNew.mask); ok(pTreeView->itemOld.mask == 0, @@ -1207,6 +1209,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ok(ret == TRUE, "got %lu\n", ret); } break; + } case TVN_ITEMEXPANDEDA: ok(pTreeView->itemNew.mask & TVIF_STATE, "got wrong mask %x\n", pTreeView->itemNew.mask); ok(pTreeView->itemNew.state & (TVIS_EXPANDED|TVIS_EXPANDEDONCE), @@ -1529,6 +1532,7 @@ static void test_get_insertmarkcolor(void) static void test_expandnotify(void) { + HTREEITEM hitem; HWND hTree; BOOL ret; TVITEMA item; @@ -1679,6 +1683,22 @@ static void test_expandnotify(void) expect(FALSE, ret); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_empty_kb_seq, "expand node with no children", FALSE); + /* stay on current selection and set non-zero children count */ + hitem = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CARET, 0); + ok(hitem != NULL, "got %p\n", hitem); + + item.hItem = hitem; + item.mask = TVIF_CHILDREN; + item.cChildren = 0x80000000; + + ret = SendMessageA(hTree, TVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_collapse_2nd_kb_seq, "expand node with children", FALSE); + DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ffb5981..695745c 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -816,8 +816,9 @@ static BOOL TREEVIEW_HasChildren(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) { TREEVIEW_UpdateDispInfo(infoPtr, item, TVIF_CHILDREN); - - return item->cChildren > 0; + /* Protect for a case when callback field is not changed by a host, + otherwise negative values trigger normal notifications. */ + return item->cChildren != 0 && item->cChildren != I_CHILDRENCALLBACK; } static INT TREEVIEW_NotifyFormat (TREEVIEW_INFO *infoPtr, HWND hwndFrom, UINT nCommand)

1 0

Nikolay Sivov : comctl32/treeview: Use consistent format for hex values in traces.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 8d0f060f3b85d500a449ae4516360649c5cc9b23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0f060f3b85d500a449ae451… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 00:25:10 2015 +0300 comctl32/treeview: Use consistent format for hex values in traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 dc19655..ffb5981 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; @@ -1985,7 +1985,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; @@ -2157,7 +2157,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; @@ -2173,7 +2173,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)) @@ -2268,7 +2268,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; } @@ -2298,11 +2298,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; } @@ -2324,7 +2324,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) @@ -2332,7 +2332,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); } } @@ -3699,7 +3699,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; } @@ -3776,7 +3776,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)) { @@ -4399,7 +4399,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); @@ -5010,7 +5010,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));

1 0