June 2022 - Wine-Devel - list.winehq.org

Wine staging 7.11 release

by Alistair Leslie-Hughes

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.11 (542 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * faudio: Send NOTIFY_CUESTOP when Stop is called. * dwmapi: Fill rateRefresh/rateCompose and qpcRefreshPeriod of DWM_TIMING_INFO from DwmGetCompositionTimingInfo(). * dwmapi: Return S_OK from DwmFlush(). Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

June 18, 2022

Re: [PATCH v3 2/6] comctl32/listview: Fix deselect on LVS_OWNERDATA.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117221 Your paranoid android. === debian11 (32 bit report) === Report validation errors: comctl32:listview prints too much data (35334 bytes) === debian11 (32 bit Arabic:Morocco report) === Report validation errors: comctl32:listview prints too much data (35336 bytes) === debian11 (32 bit German report) === Report validation errors: comctl32:listview prints too much data (35336 bytes) === debian11 (32 bit French report) === Report validation errors: comctl32:listview prints too much data (35336 bytes) === debian11 (32 bit Hebrew:Israel report) === Report validation errors: comctl32:listview prints too much data (35336 bytes) === debian11 (32 bit Hindi:India report) === Report validation errors: comctl32:listview prints too much data (35336 bytes) === debian11 (32 bit Japanese:Japan report) === Report validation errors: comctl32:listview prints too much data (35336 bytes) === debian11 (32 bit Chinese:China report) === Report validation errors: comctl32:listview prints too much data (35334 bytes) === debian11 (32 bit WoW report) === Report validation errors: comctl32:listview prints too much data (35334 bytes) === debian11 (64 bit WoW report) === Report validation errors: comctl32:listview prints too much data (35542 bytes)

June 18, 2022

Re: [PATCH v3 1/6] comctl32/tests: Expand ownerdata listview tests.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117220 Your paranoid android. === debian11 (32 bit report) === Report validation errors: comctl32:listview prints too much data (37148 bytes) === debian11 (32 bit Arabic:Morocco report) === Report validation errors: comctl32:listview prints too much data (37148 bytes) === debian11 (32 bit German report) === Report validation errors: comctl32:listview prints too much data (37148 bytes) === debian11 (32 bit French report) === Report validation errors: comctl32:listview prints too much data (37148 bytes) === debian11 (32 bit Hebrew:Israel report) === Report validation errors: comctl32:listview prints too much data (37148 bytes) === debian11 (32 bit Hindi:India report) === Report validation errors: comctl32:listview prints too much data (37148 bytes) === debian11 (32 bit Japanese:Japan report) === Report validation errors: comctl32:listview prints too much data (37148 bytes) === debian11 (32 bit Chinese:China report) === Report validation errors: comctl32:listview prints too much data (37148 bytes) === debian11 (32 bit WoW report) === Report validation errors: comctl32:listview prints too much data (37148 bytes) === debian11 (64 bit WoW report) === Report validation errors: comctl32:listview prints too much data (37388 bytes)

June 18, 2022

Re: [PATCH v3 4/6] comctl32/listview: Send LVN_ODSTATECHANGED only for virtual lists.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117223 Your paranoid android. === debian11 (32 bit report) === Report validation errors: comctl32:listview prints too much data (35334 bytes) === debian11 (32 bit Chinese:China report) === Report validation errors: comctl32:listview prints too much data (35334 bytes) === debian11 (32 bit WoW report) === Report validation errors: comctl32:listview prints too much data (35334 bytes) === debian11 (64 bit WoW report) === Report validation errors: comctl32:listview prints too much data (35542 bytes)

June 18, 2022

Re: [PATCH v3 3/6] comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117222 Your paranoid android. === debian11 (32 bit report) === Report validation errors: comctl32:listview prints too much data (35334 bytes) === debian11 (32 bit Chinese:China report) === Report validation errors: comctl32:listview prints too much data (35334 bytes) === debian11 (32 bit WoW report) === Report validation errors: comctl32:listview prints too much data (35334 bytes) === debian11 (64 bit WoW report) === Report validation errors: comctl32:listview prints too much data (35542 bytes)

June 18, 2022

[PATCH v3 6/6] comctl32/listview: Send LVN_ODSTATECHANGED only for true ranges.

by Angelo Haller

From: Angelo Haller <angelo(a)szanni.org> Signed-off-by: Angelo Haller <angelo(a)szanni.org> --- dlls/comctl32/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0243d9a84ce..8118a3dd8de 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8959,6 +8959,7 @@ static VOID LISTVIEW_SetOwnerDataState(LISTVIEW_INFO *infoPtr, INT nFirst, INT n { NMLVODSTATECHANGE nmlv; + if (nFirst == nLast) return; if (!item) return; ZeroMemory(&nmlv, sizeof(nmlv)); -- 2.36.1

June 18, 2022

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

by Angelo Haller

From: Angelo Haller <angelo(a)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(a)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

June 18, 2022

[PATCH v3 4/6] comctl32/listview: Send LVN_ODSTATECHANGED only for virtual lists.

by Angelo Haller

From: Angelo Haller <angelo(a)szanni.org> The LVN_ODSTATECHANGED notification should only be sent to lists that have LVS_OWNERDATA set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53123 Signed-off-by: Angelo Haller <angelo(a)szanni.org> --- v3: Add wine bug reference. Use function call guard instead of early return. --- dlls/comctl32/listview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 03ce801e4cc..5ba1924cbd7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3581,7 +3581,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) for (i = nFirst; i <= nLast; i++) LISTVIEW_SetItemState(infoPtr,i,&item); - LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); + if (infoPtr->dwStyle & LVS_OWNERDATA) + LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); if (!IsWindow(hwndSelf)) return FALSE; -- 2.36.1

