Nikolay Sivov : comctl32/listbox: Fix multicolumn navigation on VK_RIGHT.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Aug 22 16:50:19 2018 +0300

comctl32/listbox: Fix multicolumn navigation on VK_RIGHT.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/comctl32/listbox.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index 5235ffd..4d389b1 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -2349,8 +2349,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key )
         if (descr->style & LBS_MULTICOLUMN)
         {
             bForceSelection = FALSE;
-            if (descr->focus_item + descr->page_size < descr->nb_items)
-                caret = descr->focus_item + descr->page_size;
+            caret = min(descr->focus_item + descr->page_size, descr->nb_items - 1);
             break;
         }
         /* fall through */