comctl32/listbox: Make LBS_NODATA listboxes error on any attempt to find a value.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/listbox: Make LBS_NODATA listboxes error on any attempt to find a value.
0b7dbc9e · Gabriel Ivăncescu · Alexandre Julliard · 19f26c35 · 0b7dbc9e · 0b7dbc9e
Commit 0b7dbc9e authored Nov 14, 2018 by Gabriel Ivăncescu Committed by Alexandre Julliard Nov 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

listbox.c dlls/comctl32/listbox.c +2 -0

listbox.c dlls/comctl32/tests/listbox.c +6 -0

No files found.
--- 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))

--- 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);