=?UTF-8?Q?Gabriel=20Iv=C4=83ncescu=20?=: user32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS.
Alexandre Julliard
julliard at winehq.org
Fri Nov 16 14:38:19 CST 2018
Module: wine
Branch: master
Commit: c920b4dc5aa2758913c141261c7297e60f301977
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c920b4dc5aa2758913c141261c7297e60f301977
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Thu Nov 15 11:46:18 2018 +0200
user32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS.
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 | 6 +++---
dlls/user32/tests/listbox.c | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index b5b7dc6..5746293 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -799,8 +799,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL
__ENDTRY
} else {
if (buffer)
- *((LPDWORD)buffer)=*(LPDWORD)(&descr->items[index].data);
- len = sizeof(DWORD);
+ *((ULONG_PTR *)buffer) = descr->items[index].data;
+ len = sizeof(ULONG_PTR);
}
return len;
}
@@ -2707,7 +2707,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
SetLastError(ERROR_INVALID_INDEX);
return LB_ERR;
}
- if (!HAS_STRINGS(descr)) return sizeof(DWORD);
+ if (!HAS_STRINGS(descr)) return sizeof(ULONG_PTR);
if (unicode) return strlenW( descr->items[wParam].str );
return WideCharToMultiByte( CP_ACP, 0, descr->items[wParam].str,
strlenW(descr->items[wParam].str), NULL, 0, NULL, NULL );
diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c
index 813968f..658893a 100644
--- a/dlls/user32/tests/listbox.c
+++ b/dlls/user32/tests/listbox.c
@@ -2091,12 +2091,10 @@ static void test_LBS_NODATA(void)
ret = SendMessageA(listbox, LB_SETITEMDATA, valid_idx[i], 42);
ok(ret == TRUE, "Unexpected return value %d.\n", ret);
ret = SendMessageA(listbox, LB_GETTEXTLEN, valid_idx[i], 0);
- todo_wine_if(sizeof(void *) == 8)
ok(ret == sizeof(data), "Unexpected return value %d.\n", ret);
memset(&data, 0xee, sizeof(data));
ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data);
- todo_wine_if(sizeof(void *) == 8)
ok(ret == sizeof(data), "Unexpected return value %d.\n", ret);
todo_wine
ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n");
More information about the wine-cvs
mailing list