June 2018 - Wine-Devel - list.winehq.org

[PATCH] configure: Allow building bcrypt with GnuTLS support on macOS.
by Hans Leidekker June 28, 2018

June 28, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9c38cfb376..d10acde146 100644 --- a/configure.ac +++ b/configure.ac @@ -789,7 +789,6 @@ case $host_os in LIBS="$LIBS $SECURITY_LIBS" AC_CHECK_FUNCS(SSLCopyPeerCertificates) LIBS="$ac_save_LIBS" - with_gnutls=${with_gnutls:-no} fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then -- 2.11.0

1 0

Seeking for future maintainer of Tea CI
by Qian Hong June 28, 2018

June 28, 2018

Dear folks, (Long time no see, hey!) I know many Wine contributors are in WineConf, some of you might even be missing me <grin>, so it's the perfect time to raise this topic :) And I know new Wine contributors join the community every year, so I should introduce a bit about myself ^_^ I'm Qian Hong, a former Wine contributor since 2012. In 2016, I move my focus from upstream Wine to Tea CI https://tea-ci.org Tea CI is a *C*ontinuous *I*ntegration platform which supports building both Linux application and Windows application, it's the only platform which supports building Windows application without depending on any Windows License because of the utilizing of Wine. For people who aren't familiar with fashion words like CI, think about it like our Wine TestBot, which builds and tests software automatically. Here are some examples of how people use Tea CI: https://tea-ci.org/mamedev/mame https://tea-ci.org/concurrencykit/ck https://tea-ci.org/Alexpux/MINGW-packages There are currently 200 registered users of Tea CI, while only a few of them are active. I (co)founded Tea CI as a non-profit project for some ambitious goals, which I'm shy to tell anymore because it doesn't work out. I admit it is not very successful, it wasn't updated for more than one year, Msys2/MinGW packages are outdated, Wine compatibility issues are remaining unfixed, Web UI is not friendly enough, documentation is not complete, the future is unclear, etc... However, I do appreciate lots of people who helped Tea CI in many different ways, including but not limited to Wine/Wine Staging developers, Cygwin/Msys2/GDB developers, Drone CI developers, Mozilla RR developer, Arch developer, and many many more. I was considering shutting down Tea CI because lacking maintenance and other reasons, however, I received positive feedback from some users: >>> XXX (A startup) is happy to cover your server costs as a sponsor. If it is 98 EUR per month we can cover full cost. Would that help towards keeping it active? <<< >>> it is very convenient to do windows builds and I would use it more if it were updated and taken care of. I do have (and had) a few projects that could use it, some of them were commercial. <<< >>> I think this is one of a few projects providing windows builds without actual windows server. This alone makes it worth the while. <<< >>> I would be willing to support the project financially (though not the full amount), if someone would be maintaining and improving it (perhaps under your supervision?). <<< >>> It's been a solid platform, and even though we only build 'tiny' builds on a single platform, and not most of the components, we've done it for practically every commit these last 18 months. It will be a shame to lose it, and I'm not sure what out-of-the-box solution would replace it for Msys2/MinGW. <<< >>> We are currently using Tea CI in a major project, ConcurrencyKit. CK is a very UNIX oriented library, so Tea CI made things very easy. <<< To be fair, I should also share negative feedback like: >>> I last used TeaCI for about a year starting ~2 years ago, using it once to twice a week. ultimately, various bugs from ancient Cygwin versions led me move most of my infrastructure to MSVC and use AppVeyor. I appreciate all the money and hard work you have put in, but ultimately, I have no issue if TeaCI shuts down. <<< As one might see, it could be a pity if no one maintains Tea CI. However, due to personal reasons, I'm not able to spend enough time and energy to improve Tea CI, that's why I am hoping to transfer the owner of Tea CI. The most challenging part of Tea CI is keeping Wine compatible with Cygwin/Msys2, which requires experienced Wine development skills, and most people who have the skill are subscribing to this list :) I know looking for future maintainers of Tea CI is much harder than looking for a job, people who have the skill are likely to have no time. However, I am still very keen to ask: by any chance, would anyone be interested in taking a look, or at least raise a discussion during/after WineConf? If anyone is interested in a follow up of the discussion, I'm glad to answer any questions about Tea CI. Looking forward to hearing from you! -- Regards, Qian Hong

1 0

[PATCH 2/2] inetcpl.cpl: Add partial support for writing DefaultConnectionSettings registry setting
by Piotr Caban June 28, 2018

June 28, 2018

