March 2023 - Wine-commits - list.winehq.org

Zhiyi Zhang : winegstreamer: Always check the return value from mf_media_type_from_wg_format().
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: b2c3fce40b222d1fd97823ad3ae301a0dee93e89 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2c3fce40b222d1fd97823ad3ae301… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 1 17:19:48 2022 +0800 winegstreamer: Always check the return value from mf_media_type_from_wg_format(). mf_media_type_from_wg_format() may return NULL. Fix Airborne Kingdom crash at start because WG_AUDIO_FORMAT_UNKNOWN is passed to mf_media_type_from_wg_format(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 6f8990b4318b25709cd90f6e10e8f3fdaa89c4c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/media_source.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5e36ef391da..5f7c6a35f5d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -902,6 +902,12 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) IMFMediaType *base_type = mf_media_type_from_wg_format(&format); GUID base_subtype; + if (!base_type) + { + hr = MF_E_INVALIDMEDIATYPE; + goto done; + } + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); stream_types[0] = base_type; @@ -934,8 +940,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) WG_AUDIO_FORMAT_F32LE, }; - stream_types[0] = mf_media_type_from_wg_format(&format); - type_count = 1; + if ((stream_types[0] = mf_media_type_from_wg_format(&format))) + type_count = 1; for (i = 0; i < ARRAY_SIZE(audio_types); i++) { @@ -944,7 +950,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) continue; new_format = format; new_format.u.audio.format = audio_types[i]; - stream_types[type_count++] = mf_media_type_from_wg_format(&new_format); + if ((stream_types[type_count] = mf_media_type_from_wg_format(&new_format))) + type_count++; } } else

1 0

Angelo Haller : comctl32/listview: Send one deselect all items notification for LVS_OWNERDATA listviews.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 813b704ece756dafacc8f018c1615ec8c3dfa63d URL: https://gitlab.winehq.org/wine/wine/-/commit/813b704ece756dafacc8f018c1615e… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:07 2022 -0500 comctl32/listview: Send one deselect all items notification for LVS_OWNERDATA listviews. Send one deselect all items notification on selection change for LVS_OWNERDATA listviews instead of notifying about each individual item change. Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit 8b392553b32677d25fd3e0fe14f70a5693f3b42c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1b39cf3d41a..5c695c216e5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3404,7 +3404,14 @@ static BOOL LISTVIEW_DeselectAllSkipItems(LISTVIEW_INFO *infoPtr, RANGES toSkip) lvItem.state = 0; lvItem.stateMask = LVIS_SELECTED; - + + /* Only send one deselect all (-1) notification for 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; iterator_rangesitems(&i, ranges_diff(clone, toSkip));

1 0

Angelo Haller : comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: cc6d05fbdf682e01ea788ec1d4a9404c5beb3391 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc6d05fbdf682e01ea788ec1d4a940… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:08 2022 -0500 comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function. Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit 425fd8f80e23e34667697f7032d002da8d10a352) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5c695c216e5..60072558da9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -436,6 +436,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,7 +3564,6 @@ 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; @@ -3585,13 +3585,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; @@ -8894,6 +8889,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.

1 0

Angelo Haller : comctl32/listview: Send LVN_ODSTATECHANGED only for LVS_OWNERDATA listviews.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: eab4d0ad1f344d9178573fd510ab7217b2ab13a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/eab4d0ad1f344d9178573fd510ab72… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:09 2022 -0500 comctl32/listview: Send LVN_ODSTATECHANGED only for LVS_OWNERDATA listviews. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53123 Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit 6c814f81aa3ab1ffdc27837c6b0d7a2c9b445316) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- 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 60072558da9..eb778c323f4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3585,7 +3585,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;

1 0

