Nikolay Sivov : comctl32/listbox: Update caret index on LB_SETSEL.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7f498f460703db687ce465fecd729f93b844bde8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7f498f460703db687ce465fec...

Author: Nikolay Sivov 
Date:   Wed Dec 11 15:17:52 2019 +0300

comctl32/listbox: Update caret index on LB_SETSEL.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47459
Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/comctl32/listbox.c       |  4 ++++
 dlls/comctl32/tests/listbox.c | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index 2b8c2ba086..f9b4e0aeaf 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -2858,7 +2858,11 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam,
     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/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c
index a3769423ee..4d44137e4d 100644
--- a/dlls/comctl32/tests/listbox.c
+++ b/dlls/comctl32/tests/listbox.c
@@ -707,16 +707,22 @@ static void test_LB_SETSEL(void)
     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);

@@ -731,16 +737,22 @@ static void test_LB_SETSEL(void)
     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);
 }