IE 10+ saves connection information in this key. .NET 4.6.2 is using the key to read proxy settings. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/inetcpl.cpl/connections.c | 83 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] inetcpl.cpl: Add proxy server settings dialog
by Piotr Caban June 28, 2018

June 28, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/connections.c | 178 +++++++++++++++++++++++++++++++++++++++++ dlls/inetcpl.cpl/inetcpl.c | 6 ++ dlls/inetcpl.cpl/inetcpl.h | 6 ++ dlls/inetcpl.cpl/inetcpl.rc | 14 ++++ 5 files changed, 205 insertions(+) create mode 100644 dlls/inetcpl.cpl/connections.c

1 0

[PATCH] iphlpapi: Cast caddr_t to char* before doing pointer arithmetic
by Alex Henrie June 28, 2018

June 28, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=18164 dlls/iphlpapi/ifenum.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index eed1be15d1..c3abdf0e53 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -1013,13 +1013,13 @@ static DWORD enumIPAddresses(PDWORD pcAddresses, struct ifconf *ifc) if (ioctlRet == 0) { ifPtr = ifc->ifc_buf; - while (ifPtr && ifPtr < ifc->ifc_buf + ifc->ifc_len) { + while (ifPtr && (char *)ifPtr < ifc->ifc_buf + ifc->ifc_len) { struct ifreq *ifr = (struct ifreq *)ifPtr; if (ifr->ifr_addr.sa_family == AF_INET) numAddresses++; - ifPtr += ifreq_len((struct ifreq *)ifPtr); + ifPtr = (char *)ifPtr + ifreq_len((struct ifreq *)ifPtr); } } else @@ -1074,10 +1074,10 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) ret = NO_ERROR; (*ppIpAddrTable)->dwNumEntries = numAddresses; ifPtr = ifc.ifc_buf; - while (!ret && ifPtr && ifPtr < ifc.ifc_buf + ifc.ifc_len) { + while (!ret && ifPtr && (char *)ifPtr < ifc.ifc_buf + ifc.ifc_len) { struct ifreq *ifr = (struct ifreq *)ifPtr; - ifPtr += ifreq_len(ifr); + ifPtr = (char *)ifPtr + ifreq_len(ifr); if (ifr->ifr_addr.sa_family != AF_INET) continue; -- 2.18.0

2 1

[PATCH 6/6] user32: For an owner-drawn listbox without strings WM_MEASUREITEM still needs correct itemData.
by Dmitry Timoshkov June 28, 2018

June 28, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/msg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 9caccf6097..af8ee40311 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1554,7 +1554,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, mis.CtlType = ODT_LISTBOX; mis.CtlID = id; mis.itemID = index; - mis.itemData = data; + mis.itemData = str ? (ULONG_PTR)str : data; mis.itemHeight = descr->item_height; SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); item->height = mis.itemHeight ? mis.itemHeight : 1; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index da017667e0..052b9b9aae 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14387,7 +14387,7 @@ static void test_listbox_messages(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); ok(ret == 2, "expected 2, got %ld\n", ret); - ok_sequence(wm_lb_addstring_sort_ownerdraw, "LB_ADDSTRING", TRUE); + ok_sequence(wm_lb_addstring_sort_ownerdraw, "LB_ADDSTRING", FALSE); check_lb_state(listbox, 3, LB_ERR, 0, 0); log_all_parent_messages--; -- 2.16.3

2 1

[PATCH 4/6] user32: Fix order of items passed in WM_COMPAREITEM data.
by Dmitry Timoshkov June 28, 2018

June 28, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/listbox.c | 12 ++++++------ dlls/user32/tests/msg.c | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 8df67634d3..490033902c 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -835,7 +835,7 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { index = (min + max) / 2; if (HAS_STRINGS(descr)) - res = LISTBOX_lstrcmpiW( descr->locale, str, descr->items[index].str); + res = LISTBOX_lstrcmpiW( descr->locale, descr->items[index].str, str ); else { COMPAREITEMSTRUCT cis; @@ -846,15 +846,15 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) cis.hwndItem = descr->self; /* note that some application (MetaStock) expects the second item * to be in the listbox */ - cis.itemID1 = -1; - cis.itemData1 = (ULONG_PTR)str; - cis.itemID2 = index; - cis.itemData2 = descr->items[index].data; + cis.itemID1 = index; + cis.itemData1 = descr->items[index].data; + cis.itemID2 = -1; + cis.itemData2 = (ULONG_PTR)str; cis.dwLocaleId = descr->locale; res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); } if (!res) return index; - if (res < 0) max = index; + if (res > 0) max = index; else min = index + 1; } return exact ? -1 : max; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5a5d5ed5fe..da017667e0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2276,9 +2276,7 @@ static void add_message_(int line, const struct recvd_message *msg) ok(msg->wParam == cis->CtlID, "expected %#x, got %#lx\n", cis->CtlID, msg->wParam); ok(cis->hwndItem == ctrl, "expected %p, got %p\n", ctrl, cis->hwndItem); -todo_wine ok((int)cis->itemID1 >= 0, "expected >= 0, got %d\n", cis->itemID1); -todo_wine ok((int)cis->itemID2 == -1, "expected -1, got %d\n", cis->itemID2); sprintf( seq->output, "%s: %p WM_COMPAREITEM: CtlType %#x, CtlID %#x, itemID1 %#x, itemData1 %#lx, itemID2 %#x, itemData2 %#lx", @@ -14385,10 +14383,8 @@ static void test_listbox_messages(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 0"); ok(ret == 0, "expected 0, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 1"); -todo_wine ok(ret == 1, "expected 1, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); -todo_wine ok(ret == 2, "expected 2, got %ld\n", ret); ok_sequence(wm_lb_addstring_sort_ownerdraw, "LB_ADDSTRING", TRUE); -- 2.16.3

2 1

[PATCH 2/6] user32/tests: Add a message test for an owner-drawn sorted listbox.
by Dmitry Timoshkov June 28, 2018

June 28, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/msg.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1c3b639aa0..0df9687ae2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2243,18 +2243,61 @@ static void add_message_(int line, const struct recvd_message *msg) { MEASURE_ITEM_STRUCT mi; MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)msg->lParam; + BOOL is_unicode_data = TRUE; sprintf( seq->output, "%s: %p WM_MEASUREITEM: CtlType %#x, CtlID %#x, itemID %#x, itemData %#lx", msg->descr, msg->hwnd, mis->CtlType, mis->CtlID, mis->itemID, mis->itemData); + if (mis->CtlType == ODT_LISTBOX) + { + HWND ctrl = GetDlgItem(msg->hwnd, mis->CtlID); + is_unicode_data = GetWindowLongA(ctrl, GWL_STYLE) & LBS_HASSTRINGS; + } + mi.u.wp = 0; mi.u.item.CtlType = mis->CtlType; mi.u.item.CtlID = mis->CtlID; mi.u.item.itemID = mis->itemID; mi.u.item.wParam = msg->wParam; seq->wParam = mi.u.wp; - seq->lParam = mis->itemData ? hash_Ly_W((const WCHAR *)mis->itemData) : 0; + if (is_unicode_data) + seq->lParam = mis->itemData ? hash_Ly_W((const WCHAR *)mis->itemData) : 0; + else + seq->lParam = mis->itemData ? hash_Ly((const char *)mis->itemData) : 0; + break; + } + + case WM_COMPAREITEM: + { + COMPAREITEMSTRUCT *cis = (COMPAREITEMSTRUCT *)msg->lParam; + HWND ctrl = GetDlgItem(msg->hwnd, cis->CtlID); + BOOL is_unicode_data = TRUE; + + ok(msg->wParam == cis->CtlID, "expected %#x, got %#lx\n", cis->CtlID, msg->wParam); + ok(cis->hwndItem == ctrl, "expected %p, got %p\n", ctrl, cis->hwndItem); +todo_wine + ok((int)cis->itemID1 >= 0, "expected >= 0, got %d\n", cis->itemID1); +todo_wine + ok((int)cis->itemID2 == -1, "expected -1, got %d\n", cis->itemID2); + + sprintf( seq->output, "%s: %p WM_COMPAREITEM: CtlType %#x, CtlID %#x, itemID1 %#x, itemData1 %#lx, itemID2 %#x, itemData2 %#lx", + msg->descr, msg->hwnd, cis->CtlType, cis->CtlID, + cis->itemID1, cis->itemData1, cis->itemID2, cis->itemData2); + + if (cis->CtlType == ODT_LISTBOX) + is_unicode_data = GetWindowLongA(ctrl, GWL_STYLE) & LBS_HASSTRINGS; + + if (is_unicode_data) + { + seq->wParam = cis->itemData1 ? hash_Ly_W((const WCHAR *)cis->itemData1) : 0; + seq->lParam = cis->itemData2 ? hash_Ly_W((const WCHAR *)cis->itemData2) : 0; + } + else + { + seq->wParam = cis->itemData1 ? hash_Ly((const char *)cis->itemData1) : 0; + seq->lParam = cis->itemData2 ? hash_Ly((const char *)cis->itemData2) : 0; + } break; } @@ -9044,7 +9087,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam message == WM_PARENTNOTIFY || message == WM_CANCELMODE || message == WM_SETFOCUS || message == WM_KILLFOCUS || message == WM_ENABLE || message == WM_ENTERIDLE || - message == WM_DRAWITEM || message == WM_MEASUREITEM || + message == WM_DRAWITEM || message == WM_MEASUREITEM || message == WM_COMPAREITEM || message == WM_COMMAND || message == WM_IME_SETCONTEXT) { switch (message) @@ -9092,7 +9135,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; - return ret; + return message == WM_COMPAREITEM ? -1 : ret; } static INT_PTR CALLBACK StopQuitMsgCheckProcA(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) @@ -14159,6 +14202,19 @@ static const struct message wm_lb_addstring[] = { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf2f2, 0xf30604ef }, { 0 } }; +static const struct message wm_lb_addstring_sort[] = +{ + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ed }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf0f2, 0xf30604ed }, + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ee }, + { WM_COMPAREITEM, sent|wparam|lparam|parent, 0xf30604ed, 0xf30604ee }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf1f2, 0xf30604ee }, + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ef }, + { WM_COMPAREITEM, sent|wparam|lparam|parent, 0xf30604ed, 0xf30604ef }, + { WM_COMPAREITEM, sent|wparam|lparam|parent, 0xf30604ee, 0xf30604ef }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf2f2, 0xf30604ef }, + { 0 } +}; #define check_lb_state(a1, a2, a3, a4, a5) check_lb_state_dbg(a1, a2, a3, a4, a5, __LINE__) @@ -14224,6 +14280,7 @@ static void test_listbox_messages(void) parent = CreateWindowExA(0, "TestParentClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); + /* with LBS_HASSTRINGS */ listbox = CreateWindowExA(WS_EX_NOPARENTNOTIFY, "ListBox", NULL, WS_CHILD | LBS_NOTIFY | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | WS_VISIBLE, 10, 10, 80, 80, parent, (HMENU)ID_LISTBOX, 0, NULL); @@ -14304,6 +14361,34 @@ static void test_listbox_messages(void) log_all_parent_messages--; + DestroyWindow(listbox); + + /* with LBS_SORT and without LBS_HASSTRINGS */ + listbox = CreateWindowExA(WS_EX_NOPARENTNOTIFY, "ListBox", NULL, + WS_CHILD | LBS_NOTIFY | LBS_OWNERDRAWVARIABLE | LBS_SORT | WS_VISIBLE, + 10, 10, 80, 80, parent, (HMENU)ID_LISTBOX, 0, NULL); + listbox_orig_proc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (ULONG_PTR)listbox_hook_proc); + + check_lb_state(listbox, 0, LB_ERR, 0, 0); + + flush_sequence(); + + log_all_parent_messages++; + + ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 0"); + ok(ret == 0, "expected 0, got %ld\n", ret); + ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 1"); +todo_wine + ok(ret == 1, "expected 1, got %ld\n", ret); + ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); +todo_wine + ok(ret == 2, "expected 2, got %ld\n", ret); + + ok_sequence(wm_lb_addstring_sort, "LB_ADDSTRING", TRUE); + check_lb_state(listbox, 3, LB_ERR, 0, 0); + + log_all_parent_messages--; + DestroyWindow(listbox); DestroyWindow(parent); } -- 2.16.3

