[PATCH v3 3/6] comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function.
Angelo Haller
wine-devel at szanni.org
Fri Jun 17 22:08:40 CDT 2022
From: Angelo Haller <angelo at szanni.org>
Signed-off-by: Angelo Haller <angelo at szanni.org>
---
v2: Remove header and change return to VOID.
v3: Comment capitalization and better subject line.
---
dlls/comctl32/listview.c | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 6fc58c933a9..03ce801e4cc 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -437,6 +437,7 @@ static INT LISTVIEW_GetStringWidthT(const LISTVIEW_INFO *, LPCWSTR, BOOL);
static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT, BOOL);
static UINT LISTVIEW_GetItemState(const LISTVIEW_INFO *, INT, UINT);
static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *, INT, const LVITEMW *);
+static VOID LISTVIEW_SetOwnerDataState(LISTVIEW_INFO *, INT, INT, const LVITEMW *);
static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT);
static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *, INT, INT);
static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL);
@@ -3563,16 +3564,11 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem)
INT nFirst = min(infoPtr->nSelectionMark, nItem);
INT nLast = max(infoPtr->nSelectionMark, nItem);
HWND hwndSelf = infoPtr->hwndSelf;
- NMLVODSTATECHANGE nmlv;
DWORD old_mask;
LVITEMW item;
INT i;
- /* Temporarily disable change notification
- * If the control is LVS_OWNERDATA, we need to send
- * only one LVN_ODSTATECHANGED notification.
- * See MSDN documentation for LVN_ITEMCHANGED.
- */
+ /* 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;
@@ -3585,13 +3581,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem)
for (i = nFirst; i <= nLast; i++)
LISTVIEW_SetItemState(infoPtr,i,&item);
- ZeroMemory(&nmlv, sizeof(nmlv));
- nmlv.iFrom = nFirst;
- nmlv.iTo = nLast;
- nmlv.uOldState = 0;
- nmlv.uNewState = item.state;
+ LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item);
- notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv);
if (!IsWindow(hwndSelf))
return FALSE;
infoPtr->notify_mask |= old_mask;
@@ -8956,6 +8947,22 @@ static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, const PO
return LISTVIEW_MoveIconTo(infoPtr, nItem, &Pt, FALSE);
}
+/* Make sure to also disable per item notifications via the notification mask. */
+static VOID LISTVIEW_SetOwnerDataState(LISTVIEW_INFO *infoPtr, INT nFirst, INT nLast, const LVITEMW *item)
+{
+ NMLVODSTATECHANGE nmlv;
+
+ if (!item) return;
+
+ ZeroMemory(&nmlv, sizeof(nmlv));
+ nmlv.iFrom = nFirst;
+ nmlv.iTo = nLast;
+ nmlv.uOldState = 0;
+ nmlv.uNewState = item->state;
+
+ notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv);
+}
+
/***
* DESCRIPTION:
* Sets the state of one or many items.
--
2.36.1
More information about the wine-devel
mailing list