Nikolay Sivov : comctl32/listbox: Update anchor index on LB_SETSEL.
Alexandre Julliard
julliard at winehq.org
Wed Aug 15 14:39:56 CDT 2018
Module: wine
Branch: master
Commit: 4ee79efd86f6107f42ff12b92476cba1698b53ed
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee79efd86f6107f42ff12b92476cba1698b53ed
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed Aug 15 11:22:57 2018 +0300
comctl32/listbox: Update anchor index on LB_SETSEL.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/listbox.c | 5 ++++-
dlls/comctl32/tests/listbox.c | 6 ------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index e033975..b3491bb 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -2758,7 +2758,10 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam,
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/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c
index 07aa5c6..c9d13a8 100644
--- a/dlls/comctl32/tests/listbox.c
+++ b/dlls/comctl32/tests/listbox.c
@@ -611,19 +611,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);
@@ -638,19 +635,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);
More information about the wine-cvs
mailing list