2 1

[PATCH 1/6] user32/tests: Add a test for WM_MEASUREITEM when inserting an item to an owner-drawn listbox.
by Dmitry Timoshkov June 28, 2018

June 28, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/msg.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a0f2cbeef0..1c3b639aa0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3,7 +3,7 @@ * * Copyright 1999 Ove Kaaven * Copyright 2003 Dimitrie O. Paun - * Copyright 2004, 2005 Dmitry Timoshkov + * Copyright 2004,2005,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -98,6 +98,22 @@ typedef struct } u; } DRAW_ITEM_STRUCT; +/* encoded MEASUREITEMSTRUCT into a WPARAM */ +typedef struct +{ + union + { + struct + { + UINT CtlType : 4; + UINT CtlID : 4; + UINT itemID : 4; + UINT wParam : 20; + } item; + WPARAM wp; + } u; +} MEASURE_ITEM_STRUCT; + static BOOL test_DestroyWindow_flag; static HWINEVENTHOOK hEvent_hook; static HHOOK hKBD_hook; @@ -2099,6 +2115,25 @@ static BOOL ignore_message( UINT message ) message == WM_DWMNCRENDERINGCHANGED); } +static unsigned hash_Ly_W(const WCHAR *str) +{ + unsigned hash = 0; + + for (; *str; str++) + hash = hash * 1664525u + (unsigned char)(*str) + 1013904223u; + + return hash; +} + +static unsigned hash_Ly(const char *str) +{ + unsigned hash = 0; + + for (; *str; str++) + hash = hash * 1664525u + (unsigned char)(*str) + 1013904223u; + + return hash; +} #define add_message(msg) add_message_(__LINE__,msg); static void add_message_(int line, const struct recvd_message *msg) @@ -2203,6 +2238,26 @@ static void add_message_(int line, const struct recvd_message *msg) seq->lParam = di.u.lp; break; } + + case WM_MEASUREITEM: + { + MEASURE_ITEM_STRUCT mi; + MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)msg->lParam; + + sprintf( seq->output, "%s: %p WM_MEASUREITEM: CtlType %#x, CtlID %#x, itemID %#x, itemData %#lx", + msg->descr, msg->hwnd, mis->CtlType, mis->CtlID, + mis->itemID, mis->itemData); + + mi.u.wp = 0; + mi.u.item.CtlType = mis->CtlType; + mi.u.item.CtlID = mis->CtlID; + mi.u.item.itemID = mis->itemID; + mi.u.item.wParam = msg->wParam; + seq->wParam = mi.u.wp; + seq->lParam = mis->itemData ? hash_Ly_W((const WCHAR *)mis->itemData) : 0; + break; + } + default: if (msg->message >= 0xc000) return; /* ignore registered messages */ sprintf( seq->output, "%s: %p %04x wp %08lx lp %08lx", @@ -8989,8 +9044,8 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam message == WM_PARENTNOTIFY || message == WM_CANCELMODE || message == WM_SETFOCUS || message == WM_KILLFOCUS || message == WM_ENABLE || message == WM_ENTERIDLE || - message == WM_DRAWITEM || message == WM_COMMAND || - message == WM_IME_SETCONTEXT) + message == WM_DRAWITEM || message == WM_MEASUREITEM || + message == WM_COMMAND || message == WM_IME_SETCONTEXT) { switch (message) { @@ -14094,6 +14149,16 @@ static const struct message wm_lb_deletestring_reset[] = { WM_DRAWITEM, sent|wparam|parent|optional, ID_LISTBOX }, { 0 } }; +static const struct message wm_lb_addstring[] = +{ + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ed }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf0f2, 0xf30604ed }, + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ee }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf1f2, 0xf30604ee }, + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ef }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf2f2, 0xf30604ef }, + { 0 } +}; #define check_lb_state(a1, a2, a3, a4, a5) check_lb_state_dbg(a1, a2, a3, a4, a5, __LINE__) @@ -14119,7 +14184,10 @@ static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPAR msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wp; - msg.lParam = lp; + if (message == LB_ADDSTRING) + msg.lParam = lp ? hash_Ly((const char *)lp) : 0; + else + msg.lParam = lp; msg.descr = "listbox"; add_message(&msg); } @@ -14163,6 +14231,8 @@ static void test_listbox_messages(void) check_lb_state(listbox, 0, LB_ERR, 0, 0); + flush_sequence(); + ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 0"); ok(ret == 0, "expected 0, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 1"); @@ -14170,6 +14240,7 @@ static void test_listbox_messages(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); ok(ret == 2, "expected 2, got %ld\n", ret); + ok_sequence(wm_lb_addstring, "LB_ADDSTRING", FALSE); check_lb_state(listbox, 3, LB_ERR, 0, 0); flush_sequence(); -- 2.16.3

2 1

[PATCH 5/6] user32: Fix the listbox sorting algorithm.
by Dmitry Timoshkov June 28, 2018

June 28, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/listbox.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 490033902c..9caccf6097 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -828,10 +828,11 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { INT index, min, max, res; - if (!(descr->style & LBS_SORT)) return -1; /* Add it at the end */ + if (!descr->nb_items || !(descr->style & LBS_SORT)) return -1; /* Add it at the end */ + min = 0; - max = descr->nb_items; - while (min != max) + max = descr->nb_items - 1; + while (min <= max) { index = (min + max) / 2; if (HAS_STRINGS(descr)) @@ -854,10 +855,10 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); } if (!res) return index; - if (res > 0) max = index; + if (res > 0) max = index - 1; else min = index + 1; } - return exact ? -1 : max; + return exact ? -1 : min; } -- 2.16.3

1 0