Angelo Haller : comctl32/listview: Send LVN_ODSTATECHANGED notification for LVS_OWNERDATA listview on selection changes.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 1e7f10d2d93f88ca3adc1af304e8fe30ad74ca2f URL: https://gitlab.winehq.org/wine/wine/-/commit/1e7f10d2d93f88ca3adc1af304e8fe… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:10 2022 -0500 comctl32/listview: Send LVN_ODSTATECHANGED notification for LVS_OWNERDATA listview on selection changes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52534 Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit c73290154297e037d2f9181eba01759e1e13965f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 16 ++++++++++++---- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index eb778c323f4..a20ce36a989 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3608,6 +3608,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; @@ -3659,21 +3660,28 @@ 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); + { + /* Find the range for LVN_ODSTATECHANGED */ + 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 a8589b96a06..13069410ac1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3575,7 +3575,7 @@ static void test_ownerdata_multiselect(void) ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, ownerdata_multiselect_odstatechanged_seq, - "ownerdata select multiple notification", TRUE); + "ownerdata select multiple notification", FALSE); res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res); @@ -3592,7 +3592,7 @@ static void test_ownerdata_multiselect(void) ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, ownerdata_multiselect_odstatechanged_seq, - "ownerdata select multiple notification", TRUE); + "ownerdata select multiple notification", FALSE); res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res);

1 0

Angelo Haller : comctl32/listview: Don't send LVN_ODSTATECHANGED for empty ranges.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 34c2fffb9f04a5d396e8d876e80d0cc0721f1304 URL: https://gitlab.winehq.org/wine/wine/-/commit/34c2fffb9f04a5d396e8d876e80d0c… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:11 2022 -0500 comctl32/listview: Don't send LVN_ODSTATECHANGED for empty ranges. Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit 4d4513bbad6491b7e6cf7cb84fe8fcf2afd20cfe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a20ce36a989..115d75c57a0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8903,6 +8903,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));

1 0

