Commit ebe99b92 authored by Gabriel Ivăncescu's avatar Gabriel Ivăncescu Committed by Alexandre Julliard

comctl32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes.

parent ac174f4c
...@@ -762,7 +762,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL ...@@ -762,7 +762,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL
} else } else
{ {
if (buffer) 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); len = sizeof(ULONG_PTR);
} }
return len; return len;
......
...@@ -2302,7 +2302,6 @@ static void test_LBS_NODATA(void) ...@@ -2302,7 +2302,6 @@ static void test_LBS_NODATA(void)
memset(&data, 0xee, sizeof(data)); memset(&data, 0xee, sizeof(data));
ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data);
ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); ok(ret == sizeof(data), "Unexpected return value %d.\n", ret);
todo_wine
ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n");
ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment