[PATCH v22 2/2] comctl32/listview: Do not return items count on getting next item for last one.

[Ilia Docin]

From: Ilia Docin

---
 dlls/comctl32/listview.c       | 2 +-
 dlls/comctl32/tests/listview.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 0302e3e19a0..13d1bd092f2 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -7371,7 +7371,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF
     {
       if ((infoPtr->uView == LV_VIEW_LIST) || (infoPtr->uView == LV_VIEW_DETAILS))
       {
-        while (nItem < infoPtr->nItemCount)
+        while (nItem < infoPtr->nItemCount - 1)
         {
           nItem++;
           if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask)
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index b44c134d9ce..12825ffaa7b 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -7250,7 +7250,7 @@ static void test_LVM_GETNEXTITEM(void)
     lr = SendMessageA(hwnd, LVM_GETNEXTITEM, 1, LVNI_ABOVE);
     expect(0, lr);
     lr = SendMessageA(hwnd, LVM_GETNEXTITEM, 1, LVNI_BELOW);
-    todo_wine expect(-1, lr);
+    expect(-1, lr);

DestroyWindow(hwnd);
 }