Angelo Haller : comctl32/tests: Add more ownerdata listview tests.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 60d30664cffb3760d97035c154b9dd4d3cad053e URL: https://gitlab.winehq.org/wine/wine/-/commit/60d30664cffb3760d97035c154b9dd… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:06 2022 -0500 comctl32/tests: Add more ownerdata listview tests. Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit ef79843c94e8735a1899cfb7064ce8ed6b343e19) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/listview.c | 184 ++++++++++++++++++++++++++++++++--------- 1 file changed, 143 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 13069410ac1..99c13eeaacf 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -245,11 +245,77 @@ static const struct message ownerdata_deselect_all_parent_seq[] = { { 0 } }; -static const struct message ownerdata_multiselect_odstatechanged_seq[] = { - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, +static const struct message ownerdata_multiselect_select_0_to_1_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_ODSTATECHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_0_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_0_modkey_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_move_0_to_1_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_0_to_2_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ODSTATECHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_3_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 3, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_3_modkey_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 3, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 3, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_3_to_2_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ODSTATECHANGED }, + { WM_NOTIFY, sent|id|wparam, 3, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_move_3_to_2_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, 3, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_3_to_1_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ODSTATECHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, { 0 } }; @@ -3547,6 +3613,52 @@ static void test_ownerdata_multiselect(void) HWND hwnd; DWORD res; LVITEMA item; + unsigned int i; + char buf[256]; + + static const struct + { + BOOL hold_shift; + BOOL hold_control; + UINT press_key; + UINT selected_count; + const char *context; + const struct message *expected; + BOOL todo; + } + key_tests[] = + { + /* First down then up */ + { TRUE, FALSE, VK_DOWN, 2, "select multiple via SHIFT+DOWN", + ownerdata_multiselect_select_0_to_1_odstatechanged_seq, FALSE }, + { TRUE, FALSE, VK_UP, 1, "select one item via SHIFT+UP", + ownerdata_multiselect_select_0_modkey_odstatechanged_seq, TRUE }, + { TRUE, TRUE, VK_DOWN, 2, "select multiple via SHIFT+CONTROL+DOWN", + ownerdata_multiselect_select_0_to_1_odstatechanged_seq, FALSE }, + { TRUE, TRUE, VK_UP, 1, "select one item via SHIFT+CONTROL+UP", + ownerdata_multiselect_select_0_modkey_odstatechanged_seq, TRUE }, + { FALSE, TRUE, VK_DOWN, 1, "keep selection but move cursor via CONTROL+DOWN", + ownerdata_multiselect_move_0_to_1_odstatechanged_seq, FALSE }, + { TRUE, TRUE, VK_DOWN, 3, "select multiple after skip via SHIFT+CONTROL+DOWN", + ownerdata_multiselect_select_0_to_2_odstatechanged_seq, FALSE }, + { FALSE, FALSE, VK_DOWN, 1, "deselect all, select item 3 via DOWN", + ownerdata_multiselect_select_3_odstatechanged_seq, FALSE }, + /* First up then down */ + { TRUE, FALSE, VK_UP, 2, "select multiple via SHIFT+UP", + ownerdata_multiselect_select_3_to_2_odstatechanged_seq, FALSE }, + { TRUE, FALSE, VK_DOWN, 1, "select one item via SHIFT+DOWN", + ownerdata_multiselect_select_3_modkey_odstatechanged_seq, TRUE }, + { TRUE, TRUE, VK_UP, 2, "select multiple via SHIFT+CONTROL+UP", + ownerdata_multiselect_select_3_to_2_odstatechanged_seq, FALSE }, + { TRUE, TRUE, VK_DOWN, 1, "select one item via SHIFT+CONTROL+DOWN", + ownerdata_multiselect_select_3_modkey_odstatechanged_seq, TRUE }, + { FALSE, TRUE, VK_UP, 1, "keep selection but move cursor via CONTROL+UP", + ownerdata_multiselect_move_3_to_2_odstatechanged_seq, FALSE }, + { TRUE, TRUE, VK_UP, 3, "select multiple after skip via SHIFT+CONTROL+UP", + ownerdata_multiselect_select_3_to_1_odstatechanged_seq, FALSE }, + { FALSE, FALSE, VK_UP, 1, "deselect all, select item 0 via UP", + ownerdata_multiselect_select_0_odstatechanged_seq, FALSE }, + }; hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3555,6 +3667,7 @@ static void test_ownerdata_multiselect(void) res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(0, res); + /* Select and focus the first row */ memset(&item, 0, sizeof(item)); item.state = LVIS_SELECTED | LVIS_FOCUSED; item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; @@ -3562,46 +3675,35 @@ static void test_ownerdata_multiselect(void) expect(TRUE, res); res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(1, res); - res = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, 0); expect(0, res); - hold_key(VK_SHIFT); - - flush_sequences(sequences, NUM_MSG_SEQUENCES); - - res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); - expect(0, res); - - ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, - ownerdata_multiselect_odstatechanged_seq, - "ownerdata select multiple notification", FALSE); - - res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); - expect(0, res); - - res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); - expect(2, res); - - hold_key(VK_CONTROL); - - flush_sequences(sequences, NUM_MSG_SEQUENCES); - - res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); - expect(0, res); - - ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, - ownerdata_multiselect_odstatechanged_seq, - "ownerdata select multiple notification", FALSE); - - res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); - expect(0, res); - - release_key(VK_CONTROL); - release_key(VK_SHIFT); - - res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); - expect(3, res); + /* Select/deselect rows using UP/DOWN and SHIFT/CONTROL keys */ + for (i = 0; i < ARRAY_SIZE(key_tests); i++) + { + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + if (key_tests[i].hold_shift) + hold_key(VK_SHIFT); + if (key_tests[i].hold_control) + hold_key(VK_CONTROL); + + res = SendMessageA(hwnd, WM_KEYDOWN, key_tests[i].press_key, 0); + expect(0, res); + sprintf(buf, "ownerdata multiselect: %s", key_tests[i].context); + ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, key_tests[i].expected, + buf, key_tests[i].todo); + res = SendMessageA(hwnd, WM_KEYUP, key_tests[i].press_key, 0); + expect(0, res); + + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(key_tests[i].selected_count, res); + + if (key_tests[i].hold_shift) + release_key(VK_SHIFT); + if (key_tests[i].hold_control) + release_key(VK_CONTROL); + } DestroyWindow(hwnd); }