June 18, 2022

[PATCH v3 3/6] comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function.

by Angelo Haller

From: Angelo Haller <angelo(a)szanni.org> Signed-off-by: Angelo Haller <angelo(a)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

June 18, 2022

[PATCH v3 2/6] comctl32/listview: Fix deselect on LVS_OWNERDATA.

by Angelo Haller

From: Angelo Haller <angelo(a)szanni.org> Send one "deselect all items" notification on selection change for LVS_OWNERDATA listviews instead of notifying about each individual item change. Enable LVS_OWNERDATA multi select tests for wine. Signed-off-by: Angelo Haller <angelo(a)szanni.org> --- v3: Remove double `;;` and clarify comment. Move patch to the front to enable tests in a more fine grained manner. --- dlls/comctl32/listview.c | 6 ++++++ dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 730bf4aaddd..6fc58c933a9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3405,6 +3405,12 @@ static BOOL LISTVIEW_DeselectAllSkipItems(LISTVIEW_INFO *infoPtr, RANGES toSkip) lvItem.state = 0; lvItem.stateMask = LVIS_SELECTED; + + /* Only send one deselect all (-1) notification on LVS_OWNERDATA style */ + if (infoPtr->dwStyle & LVS_OWNERDATA) { + LISTVIEW_SetItemState(infoPtr, -1, &lvItem); + return TRUE; + } /* need to clone the DPA because callbacks can change it */ if (!(clone = ranges_clone(infoPtr->selectionRanges))) return FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0b17fb7c834..2294c3b1487 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3729,7 +3729,7 @@ static void test_ownerdata_multiselect(void) expect(0, res); ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, ownerdata_multiselect_select_3_odstatechanged_seq, - "ownerdata multiselect: deselect all, select item 3 via DOWN", TRUE); + "ownerdata multiselect: deselect all, select item 3 via DOWN", FALSE); res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res); res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); @@ -3831,7 +3831,7 @@ static void test_ownerdata_multiselect(void) expect(0, res); ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, ownerdata_multiselect_select_0_odstatechanged_seq, - "ownerdata multiselect: deselect all, select item 0 via UP", TRUE); + "ownerdata multiselect: deselect all, select item 0 via UP", FALSE); res = SendMessageA(hwnd, WM_KEYUP, VK_UP, 0); expect(0, res); res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); -- 2.36.1

June 18, 2022