November 2018 - Wine-Commits

Alexandre Julliard : widl: Always generate files for the target platform only.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: f67301e9ecaedc6920470782910f7df79cb68b19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f67301e9ecaedc6920470782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 18:18:17 2018 +0100 widl: Always generate files for the target platform only. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 22 +------------ tools/widl/proxy.c | 24 ++------------ tools/widl/register.c | 2 +- tools/widl/server.c | 22 +------------ tools/widl/typelib.c | 2 +- tools/widl/widl.c | 88 ++++++++++++++++++++++++++++++++----------------- tools/widl/widl.h | 9 +++-- tools/widl/widl.man.in | 10 ++---- tools/widl/widltypes.h | 1 - tools/widl/write_msft.c | 4 +-- 10 files changed, 75 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f67301e9ecaedc692047…

1 0

André Hentschel : kernel32: Export RtlPcToFileHeader on ARM64.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: 9f7692e2edc2face389f1cd26fdb5f705acaa6ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f7692e2edc2face389f1cd2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 14 19:09:23 2018 +0100 kernel32: Export RtlPcToFileHeader on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46144 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5490b07..5c2e426 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1294,7 +1294,7 @@ @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory -@ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=x86_64,arm,arm64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind

1 0

Zebediah Figura : oleaut32: Handle coclasses in ITypeInfo_Invoke().
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: 94f4b49d78f8b17bfd95826c653b7513dc1522b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f4b49d78f8b17bfd95826c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 14 08:48:01 2018 -0600 oleaut32: Handle coclasses in ITypeInfo_Invoke(). Based on a patch by Sebastian Lackner. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39799 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/oleaut32/typelib.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4049d19..e1564d5 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -2591,7 +2591,7 @@ static void test_typelibmarshal(void) dispparams.rgvarg = vararg; VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok_ole_success(hr, IDispatch_Invoke); + ok_ole_success(hr, IDispatch_Invoke); ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6474b51..f32bed3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6572,6 +6572,7 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid) ITypeInfo *tinfo2; TYPEATTR *tattr; HRESULT hres; + int flags, i; hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); if(FAILED(hres)) @@ -6593,6 +6594,22 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid) *guid = tattr->guid; break; + case TKIND_COCLASS: + for (i = 0; i < tattr->cImplTypes; i++) + { + ITypeInfo_GetImplTypeFlags(tinfo2, i, &flags); + if (flags & IMPLTYPEFLAG_FDEFAULT) + break; + } + + if (i == tattr->cImplTypes) + i = 0; + + hres = ITypeInfo_GetRefTypeOfImplType(tinfo2, i, &href); + if (SUCCEEDED(hres)) + hres = get_iface_guid(tinfo2, href, guid); + break; + default: ERR("Unexpected typekind %d\n", tattr->typekind); hres = E_UNEXPECTED;

1 0