1 0

Robert Wilhelm : scrrun: Added DateCreated property for IFile.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 9574248ea5e406e9aba9dcd8a2ae0ca52deae736 URL: https://gitlab.winehq.org/wine/wine/-/commit/9574248ea5e406e9aba9dcd8a2ae0c… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Aug 22 08:36:10 2022 +0200 scrrun: Added DateCreated property for IFile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42857 (cherry picked from commit 8eb7843d206d014acf93239d6782a199228472e7) Conflicts: dlls/scrrun/tests/filesystem.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/filesystem.c | 12 +++++++++--- dlls/scrrun/tests/filesystem.c | 8 ++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5d7d42850ab..290a643c29a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2820,11 +2820,17 @@ static HRESULT get_date_from_filetime(const FILETIME *ft, DATE *date) return S_OK; } -static HRESULT WINAPI file_get_DateCreated(IFile *iface, DATE *pdate) +static HRESULT WINAPI file_get_DateCreated(IFile *iface, DATE *date) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pdate); - return E_NOTIMPL; + WIN32_FILE_ATTRIBUTE_DATA attrs; + + TRACE("(%p)->(%p)\n", This, date); + + if (GetFileAttributesExW(This->path, GetFileExInfoStandard, &attrs)) + return get_date_from_filetime(&attrs.ftCreationTime, date); + + return E_FAIL; } static HRESULT WINAPI file_get_DateLastModified(IFile *iface, DATE *date) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index da1ca316382..0d2cc39bad9 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -632,6 +632,14 @@ static void test_GetFile(void) hr = IFileSystem3_GetFile(fs3, path, &file); ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); + hr = IFile_get_DateCreated(file, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + date = 0.0; + hr = IFile_get_DateCreated(file, &date); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(date > 0.0, "got %f\n", date); + hr = IFile_get_DateLastModified(file, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr);

1 0

