[PATCH v2 resend 2/6] comctl32/listview: Move LVN_ODSTATECHANGED notification to function.

[Zhiyi Zhang]

Let's use "comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function." for the subject.

On 5/26/22 04:00, Angelo Haller wrote:
> From: Angelo Haller <angelo at szanni.org>
>
> Signed-off-by: Angelo Haller <angelo at szanni.org>
> ---
> v2: Remove header and change return to VOID.
> ---
>  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 730bf4aaddd..72ade724313 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);
> @@ -3557,16 +3558,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 */

Nitpick. disable -> Disable. There are other places like this.

>      old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE;
>      if (infoPtr->dwStyle & LVS_OWNERDATA)
>          infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE;
> @@ -3579,13 +3575,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;
> @@ -8950,6 +8941,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.