wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Michael Müller : msvcp90: Basic_string_wchar_dtor should set EAX to 0 on i386.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 27b5c93609ee3dad24d4fa7aeaaf1d4ba2d2ae4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b5c93609ee3dad24d4fa7ae… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Nov 24 05:17:12 2015 +0100 msvcp90: Basic_string_wchar_dtor should set EAX to 0 on i386. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp90.h | 4 ++-- dlls/msvcp90/string.c | 6 ++++-- dlls/msvcp90/tests/string.c | 25 +++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index e098c3d..2d0f4f8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -94,7 +94,7 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char*); basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t); basic_string_char* __thiscall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); -void __thiscall MSVCP_basic_string_char_dtor(basic_string_char*); +void* __thiscall MSVCP_basic_string_char_dtor(basic_string_char*); const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char*); void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); @@ -123,7 +123,7 @@ typedef struct basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t); -void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar*); +void* __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar*); const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar*); void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch(basic_string_wchar*, wchar_t); diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 21c2c4f..9f0d7fe 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -973,10 +973,11 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor_ptr_ptr(basic_string_ /* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ */ /* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4) -void __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) +void* __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) { TRACE("%p\n", this); basic_string_char_tidy(this, TRUE, 0); + return NULL; /* FEAR 1 installer expects EAX set to 0 */ } /* ?size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ */ @@ -2785,10 +2786,11 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_ptr_ptr(basic_strin /* ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@XZ */ /* ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_dtor, 4) -void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar *this) +void* __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar *this) { TRACE("%p\n", this); basic_string_wchar_tidy(this, TRUE, 0); + return NULL; /* FEAR 1 installer expects EAX set to 0 */ } /* ?size@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIXZ */ diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index f1aa92a..5f8fcd2 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -63,7 +63,7 @@ static basic_string_char* (__cdecl *p_basic_string_char_concatenate_cstr)(basic_ static basic_string_char* (__thiscall *p_basic_string_char_ctor)(basic_string_char*); static basic_string_char* (__thiscall *p_basic_string_char_copy_ctor)(basic_string_char*, basic_string_char*); static basic_string_char* (__thiscall *p_basic_string_char_ctor_cstr)(basic_string_char*, const char*); -static void (__thiscall *p_basic_string_char_dtor)(basic_string_char*); +static void* (__thiscall *p_basic_string_char_dtor)(basic_string_char*); static basic_string_char* (__thiscall *p_basic_string_char_erase)(basic_string_char*, size_t, size_t); static basic_string_char* (__thiscall *p_basic_string_char_assign_cstr_len)(basic_string_char*, const char*, size_t); static const char* (__thiscall *p_basic_string_char_cstr)(basic_string_char*); @@ -85,7 +85,7 @@ static size_t *p_basic_string_char_npos; static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor)(basic_string_wchar*); static basic_string_wchar* (__thiscall *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor_cstr)(basic_string_wchar*, const wchar_t*); -static void (__thiscall *p_basic_string_wchar_dtor)(basic_string_wchar*); +static void* (__thiscall *p_basic_string_wchar_dtor)(basic_string_wchar*); static basic_string_wchar* (__thiscall *p_basic_string_wchar_erase)(basic_string_wchar*, size_t, size_t); static basic_string_wchar* (__thiscall *p_basic_string_wchar_assign_cstr_len)(basic_string_wchar*, const wchar_t*, size_t); static const wchar_t* (__thiscall *p_basic_string_wchar_cstr)(basic_string_wchar*); @@ -767,6 +767,26 @@ static void test_basic_string_char_find_last_not_of(void) { } } +static void test_basic_string_dtor(void) { +#ifdef __i386__ + static const wchar_t qwerty[] = { 'q','w','e','r','t','y',0 }; + basic_string_wchar str1; + basic_string_char str2; + void *ret; + + /* FEAR 1 installer expects that string destructors set EAX to + * zero on return (see bug 37358). */ + + call_func2(p_basic_string_wchar_ctor_cstr, &str1, qwerty); + ret = call_func1(p_basic_string_wchar_dtor, &str1); + ok(ret == NULL, "expected NULL, got %p\n", ret); + + call_func2(p_basic_string_char_ctor_cstr, &str2, "qwerty"); + ret = call_func1(p_basic_string_char_dtor, &str2); + ok(ret == NULL, "expected NULL, got %p\n", ret); +#endif +} + START_TEST(string) { if(!init()) @@ -783,6 +803,7 @@ START_TEST(string) test_basic_string_wchar(); test_basic_string_wchar_swap(); test_basic_string_char_find_last_not_of(); + test_basic_string_dtor(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Svante Signell : winepulse.drv: Avoid PATH_MAX in Windows code.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 9d5173f77ddb95b7ed192015302786f82516c540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5173f77ddb95b7ed1920153… Author: Svante Signell <svante.signell(a)gmail.com> Date: Mon Nov 23 16:59:39 2015 +0100 winepulse.drv: Avoid PATH_MAX in Windows code. Signed-off-by: Svante Signell <svante.signell(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 215a53e..24972ab 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -442,7 +442,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { static HRESULT pulse_connect(void) { int len; - WCHAR path[PATH_MAX], *name; + WCHAR path[MAX_PATH], *name; char *str; if (!pulse_thread) @@ -521,7 +521,7 @@ static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol static HRESULT pulse_test_connect(void) { int len, ret; - WCHAR path[PATH_MAX], *name; + WCHAR path[MAX_PATH], *name; char *str; pa_operation *o;

1 0

Julian Rüger : German translation for release 1.8-rc1
by Jeremy Newman 23 Nov '15

23 Nov '15

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

Łukasz Wojniłowicz : Polish translation for release 1.8-rc1
by Jeremy Newman 23 Nov '15

23 Nov '15

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

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

23 Nov '15

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 23 Nov '15

23 Nov '15

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

Bruno Jesus : comctl32: Respect an assert in TREEVIEW_RemoveAllChildren.
by Alexandre Julliard 23 Nov '15

23 Nov '15

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 23 Nov '15

23 Nov '15

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 23 Nov '15

23 Nov '15

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

Nikolay Sivov : d2d1: Fix a copy-paste issue in EndDraw() (Coverity).
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: a5612e0275cd38deea67d81adad581accdab82c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5612e0275cd38deea67d81ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 14:02:30 2015 +0300 d2d1: Fix a copy-paste issue in EndDraw() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> 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 bd20d5d..4dd94cb 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1409,7 +1409,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget if (tag1) *tag1 = render_target->error.tag1; if (tag2) - *tag1 = render_target->error.tag2; + *tag2 = render_target->error.tag2; return render_target->error.code; }

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015