Alistair Leslie-Hughes : dsdmo: Add Echo FX Support.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: ad33cafe74685ee83ff16ace5da46041da66c3ea URL: https://gitlab.winehq.org/wine/wine/-/commit/ad33cafe74685ee83ff16ace5da460… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 13 11:57:20 2022 +1000 dsdmo: Add Echo FX Support. (cherry picked from commit 6d8279f0ee34a1cbb9463c4f952144d31d082633) Conflicts: dlls/dsdmo/tests/dsdmo.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsdmo/dsdmo.idl | 8 ++++ dlls/dsdmo/main.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 8 ++-- 3 files changed, 110 insertions(+), 3 deletions(-) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index 7f172084828..c8130f8a1ce 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -41,3 +41,11 @@ coclass DirectSoundParamEqDMO {} uuid(87fc0268-9a55-4360-95aa-004a1d9de26c) ] coclass DirectSoundWavesReverbDMO {} + +[ + uuid(ef3e932c-d40b-4f51-8ccf-3f98f1b29d5d), + threading(both), + progid("Microsoft.DirectSoundEchoDMO.1"), + vi_progid("Microsoft.DirectSoundEchoDMO") +] +coclass DirectSoundEchoDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index fa39c28abd7..bc5580df9bc 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -797,6 +797,102 @@ static HRESULT waves_reverb_create(IUnknown *outer, IUnknown **out) return S_OK; } +struct dmo_echofx +{ + struct effect effect; + IDirectSoundFXEcho IDirectSoundFXEcho_iface; +}; + +static inline struct dmo_echofx *impl_from_IDirectSoundFXEcho(IDirectSoundFXEcho *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_echofx, IDirectSoundFXEcho_iface); +} + +static HRESULT WINAPI echofx_QueryInterface(IDirectSoundFXEcho *iface, REFIID iid, void **out) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI echofx_AddRef(IDirectSoundFXEcho *iface) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI echofx_Release(IDirectSoundFXEcho *iface) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI echofx_SetAllParameters(IDirectSoundFXEcho *iface, const DSFXEcho *echo) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + FIXME("(%p) %p\n", effect, echo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI echofx_GetAllParameters(IDirectSoundFXEcho *iface, DSFXEcho *echo) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + FIXME("(%p) %p\n", effect, echo); + + return E_NOTIMPL; +} + +static const struct IDirectSoundFXEchoVtbl echofx_vtbl = +{ + echofx_QueryInterface, + echofx_AddRef, + echofx_Release, + echofx_SetAllParameters, + echofx_GetAllParameters +}; + +static struct dmo_echofx *impl_echo_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_echofx, effect); +} + +static void *echo_query_interface(struct effect *iface, REFIID iid) +{ + struct dmo_echofx *effect = impl_echo_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXEcho)) + return &effect->IDirectSoundFXEcho_iface; + return NULL; +} + +static void echo_destroy(struct effect *iface) +{ + struct dmo_echofx *effect = impl_echo_from_effect(iface); + + free(effect); +} + +static const struct effect_ops echo_ops = +{ + .destroy = echo_destroy, + .query_interface = echo_query_interface, +}; + +static HRESULT echo_create(IUnknown *outer, IUnknown **out) +{ + struct dmo_echofx *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &echo_ops); + object->IDirectSoundFXEcho_iface.lpVtbl = &echofx_vtbl; + + TRACE("Created echo effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct class_factory { IClassFactory IClassFactory_iface; @@ -881,6 +977,7 @@ class_factories[] = {&GUID_DSFX_STANDARD_I3DL2REVERB, {{&class_factory_vtbl}, reverb_create}}, {&GUID_DSFX_STANDARD_PARAMEQ, {{&class_factory_vtbl}, eq_create}}, {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, + {&GUID_DSFX_STANDARD_ECHO, {{&class_factory_vtbl}, echo_create}}, }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 1ecafeb7ceb..db22d5bdecb 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -377,12 +377,14 @@ static void test_echo_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_ECHO, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXEcho, (void **)&echo); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); if (hr != S_OK) return; hr = IDirectSoundFXEcho_GetAllParameters(echo, &params); - ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + return; ok(params.fWetDryMix == 50.0f, "Got %.8e%% wetness.\n", params.fWetDryMix); ok(params.fFeedback == 50.0f, "Got %.8e%% feedback.\n", params.fFeedback); ok(params.fLeftDelay == 500.0f, "Got left delay %.8e ms.\n", params.fLeftDelay); @@ -537,7 +539,7 @@ START_TEST(dsdmo) {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus, TRUE}, {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor, TRUE}, {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion, TRUE}, - {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho, TRUE}, + {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE}, {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb},

1 0

