user32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes.

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>

user32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes.
cab591c5 · Gabriel Ivăncescu · Alexandre Julliard · c980edc2 · cab591c5 · cab591c5
Commit cab591c5 authored Nov 15, 2018 by Gabriel Ivăncescu Committed by Alexandre Julliard Nov 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

listbox.c dlls/user32/listbox.c +1 -1

listbox.c dlls/user32/tests/listbox.c +0 -1

No files found.
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -2684,7 +2684,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
            SetLastError(ERROR_INVALID_INDEX);
            return LB_ERR;
        }
-        return descr->items[wParam].data;
+        return (descr->style & LBS_NODATA) ? 0 : descr->items[wParam].data;

    case LB_SETITEMDATA:
        if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items))

--- a/dlls/user32/tests/listbox.c
+++ b/dlls/user32/tests/listbox.c
@@ -2099,7 +2099,6 @@ static void test_LBS_NODATA(void)
        ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n");

        ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0);
-    todo_wine
        ok(ret == 0, "Unexpected return value %d.\n", ret);
    }