=?UTF-8?Q?Gabriel=20Iv=C4=83ncescu=20?=: user32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes.
Alexandre Julliard
julliard at winehq.org
Fri Nov 16 14:38:19 CST 2018
Module: wine
Branch: master
Commit: c980edc2270d70a3378df4561c2494e80512f222
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c980edc2270d70a3378df4561c2494e80512f222
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Thu Nov 15 11:46:19 2018 +0200
user32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/listbox.c | 3 ++-
dlls/user32/tests/listbox.c | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index 5746293..044d73d 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -799,7 +799,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL
__ENDTRY
} 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/user32/tests/listbox.c b/dlls/user32/tests/listbox.c
index 658893a..3c3de71 100644
--- a/dlls/user32/tests/listbox.c
+++ b/dlls/user32/tests/listbox.c
@@ -2096,7 +2096,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);
More information about the wine-cvs
mailing list