Zebediah Figura : rpcrt4: Write type format strings for coclasses.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: 5d44b1d4bd21b6f36bc50bdef1e7afaa0f6d4b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d44b1d4bd21b6f36bc50bde… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 14 08:47:59 2018 -0600 rpcrt4: Write type format strings for coclasses. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19016 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 215ea7d..8a08ad9 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -324,6 +324,32 @@ static size_t write_ip_tfs(unsigned char *str, size_t *len, const GUID *iid) return off; } +static void get_default_iface(ITypeInfo *typeinfo, WORD count, GUID *iid) +{ + ITypeInfo *refinfo; + HREFTYPE reftype; + TYPEATTR *attr; + int flags, i; + + for (i = 0; i < count; ++i) + { + ITypeInfo_GetImplTypeFlags(typeinfo, i, &flags); + if (flags & IMPLTYPEFLAG_FDEFAULT) + break; + } + + /* If no interface was explicitly marked default, choose the first one. */ + if (i == count) + i = 0; + + ITypeInfo_GetRefTypeOfImplType(typeinfo, i, &reftype); + ITypeInfo_GetRefTypeInfo(typeinfo, reftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + *iid = attr->guid; + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); +} + static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t *len, TYPEDESC *desc, BOOL toplevel, BOOL onstack) { @@ -331,6 +357,7 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t ref, off = *len; ITypeInfo *refinfo; TYPEATTR *attr; + GUID guid; if (desc->vt == VT_USERDEFINED) { @@ -358,6 +385,10 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, case TKIND_DISPATCH: write_ip_tfs(str, len, &attr->guid); break; + case TKIND_COCLASS: + get_default_iface(refinfo, attr->cImplTypes, &guid); + write_ip_tfs(str, len, &guid); + break; case TKIND_ALIAS: off = write_pointer_tfs(refinfo, str, len, &attr->tdescAlias, toplevel, onstack); break;

1 0

Gabriel Ivăncescu : comctl32/listbox: Make LBS_NODATA listboxes error on any attempt to find a value.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: 0b7dbc9e19cf8def22e3817e51afc46f87168331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7dbc9e19cf8def22e3817e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:20 2018 +0200 comctl32/listbox: Make LBS_NODATA listboxes error on any attempt to find a value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 ++ dlls/comctl32/tests/listbox.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 479f6a6..dbc7b4a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -880,6 +880,8 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa INT i; LB_ITEMDATA *item; + if (descr->style & LBS_NODATA) return LB_ERR; + if (start >= descr->nb_items) start = -1; item = descr->items + start + 1; if (HAS_STRINGS(descr)) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 271cbca..43da3ca 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2309,10 +2309,16 @@ static void test_LBS_NODATA(void) } /* More messages that don't work with LBS_NODATA. */ + ret = SendMessageA(listbox, LB_FINDSTRING, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRING, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret);

1 0

Gabriel Ivăncescu : shell32/tests: Test WM_SETTEXT with AutoComplete.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: d715814e68d51c42cfe6da80c84c1c4b3996c8bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d715814e68d51c42cfe6da80… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 13 13:04:06 2018 +0200 shell32/tests: Test WM_SETTEXT with AutoComplete. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 6921202..ad7eb6a 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -510,12 +510,14 @@ static void test_custom_source(void) static WCHAR str_alpha2[] = {'t','e','s','t','2',0}; static WCHAR str_beta[] = {'a','u','t','o',' ','c','o','m','p','l','e','t','e',0}; static WCHAR str_au[] = {'a','u',0}; + static WCHAR str_aut[] = {'a','u','t',0}; static WCHAR *suggestions[] = { str_alpha, str_alpha2, str_beta }; struct string_enumerator *obj; IUnknown *enumerator; IAutoComplete2 *autocomplete; IAutoCompleteDropDown *acdropdown; HWND hwnd_edit; + DWORD flags = 0; WCHAR buffer[20]; HRESULT hr; @@ -587,6 +589,22 @@ static void test_custom_source(void) ok(obj->num_resets == 2, "Expected 2 resets, got %u\n", obj->num_resets); /* end of hijacks */ + hr = IAutoCompleteDropDown_GetDropDownStatus(acdropdown, &flags, NULL); + ok(hr == S_OK, "IAutoCompleteDropDown_GetDropDownStatus failed: %x\n", hr); + ok(flags & ACDD_VISIBLE, "AutoComplete DropDown should be visible\n"); + SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str_au); + dispatch_messages(); + hr = IAutoCompleteDropDown_GetDropDownStatus(acdropdown, &flags, NULL); + ok(hr == S_OK, "IAutoCompleteDropDown_GetDropDownStatus failed: %x\n", hr); + ok(!(flags & ACDD_VISIBLE), "AutoComplete DropDown should have been hidden\n"); + SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str_aut); + dispatch_messages(); + hr = IAutoCompleteDropDown_GetDropDownStatus(acdropdown, &flags, NULL); + ok(hr == S_OK, "IAutoCompleteDropDown_GetDropDownStatus failed: %x\n", hr); + ok(!(flags & ACDD_VISIBLE), "AutoComplete DropDown should be hidden\n"); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str_aut, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_aut), wine_dbgstr_w(buffer)); + test_aclist_expand(hwnd_edit, enumerator); obj->num_resets = 0;

