August 2022 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Implement window.matchMedia() with MediaQueryList stub.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: b918a532bc411780b64fc450e03f6fbd66276e47 URL: https://gitlab.winehq.org/wine/wine/-/commit/b918a532bc411780b64fc450e03f6f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 1 17:52:35 2022 +0300 mshtml: Implement window.matchMedia() with MediaQueryList stub. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 10 ++ dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/mshtml_private_iface.idl | 21 ++++ dlls/mshtml/nsiface.idl | 11 +++ dlls/mshtml/omnavigator.c | 187 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 2 + dlls/mshtml/tests/es5.js | 12 +++ 7 files changed, 246 insertions(+), 1 deletion(-)

1 0

Gabriel Ivăncescu : mshtml: Implement MediaQueryList's media prop.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 09b73c89c430b62b17c8b8e769054e93cfd3fdc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/09b73c89c430b62b17c8b8e769054e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 1 17:52:35 2022 +0300 mshtml: Implement MediaQueryList's media prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 6 ++++-- dlls/mshtml/tests/es5.js | 13 ++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 1dcd77ac11e..00f6c72894e 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2742,10 +2742,12 @@ static HRESULT WINAPI media_query_list_Invoke(IWineMSHTMLMediaQueryList *iface, static HRESULT WINAPI media_query_list_get_media(IWineMSHTMLMediaQueryList *iface, BSTR *p) { struct media_query_list *media_query_list = impl_from_IWineMSHTMLMediaQueryList(iface); + nsAString nsstr; - FIXME("(%p)->(%p)\n", media_query_list, p); + TRACE("(%p)->(%p)\n", media_query_list, p); - return E_NOTIMPL; + nsAString_InitDepend(&nsstr, NULL); + return return_nsstr(nsIDOMMediaQueryList_GetMedia(media_query_list->nsquerylist, &nsstr), &nsstr, p); } static HRESULT WINAPI media_query_list_get_matches(IWineMSHTMLMediaQueryList *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 25883bf5757..5f9202b13c6 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -2019,7 +2019,7 @@ sync_test("console", function() { }); sync_test("matchMedia", function() { - var mql; + var i, r, mql; try { mql = window.matchMedia(""); @@ -2027,4 +2027,15 @@ sync_test("matchMedia", function() { var n = ex.number >>> 0; ok(n === E_INVALIDARG, "matchMedia('') threw " + n); } + r = [ + [ undefined, "unknown" ], + [ null, "unknown" ], + [ 42, "not all" ], + [{ toString: function() { return "(max-width: 0px)"; }}, "all and (max-width:0px)" ] + ]; + for(i = 0; i < r.length; i++) { + mql = window.matchMedia(r[i][0]); + todo_wine_if(r[i][0] !== 42). + ok(mql.media === r[i][1], r[i][0] + " media = " + mql.media); + } });

1 0

Gabriel Ivăncescu : mshtml: Implement MediaQueryList's matches prop.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: b9f22f60787a450925c5f0813e04070b355149f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9f22f60787a450925c5f0813e0407… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 1 17:52:36 2022 +0300 mshtml: Implement MediaQueryList's matches prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 10 ++++++++-- dlls/mshtml/tests/es5.js | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 00f6c72894e..42e8149a602 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2753,10 +2753,16 @@ static HRESULT WINAPI media_query_list_get_media(IWineMSHTMLMediaQueryList *ifac static HRESULT WINAPI media_query_list_get_matches(IWineMSHTMLMediaQueryList *iface, VARIANT_BOOL *p) { struct media_query_list *media_query_list = impl_from_IWineMSHTMLMediaQueryList(iface); + nsresult nsres; + cpp_bool b; - FIXME("(%p)->(%p)\n", media_query_list, p); + TRACE("(%p)->(%p)\n", media_query_list, p); - return E_NOTIMPL; + nsres = nsIDOMMediaQueryList_GetMatches(media_query_list->nsquerylist, &b); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + *p = b ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI media_query_list_addListener(IWineMSHTMLMediaQueryList *iface, VARIANT *listener) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 5f9202b13c6..c18639582d0 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -2037,5 +2037,8 @@ sync_test("matchMedia", function() { mql = window.matchMedia(r[i][0]); todo_wine_if(r[i][0] !== 42). ok(mql.media === r[i][1], r[i][0] + " media = " + mql.media); + ok(mql.matches === false, r[i][0] + " matches"); } + mql = window.matchMedia("(max-width: 1000px)"); + ok(mql.matches === true, "(max-width: 1000px) does not match"); });

1 0

Rémi Bernon : winex11.drv: Use a local desired_rect variable when placing displays.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 65b71e858eaeb108dc3934ab424f10b0b1cefbba URL: https://gitlab.winehq.org/wine/wine/-/commit/65b71e858eaeb108dc3934ab424f10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 29 11:07:35 2022 +0200 winex11.drv: Use a local desired_rect variable when placing displays. --- dlls/winex11.drv/display.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 174411c7915..db1628b2c85 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -37,7 +37,6 @@ struct x11drv_display_setting ULONG_PTR id; BOOL placed; RECT new_rect; - RECT desired_rect; DEVMODEW desired_mode; }; @@ -519,11 +518,6 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, displays[display_idx].desired_mode = current_mode; } - SetRect(&displays[display_idx].desired_rect, - displays[display_idx].desired_mode.dmPosition.x, - displays[display_idx].desired_mode.dmPosition.y, - displays[display_idx].desired_mode.dmPosition.x + displays[display_idx].desired_mode.dmPelsWidth, - displays[display_idx].desired_mode.dmPosition.y + displays[display_idx].desired_mode.dmPelsHeight); lstrcpyW(displays[display_idx].desired_mode.dmDeviceName, display_device.DeviceName); } @@ -541,6 +535,11 @@ static INT offset_length(POINT offset) return offset.x * offset.x + offset.y * offset.y; } +static void set_rect_from_devmode(RECT *rect, const DEVMODEW *mode) +{ + SetRect(rect, mode->dmPosition.x, mode->dmPosition.y, mode->dmPosition.x + mode->dmPelsWidth, mode->dmPosition.y + mode->dmPelsHeight); +} + /* Check if a rect overlaps with placed display rects */ static BOOL overlap_placed_displays(const RECT *rect, const struct x11drv_display_setting *displays, INT display_count) { @@ -562,11 +561,13 @@ static POINT get_placement_offset(const struct x11drv_display_setting *displays, POINT points[8], left_top, offset, min_offset = {0, 0}; INT display_idx, point_idx, point_count, vertex_idx; BOOL has_placed = FALSE, first = TRUE; + RECT desired_rect, rect; INT width, height; - RECT rect; + + set_rect_from_devmode(&desired_rect, &displays[placing_idx].desired_mode); /* If the display to be placed is detached, no offset is needed to place it */ - if (IsRectEmpty(&displays[placing_idx].desired_rect)) + if (IsRectEmpty(&desired_rect)) return min_offset; /* If there is no placed and attached display, place this display as it is */ @@ -584,8 +585,8 @@ static POINT get_placement_offset(const struct x11drv_display_setting *displays, /* Try to place this display with each of its four vertices at every vertex of the placed * displays and see which combination has the minimum offset length */ - width = displays[placing_idx].desired_rect.right - displays[placing_idx].desired_rect.left; - height = displays[placing_idx].desired_rect.bottom - displays[placing_idx].desired_rect.top; + width = desired_rect.right - desired_rect.left; + height = desired_rect.bottom - desired_rect.top; for (display_idx = 0; display_idx < display_count; ++display_idx) { @@ -604,21 +605,21 @@ static POINT get_placement_offset(const struct x11drv_display_setting *displays, point_count = 4; /* Intersected points when moving the display to be placed horizontally */ - if (displays[placing_idx].desired_rect.bottom >= displays[display_idx].new_rect.top && - displays[placing_idx].desired_rect.top <= displays[display_idx].new_rect.bottom) + if (desired_rect.bottom >= displays[display_idx].new_rect.top && + desired_rect.top <= displays[display_idx].new_rect.bottom) { points[point_count].x = displays[display_idx].new_rect.left; - points[point_count++].y = displays[placing_idx].desired_rect.top; + points[point_count++].y = desired_rect.top; points[point_count].x = displays[display_idx].new_rect.right; - points[point_count++].y = displays[placing_idx].desired_rect.top; + points[point_count++].y = desired_rect.top; } /* Intersected points when moving the display to be placed vertically */ - if (displays[placing_idx].desired_rect.left <= displays[display_idx].new_rect.right && - displays[placing_idx].desired_rect.right >= displays[display_idx].new_rect.left) + if (desired_rect.left <= displays[display_idx].new_rect.right && + desired_rect.right >= displays[display_idx].new_rect.left) { - points[point_count].x = displays[placing_idx].desired_rect.left; + points[point_count].x = desired_rect.left; points[point_count++].y = displays[display_idx].new_rect.top; - points[point_count].x = displays[placing_idx].desired_rect.left; + points[point_count].x = desired_rect.left; points[point_count++].y = displays[display_idx].new_rect.bottom; } @@ -651,9 +652,9 @@ static POINT get_placement_offset(const struct x11drv_display_setting *displays, break; } - offset.x = left_top.x - displays[placing_idx].desired_rect.left; - offset.y = left_top.y - displays[placing_idx].desired_rect.top; - rect = displays[placing_idx].desired_rect; + offset.x = left_top.x - desired_rect.left; + offset.y = left_top.y - desired_rect.top; + rect = desired_rect; OffsetRect(&rect, offset.x, offset.y); if (!overlap_placed_displays(&rect, displays, display_count)) { @@ -702,7 +703,7 @@ static void place_all_displays(struct x11drv_display_setting *displays, INT disp if (placing_idx == -1) break; - displays[placing_idx].new_rect = displays[placing_idx].desired_rect; + set_rect_from_devmode(&displays[placing_idx].new_rect, &displays[placing_idx].desired_mode); OffsetRect(&displays[placing_idx].new_rect, min_offset.x, min_offset.y); displays[placing_idx].placed = TRUE; }

1 0

Rémi Bernon : winex11.drv: Use DM_POSITION field bit to mark placed displays.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: d621a7a3e3fddc7528e3a0c95be4aba66a3b133a URL: https://gitlab.winehq.org/wine/wine/-/commit/d621a7a3e3fddc7528e3a0c95be4ab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 29 11:13:16 2022 +0200 winex11.drv: Use DM_POSITION field bit to mark placed displays. --- dlls/winex11.drv/display.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index db1628b2c85..3319697e51f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -35,7 +35,6 @@ static struct x11drv_settings_handler settings_handler; struct x11drv_display_setting { ULONG_PTR id; - BOOL placed; RECT new_rect; DEVMODEW desired_mode; }; @@ -548,7 +547,7 @@ static BOOL overlap_placed_displays(const RECT *rect, const struct x11drv_displa for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (displays[display_idx].placed && + if ((displays[display_idx].desired_mode.dmFields & DM_POSITION) && intersect_rect(&intersect, &displays[display_idx].new_rect, rect)) return TRUE; } @@ -573,7 +572,7 @@ static POINT get_placement_offset(const struct x11drv_display_setting *displays, /* If there is no placed and attached display, place this display as it is */ for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (displays[display_idx].placed && !IsRectEmpty(&displays[display_idx].new_rect)) + if ((displays[display_idx].desired_mode.dmFields & DM_POSITION) && !IsRectEmpty(&displays[display_idx].new_rect)) { has_placed = TRUE; break; @@ -590,7 +589,7 @@ static POINT get_placement_offset(const struct x11drv_display_setting *displays, for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (!displays[display_idx].placed || IsRectEmpty(&displays[display_idx].new_rect)) + if (!(displays[display_idx].desired_mode.dmFields & DM_POSITION) || IsRectEmpty(&displays[display_idx].new_rect)) continue; /* Get four vertices of the placed display rectangle */ @@ -681,6 +680,9 @@ static void place_all_displays(struct x11drv_display_setting *displays, INT disp INT placing_idx, display_idx; POINT min_offset, offset; + for (display_idx = 0; display_idx < display_count; ++display_idx) + displays[display_idx].desired_mode.dmFields &= ~DM_POSITION; + /* Place all displays with no extra space between them and no overlapping */ while (1) { @@ -688,7 +690,7 @@ static void place_all_displays(struct x11drv_display_setting *displays, INT disp placing_idx = -1; for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (displays[display_idx].placed) + if (displays[display_idx].desired_mode.dmFields & DM_POSITION) continue; offset = get_placement_offset(displays, display_count, display_idx); @@ -705,7 +707,7 @@ static void place_all_displays(struct x11drv_display_setting *displays, INT disp set_rect_from_devmode(&displays[placing_idx].new_rect, &displays[placing_idx].desired_mode); OffsetRect(&displays[placing_idx].new_rect, min_offset.x, min_offset.y); - displays[placing_idx].placed = TRUE; + displays[placing_idx].desired_mode.dmFields |= DM_POSITION; } for (display_idx = 0; display_idx < display_count; ++display_idx)

1 0

Rémi Bernon : winex11.drv: Update devmode dmPosition instead of new_rect.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: cd0b4393e5e0c2b7ec2e5824fb3dce44380ac401 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd0b4393e5e0c2b7ec2e5824fb3dce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 29 11:21:09 2022 +0200 winex11.drv: Update devmode dmPosition instead of new_rect. --- dlls/winex11.drv/display.c | 55 ++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 3319697e51f..55962138b50 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -35,7 +35,6 @@ static struct x11drv_settings_handler settings_handler; struct x11drv_display_setting { ULONG_PTR id; - RECT new_rect; DEVMODEW desired_mode; }; @@ -547,8 +546,9 @@ static BOOL overlap_placed_displays(const RECT *rect, const struct x11drv_displa for (display_idx = 0; display_idx < display_count; ++display_idx) { + set_rect_from_devmode(&intersect, &displays[display_idx].desired_mode); if ((displays[display_idx].desired_mode.dmFields & DM_POSITION) && - intersect_rect(&intersect, &displays[display_idx].new_rect, rect)) + intersect_rect(&intersect, &intersect, rect)) return TRUE; } return FALSE; @@ -572,7 +572,8 @@ static POINT get_placement_offset(const struct x11drv_display_setting *displays, /* If there is no placed and attached display, place this display as it is */ for (display_idx = 0; display_idx < display_count; ++display_idx) { - if ((displays[display_idx].desired_mode.dmFields & DM_POSITION) && !IsRectEmpty(&displays[display_idx].new_rect)) + set_rect_from_devmode(&rect, &displays[display_idx].desired_mode); + if ((displays[display_idx].desired_mode.dmFields & DM_POSITION) && !IsRectEmpty(&rect)) { has_placed = TRUE; break; @@ -589,37 +590,38 @@ static POINT get_placement_offset(const struct x11drv_display_setting *displays, for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (!(displays[display_idx].desired_mode.dmFields & DM_POSITION) || IsRectEmpty(&displays[display_idx].new_rect)) + set_rect_from_devmode(&rect, &displays[display_idx].desired_mode); + if (!(displays[display_idx].desired_mode.dmFields & DM_POSITION) || IsRectEmpty(&rect)) continue; /* Get four vertices of the placed display rectangle */ - points[0].x = displays[display_idx].new_rect.left; - points[0].y = displays[display_idx].new_rect.top; - points[1].x = displays[display_idx].new_rect.left; - points[1].y = displays[display_idx].new_rect.bottom; - points[2].x = displays[display_idx].new_rect.right; - points[2].y = displays[display_idx].new_rect.top; - points[3].x = displays[display_idx].new_rect.right; - points[3].y = displays[display_idx].new_rect.bottom; + points[0].x = rect.left; + points[0].y = rect.top; + points[1].x = rect.left; + points[1].y = rect.bottom; + points[2].x = rect.right; + points[2].y = rect.top; + points[3].x = rect.right; + points[3].y = rect.bottom; point_count = 4; /* Intersected points when moving the display to be placed horizontally */ - if (desired_rect.bottom >= displays[display_idx].new_rect.top && - desired_rect.top <= displays[display_idx].new_rect.bottom) + if (desired_rect.bottom >= rect.top && + desired_rect.top <= rect.bottom) { - points[point_count].x = displays[display_idx].new_rect.left; + points[point_count].x = rect.left; points[point_count++].y = desired_rect.top; - points[point_count].x = displays[display_idx].new_rect.right; + points[point_count].x = rect.right; points[point_count++].y = desired_rect.top; } /* Intersected points when moving the display to be placed vertically */ - if (desired_rect.left <= displays[display_idx].new_rect.right && - desired_rect.right >= displays[display_idx].new_rect.left) + if (desired_rect.left <= rect.right && + desired_rect.right >= rect.left) { points[point_count].x = desired_rect.left; - points[point_count++].y = displays[display_idx].new_rect.top; + points[point_count++].y = rect.top; points[point_count].x = desired_rect.left; - points[point_count++].y = displays[display_idx].new_rect.bottom; + points[point_count++].y = rect.bottom; } /* Try moving each vertex of the display rectangle to each points */ @@ -705,17 +707,12 @@ static void place_all_displays(struct x11drv_display_setting *displays, INT disp if (placing_idx == -1) break; - set_rect_from_devmode(&displays[placing_idx].new_rect, &displays[placing_idx].desired_mode); - OffsetRect(&displays[placing_idx].new_rect, min_offset.x, min_offset.y); + displays[placing_idx].desired_mode.dmPosition.x += min_offset.x; + displays[placing_idx].desired_mode.dmPosition.y += min_offset.y; displays[placing_idx].desired_mode.dmFields |= DM_POSITION; - } - for (display_idx = 0; display_idx < display_count; ++display_idx) - { - displays[display_idx].desired_mode.dmPosition.x = displays[display_idx].new_rect.left; - displays[display_idx].desired_mode.dmPosition.y = displays[display_idx].new_rect.top; - left_most = min(left_most, displays[display_idx].new_rect.left); - top_most = min(top_most, displays[display_idx].new_rect.top); + left_most = min(left_most, displays[placing_idx].desired_mode.dmPosition.x); + top_most = min(top_most, displays[placing_idx].desired_mode.dmPosition.y); } /* Convert virtual screen coordinates to root coordinates */

1 0

Rémi Bernon : winex11.drv: Use DEVMODEW instead of x11drv_display_setting.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 581b30d3180f0898be6d8af8aa90002795c365a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/581b30d3180f0898be6d8af8aa9000… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 29 11:55:52 2022 +0200 winex11.drv: Use DEVMODEW instead of x11drv_display_setting. Keeping the id in the dmDriverExtra bytes. --- dlls/winex11.drv/display.c | 106 +++++++++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 43 deletions(-)

1 0

Rémi Bernon : winex11.drv: Iterate display settings using dmDriverExtra.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 395273d6e10a478dbbb974766c15634af6ddc4f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/395273d6e10a478dbbb974766c1563… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 29 15:32:05 2022 +0200 winex11.drv: Iterate display settings using dmDriverExtra. --- dlls/winex11.drv/display.c | 93 ++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 57 deletions(-)

1 0

Rémi Bernon : mf/tests: Add required SAR media type attributes tests.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 3dbb6c7470b7a54e078763501c0db38e4040b047 URL: https://gitlab.winehq.org/wine/wine/-/commit/3dbb6c7470b7a54e078763501c0db3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 29 17:48:16 2022 +0200 mf/tests: Add required SAR media type attributes tests. --- dlls/mf/tests/mf.c | 74 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 17 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 996829c5e9a..c3d80c3dccc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4434,6 +4434,29 @@ static void check_sar_rate_support(IMFMediaSink *sink) static void test_sar(void) { + static const struct attribute_desc input_type_desc_48000[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 8 * 48000), + {0}, + }; + static const struct attribute_desc input_type_desc_44100[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 8 * 44100), + {0}, + }; + IMFPresentationClock *present_clock, *present_clock2; IMFMediaType *mediatype, *mediatype2, *mediatype3; IMFClockStateSink *state_sink, *state_sink2; @@ -4443,17 +4466,16 @@ static void test_sar(void) IMFAudioStreamVolume *stream_volume; IMFMediaSink *sink, *sink2; IMFStreamSink *stream_sink; + UINT32 channel_count, rate; IMFAttributes *attributes; - DWORD i, id, flags, count; + DWORD id, flags, count; IMFActivate *activate; - UINT32 channel_count; MFCLOCK_STATE state; IMFClock *clock; IUnknown *unk; HRESULT hr; GUID guid; BOOL mute; - int found; LONG ref; hr = CoInitialize(NULL); @@ -4613,21 +4635,40 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Failed to get type count, hr %#lx.\n", hr); ok(!!count, "Unexpected type count %lu.\n", count); - /* A number of same major/subtype entries are returned, with different degrees of finer format - details. Some incomplete types are not accepted, check that at least one of them is considered supported. */ + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, count, &mediatype); + todo_wine + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &mediatype); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(rate == 48000 || rate == 44100, "got rate %u.\n", rate); + IMFMediaType_Release(mediatype); - for (i = 0, found = -1; i < count; ++i) - { - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, i, &mediatype); - ok(hr == S_OK, "Failed to get media type, hr %#lx.\n", hr); - if (SUCCEEDED(IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL))) - found = i; - IMFMediaType_Release(mediatype); + /* check required output media type attributes */ - if (found != -1) break; + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + todo_wine + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + init_media_type(mediatype, rate == 44100 ? input_type_desc_44100 : input_type_desc_48000, 2); + for (int i = 1; i < (rate == 44100 ? ARRAY_SIZE(input_type_desc_44100) : ARRAY_SIZE(input_type_desc_48000)) - 1; ++i) + { + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + todo_wine + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); + init_media_type(mediatype, rate == 44100 ? input_type_desc_44100 : input_type_desc_48000, i + 1); } - ok(found != -1, "Haven't found a supported type.\n"); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + init_media_type(mediatype, rate == 44100 ? input_type_desc_44100 : input_type_desc_48000, -1); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFMediaType_Release(mediatype); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype); ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); @@ -4652,10 +4693,9 @@ if (SUCCEEDED(hr)) hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype); ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, found, &mediatype2); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, count - 1, &mediatype2); ok(hr == S_OK, "Failed to get media type, hr %#lx.\n", hr); - - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, found, &mediatype3); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, count - 1, &mediatype3); ok(hr == S_OK, "Failed to get media type, hr %#lx.\n", hr); ok(mediatype2 == mediatype3, "Unexpected instance.\n"); IMFMediaType_Release(mediatype3);

1 0

Rémi Bernon : mf: Return MF_E_NO_MORE_TYPE from AudioRenderer GetMediaTypeByIndex.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 180572129fb9ad5ca736ac1ba5d78094dc2c68db URL: https://gitlab.winehq.org/wine/wine/-/commit/180572129fb9ad5ca736ac1ba5d780… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 29 17:34:29 2022 +0200 mf: Return MF_E_NO_MORE_TYPE from AudioRenderer GetMediaTypeByIndex. --- dlls/mf/sar.c | 9 ++++----- dlls/mf/tests/mf.c | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 5504cc17472..2aabb1fe10f 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1531,12 +1531,11 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeByIndex(IMF TRACE("%p, %lu, %p.\n", iface, index, media_type); - if (index == 0) - { - *media_type = renderer->media_type; - IMFMediaType_AddRef(*media_type); - } + if (index > 0) + return MF_E_NO_MORE_TYPES; + *media_type = renderer->media_type; + IMFMediaType_AddRef(*media_type); return S_OK; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c3d80c3dccc..4638edbec76 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4636,7 +4636,6 @@ if (SUCCEEDED(hr)) ok(!!count, "Unexpected type count %lu.\n", count); hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, count, &mediatype); - todo_wine ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &mediatype);

1 0