[PATCH 3/4] user32/listbox: Update anchor index on LB_SETSEL.
Nikolay Sivov
nsivov at codeweavers.com
Wed Aug 15 03:22:56 CDT 2018
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/user32/listbox.c | 5 ++++-
dlls/user32/tests/listbox.c | 6 ------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index af8ee40311..991ab87685 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -2853,7 +2853,10 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
return descr->items[wParam].selected;
case LB_SETSEL:
- return LISTBOX_SetSelection( descr, lParam, wParam, FALSE );
+ ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE );
+ if (ret != LB_ERR && wParam)
+ descr->anchor_item = lParam;
+ return ret;
case LB_SETCURSEL:
if (IS_MULTISELECT(descr)) return LB_ERR;
diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c
index ee5211c341..dfa8de7b88 100644
--- a/dlls/user32/tests/listbox.c
+++ b/dlls/user32/tests/listbox.c
@@ -553,19 +553,16 @@ static void test_LB_SETSEL(void)
ret = SendMessageA(list, LB_SETSEL, TRUE, 0);
ok(ret == 0, "Unexpected return value %d.\n", ret);
ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0);
-todo_wine
ok(ret == 0, "Unexpected anchor index %d.\n", ret);
ret = SendMessageA(list, LB_SETSEL, TRUE, 1);
ok(ret == 0, "Unexpected return value %d.\n", ret);
ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0);
-todo_wine
ok(ret == 1, "Unexpected anchor index %d.\n", ret);
ret = SendMessageA(list, LB_SETSEL, FALSE, 1);
ok(ret == 0, "Unexpected return value %d.\n", ret);
ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0);
-todo_wine
ok(ret == 1, "Unexpected anchor index %d.\n", ret);
DestroyWindow(list);
@@ -580,19 +577,16 @@ todo_wine
ret = SendMessageA(list, LB_SETSEL, TRUE, 0);
ok(ret == 0, "Unexpected return value %d.\n", ret);
ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0);
-todo_wine
ok(ret == 0, "Unexpected anchor index %d.\n", ret);
ret = SendMessageA(list, LB_SETSEL, TRUE, 1);
ok(ret == 0, "Unexpected return value %d.\n", ret);
ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0);
-todo_wine
ok(ret == 1, "Unexpected anchor index %d.\n", ret);
ret = SendMessageA(list, LB_SETSEL, FALSE, 1);
ok(ret == 0, "Unexpected return value %d.\n", ret);
ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0);
-todo_wine
ok(ret == 1, "Unexpected anchor index %d.\n", ret);
DestroyWindow(list);
--
2.18.0
More information about the wine-devel
mailing list