1 0

Gabriel Ivăncescu : comctl32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: ebe99b92d48c86a358ac2143ac45a2b3f7197872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe99b92d48c86a358ac2143… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:17 2018 +0200 comctl32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 3 ++- dlls/comctl32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 76b09aa..aa42c3a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -762,7 +762,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL } else { if (buffer) - *((ULONG_PTR *)buffer) = descr->items[index].data; + *((ULONG_PTR *)buffer) = (descr->style & LBS_NODATA) + ? 0 : descr->items[index].data; len = sizeof(ULONG_PTR); } return len; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 802dd98..8620ca3 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2302,7 +2302,6 @@ static void test_LBS_NODATA(void) memset(&data, 0xee, sizeof(data)); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); - todo_wine ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Hide the listbox when the text is changed programmatically.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: 4cac7da8b5f68a212314733797815bf0883e10c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cac7da8b5f68a2123147337… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 13 13:04:05 2018 +0200 shell32/autocomplete: Hide the listbox when the text is changed programmatically. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 705b28b..6d8988b 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -627,6 +627,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, ? autoappend_flag_yes : autoappend_flag_no); return ret; case WM_SETTEXT: + if (This->options & ACO_AUTOSUGGEST) + hide_listbox(This, This->hwndListBox, TRUE); + break; case WM_CUT: case WM_CLEAR: case WM_UNDO:

1 0

Gabriel Ivăncescu : comctl32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: ac174f4cf433176b0f582e83b6103adbf9537af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac174f4cf433176b0f582e83… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:16 2018 +0200 comctl32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 6 +++--- dlls/comctl32/tests/listbox.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 4a2df52..76b09aa 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -762,8 +762,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL } else { if (buffer) - *((DWORD *)buffer) = *(DWORD *)&descr->items[index].data; - len = sizeof(DWORD); + *((ULONG_PTR *)buffer) = descr->items[index].data; + len = sizeof(ULONG_PTR); } return len; } @@ -2653,7 +2653,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!HAS_STRINGS(descr)) return sizeof(DWORD); + if (!HAS_STRINGS(descr)) return sizeof(ULONG_PTR); return strlenW( descr->items[wParam].str ); case LB_GETCURSEL: diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 6ac3c73..802dd98 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2296,12 +2296,11 @@ static void test_LBS_NODATA(void) ret = SendMessageA(listbox, LB_SETITEMDATA, valid_idx[i], 42); ok(ret == TRUE, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_GETTEXTLEN, valid_idx[i], 0); - todo_wine_if(text_len == 8) + todo_wine_if(is_wow64) ok(ret == text_len, "Unexpected return value %d.\n", ret); memset(&data, 0xee, sizeof(data)); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); - todo_wine_if(sizeof(void *) == 8) ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); todo_wine ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n");

1 0

Gabriel Ivăncescu : comctl32/listbox: Don' t set any data for LBS_NODATA listboxes.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: 19f26c35d5cabae15fc9b5311da776c02db6488e URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f26c35d5cabae15fc9b531… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:19 2018 +0200 comctl32/listbox: Don't set any data for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- dlls/comctl32/tests/listbox.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 03afc5e..479f6a6 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2638,7 +2638,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - descr->items[wParam].data = lParam; + if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index e507688..271cbca 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2310,13 +2310,10 @@ static void test_LBS_NODATA(void) /* More messages that don't work with LBS_NODATA. */ ret = SendMessageA(listbox, LB_FINDSTRING, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); DestroyWindow(listbox);

1 0