[PATCH v4 5/7] comctl32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/comctl32/listbox.c       | 2 +-
 dlls/comctl32/tests/listbox.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index aa42c3a..03afc5e 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -2630,7 +2630,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam,
             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))
diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c
index 265cffd..2b7612e 100644
--- a/dlls/comctl32/tests/listbox.c
+++ b/dlls/comctl32/tests/listbox.c
@@ -2304,7 +2304,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);
     }