[PATCH v3 5/6] comctl32/listview: Send LVN_ODSTATECHANGED notification.

[Angelo Haller]

From: Angelo Haller <angelo at szanni.org>

Send LVN_ODSTATECHANGED notification on selection change for
listviews when LVS_OWNERDATA is set.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52534
Signed-off-by: Angelo Haller <angelo at szanni.org>

---
v3: Merge nFirst & nLast definition into a single line.
    Add function call guard due to preceding patch changes.
---
 dlls/comctl32/listview.c       | 16 +++++++++++-----
 dlls/comctl32/tests/listview.c | 12 ++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 5ba1924cbd7..0243d9a84ce 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -3604,6 +3604,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem)
  */
 static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem)
 {
+    INT nFirst = -1, nLast = -1;
     RANGES selection;
     DWORD old_mask;
     LVITEMW item;
@@ -3655,21 +3656,26 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem)
 	iterator_destroy(&i);
     }
 
-    /* disable per item notifications on LVS_OWNERDATA style
-       FIXME: single LVN_ODSTATECHANGED should be used */
+    /* Disable per item notifications on LVS_OWNERDATA style */
     old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE;
     if (infoPtr->dwStyle & LVS_OWNERDATA)
         infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE;
 
     LISTVIEW_DeselectAllSkipItems(infoPtr, selection);
 
-
     iterator_rangesitems(&i, selection);
-    while(iterator_next(&i))
-	LISTVIEW_SetItemState(infoPtr, i.nItem, &item);
+    while(iterator_next(&i)) {
+        if (nFirst == -1)
+            nFirst = i.nItem;
+        nLast = i.nItem;
+        LISTVIEW_SetItemState(infoPtr, i.nItem, &item);
+    }
     /* this will also destroy the selection */
     iterator_destroy(&i);
 
+    if (infoPtr->dwStyle & LVS_OWNERDATA)
+        LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item);
+
     infoPtr->notify_mask |= old_mask;
     LISTVIEW_SetItemFocus(infoPtr, nItem);
 }
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 2294c3b1487..92415da981d 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -3642,7 +3642,7 @@ static void test_ownerdata_multiselect(void)
     expect(0, res);
     ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX,
                 ownerdata_multiselect_select_0_to_1_odstatechanged_seq,
-                "ownerdata multiselect: select multiple via SHIFT+DOWN", TRUE);
+                "ownerdata multiselect: select multiple via SHIFT+DOWN", FALSE);
     res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0);
     expect(0, res);
     res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
@@ -3670,7 +3670,7 @@ static void test_ownerdata_multiselect(void)
     expect(0, res);
     ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX,
                 ownerdata_multiselect_select_0_to_1_odstatechanged_seq,
-                "ownerdata multiselect: select multiple via SHIFT+CONTROL+DOWN", TRUE);
+                "ownerdata multiselect: select multiple via SHIFT+CONTROL+DOWN", FALSE);
     res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0);
     expect(0, res);
     res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
@@ -3713,7 +3713,7 @@ static void test_ownerdata_multiselect(void)
     expect(0, res);
     ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX,
                 ownerdata_multiselect_select_0_to_2_odstatechanged_seq,
-                "ownerdata multiselect: select multiple after skip via SHIFT+CONTROL+DOWN", TRUE);
+                "ownerdata multiselect: select multiple after skip via SHIFT+CONTROL+DOWN", FALSE);
     res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0);
     expect(0, res);
     res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
@@ -3744,7 +3744,7 @@ static void test_ownerdata_multiselect(void)
     expect(0, res);
     ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX,
                 ownerdata_multiselect_select_3_to_2_odstatechanged_seq,
-                "ownerdata multiselect: select multiple via SHIFT+UP", TRUE);
+                "ownerdata multiselect: select multiple via SHIFT+UP", FALSE);
     res = SendMessageA(hwnd, WM_KEYUP, VK_UP, 0);
     expect(0, res);
     res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
@@ -3772,7 +3772,7 @@ static void test_ownerdata_multiselect(void)
     expect(0, res);
     ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX,
                 ownerdata_multiselect_select_3_to_2_odstatechanged_seq,
-                "ownerdata multiselect: select multiple via SHIFT+CONTROL+UP", TRUE);
+                "ownerdata multiselect: select multiple via SHIFT+CONTROL+UP", FALSE);
     res = SendMessageA(hwnd, WM_KEYUP, VK_UP, 0);
     expect(0, res);
     res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
@@ -3815,7 +3815,7 @@ static void test_ownerdata_multiselect(void)
     expect(0, res);
     ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX,
                 ownerdata_multiselect_select_3_to_1_odstatechanged_seq,
-                "ownerdata multiselect: select multiple after skip via SHIFT+CONTROL+UP", TRUE);
+                "ownerdata multiselect: select multiple after skip via SHIFT+CONTROL+UP", FALSE);
     res = SendMessageA(hwnd, WM_KEYUP, VK_UP, 0);
     expect(0, res);
     res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
-- 
2.36.1