Alistair Leslie-Hughes : dsdmo: Add Compressor FX Support.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 19cae551cddd5db372edff633db000c93e6c09d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/19cae551cddd5db372edff633db000… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 13 15:03:46 2022 +1000 dsdmo: Add Compressor FX Support. (cherry picked from commit 39889f19c3db917703a8b42167ee4084dfa091d7) Conflicts: dlls/dsdmo/tests/dsdmo.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsdmo/dsdmo.idl | 8 ++++ dlls/dsdmo/main.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 8 ++-- 3 files changed, 109 insertions(+), 4 deletions(-) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index c8130f8a1ce..3922b4d6778 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -49,3 +49,11 @@ coclass DirectSoundWavesReverbDMO {} vi_progid("Microsoft.DirectSoundEchoDMO") ] coclass DirectSoundEchoDMO {} + +[ + uuid(ef011f79-4000-406d-87af-bffb3fc39d57), + threading(both), + progid("Microsoft.DirectSoundCompressorDMO.1"), + vi_progid("Microsoft.DirectSoundCompressorDMO") +] +coclass DirectSoundCompressorDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index bc5580df9bc..2f20c53d515 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -893,6 +893,102 @@ static HRESULT echo_create(IUnknown *outer, IUnknown **out) return S_OK; } +struct dmo_compressorfx +{ + struct effect effect; + IDirectSoundFXCompressor IDirectSoundFXCompressor_iface; +}; + +static inline struct dmo_compressorfx *impl_from_IDirectSoundFXCompressor(IDirectSoundFXCompressor *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_compressorfx, IDirectSoundFXCompressor_iface); +} + +static HRESULT WINAPI compressorfx_QueryInterface(IDirectSoundFXCompressor *iface, REFIID iid, void **out) +{ + struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI compressorfx_AddRef(IDirectSoundFXCompressor *iface) +{ + struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI compressorfx_Release(IDirectSoundFXCompressor *iface) +{ + struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI compressorfx_SetAllParameters(IDirectSoundFXCompressor *iface, const DSFXCompressor *compressor) +{ + struct dmo_compressorfx *This = impl_from_IDirectSoundFXCompressor(iface); + FIXME("(%p) %p\n", This, compressor); + + return E_NOTIMPL; +} + +static HRESULT WINAPI compressorfx_GetAllParameters(IDirectSoundFXCompressor *iface, DSFXCompressor *compressor) +{ + struct dmo_compressorfx *This = impl_from_IDirectSoundFXCompressor(iface); + FIXME("(%p) %p\n", This, compressor); + + return E_NOTIMPL; +} + +static const struct IDirectSoundFXCompressorVtbl compressor_vtbl = +{ + compressorfx_QueryInterface, + compressorfx_AddRef, + compressorfx_Release, + compressorfx_SetAllParameters, + compressorfx_GetAllParameters +}; + +static struct dmo_compressorfx *impl_compressor_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_compressorfx, effect); +} + +static void *compressor_query_interface(struct effect *iface, REFIID iid) +{ + struct dmo_compressorfx *effect = impl_compressor_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXCompressor)) + return &effect->IDirectSoundFXCompressor_iface; + return NULL; +} + +static void compressor_destroy(struct effect *iface) +{ + struct dmo_compressorfx *effect = impl_compressor_from_effect(iface); + + free(effect); +} + +static const struct effect_ops compressor_ops = +{ + .destroy = compressor_destroy, + .query_interface = compressor_query_interface, +}; + +static HRESULT compressor_create(IUnknown *outer, IUnknown **out) +{ + struct dmo_compressorfx *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &compressor_ops); + object->IDirectSoundFXCompressor_iface.lpVtbl = &compressor_vtbl; + + TRACE("Created compressor effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct class_factory { IClassFactory IClassFactory_iface; @@ -978,6 +1074,7 @@ class_factories[] = {&GUID_DSFX_STANDARD_PARAMEQ, {{&class_factory_vtbl}, eq_create}}, {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, {&GUID_DSFX_STANDARD_ECHO, {{&class_factory_vtbl}, echo_create}}, + {&GUID_DSFX_STANDARD_COMPRESSOR, {{&class_factory_vtbl}, compressor_create}}, }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index db22d5bdecb..58089a9d2ef 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -327,12 +327,12 @@ static void test_compressor_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_COMPRESSOR, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXCompressor, (void **)&compressor); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectSoundFXCompressor_GetAllParameters(compressor, &params); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); if (hr != S_OK) return; - - hr = IDirectSoundFXCompressor_GetAllParameters(compressor, &params); - ok(hr == S_OK, "Got hr %#x.\n", hr); ok(params.fGain == 0.0f, "Got gain %.8e dB.\n", params.fGain); ok(params.fAttack == 10.0f, "Got attack time %.8e ms.\n", params.fAttack); ok(params.fThreshold == -20.0f, "Got threshold %.8e dB.\n", params.fThreshold); @@ -537,7 +537,7 @@ START_TEST(dsdmo) tests[] = { {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus, TRUE}, - {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor, TRUE}, + {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor}, {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion, TRUE}, {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE},

1 0