Nikolay Sivov : user32/listbox: Update caret index on LB_SETSEL.
Alexandre Julliard
julliard at winehq.org
Mon Apr 20 15:01:53 CDT 2020
Module: wine
Branch: oldstable
Commit: 8fa08b849080573a3cd15540652cdaed4729c26b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fa08b849080573a3cd15540652cdaed4729c26b
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed Dec 11 15:17:50 2019 +0300
user32/listbox: Update caret index on LB_SETSEL.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47459
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 832b748b06290d6c6fa0e1fcc7b332019a4cb80d)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/user32/listbox.c | 4 ++++
dlls/user32/tests/listbox.c | 16 ++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index e5b5059284..056839d459 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -2901,7 +2901,11 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
case LB_SETSEL:
ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE );
if (ret != LB_ERR && wParam)
+ {
descr->anchor_item = lParam;
+ if (lParam != -1)
+ LISTBOX_SetCaretIndex( descr, lParam, TRUE );
+ }
return ret;
case LB_SETCURSEL:
diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c
index a3d3ae611a..e2c8778b52 100644
--- a/dlls/user32/tests/listbox.c
+++ b/dlls/user32/tests/listbox.c
@@ -583,21 +583,29 @@ static void test_LB_SETSEL(void)
ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0);
ok(ret == -1, "Unexpected anchor index %d.\n", ret);
+ ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0);
+ ok(ret == 0, "Unexpected caret index %d.\n", ret);
ret = SendMessageA(list, LB_SETSEL, TRUE, 0);
ok(ret == 0, "Unexpected return value %d.\n", ret);
ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0);
ok(ret == 0, "Unexpected anchor index %d.\n", ret);
+ ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0);
+ ok(ret == 0, "Unexpected caret 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);
ok(ret == 1, "Unexpected anchor index %d.\n", ret);
+ ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0);
+ ok(ret == 1, "Unexpected caret 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);
ok(ret == 1, "Unexpected anchor index %d.\n", ret);
+ ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0);
+ ok(ret == 1, "Unexpected caret index %d.\n", ret);
DestroyWindow(list);
@@ -607,21 +615,29 @@ static void test_LB_SETSEL(void)
ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0);
ok(ret == -1, "Unexpected anchor index %d.\n", ret);
+ ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0);
+ ok(ret == 0, "Unexpected caret index %d.\n", ret);
ret = SendMessageA(list, LB_SETSEL, TRUE, 0);
ok(ret == 0, "Unexpected return value %d.\n", ret);
ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0);
ok(ret == 0, "Unexpected anchor index %d.\n", ret);
+ ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0);
+ ok(ret == 0, "Unexpected caret 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);
ok(ret == 1, "Unexpected anchor index %d.\n", ret);
+ ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0);
+ ok(ret == 1, "Unexpected caret 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);
ok(ret == 1, "Unexpected anchor index %d.\n", ret);
+ ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0);
+ ok(ret == 1, "Unexpected caret index %d.\n", ret);
DestroyWindow(list);
}
More information about the wine-cvs
mailing list