May 2021 - Wine-commits - list.winehq.org

Zhiyi Zhang : winex11.drv: Always add MWM_FUNC_CLOSE to enabled windows.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 211da181c9140541ab7f7fcfa479367b3f7783eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=211da181c9140541ab7f7fcf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 31 16:05:03 2021 +0800 winex11.drv: Always add MWM_FUNC_CLOSE to enabled windows. Some window managers require MWM_FUNC_CLOSE to be present for a window to be allowed to close. For example, on KWin, a window of style WS_POPUP | WS_VISIBLE has a close button drawn on top of its taskbar preview. But when you press it, the window manager refuses to close it. On Mutter, windows without MWN_FUNC_CLOSE doesn't have a close button on the window preview. On Windows 10, enabled windows without WS_SYSMENU always has a close button on their taskbar window preview and can always be closed with the close button. On Windows 7, enabled windows without WS_SYSMENU has no close button on the window preview but still can be closed with the right-click menu on the taskbar. This patch changes the behavior to match that of Windows 10. Fix WeChat image preview window cannot be closed from KDE panels. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 386f21c85d4..4e856a41865 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -749,9 +749,9 @@ static void set_mwm_hints( struct x11drv_win_data *data, DWORD style, DWORD ex_s if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; if (!(style & WS_DISABLED)) { + mwm_hints.functions |= MWM_FUNC_CLOSE; if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; - if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; /* The window can be programmatically minimized even without a minimize box button. Allow the WM to restore it. */

1 0

Hugh McMaster : reg: Fail if the source and destination keys are the same when copying.
by Alexandre Julliard 31 May '21

31 May '21

1 0

Nikolay Sivov : mf/topology: Implement MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES connection method.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 33ea3fc8060b55b074a6234c3cb681685a023580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ea3fc8060b55b074a6234c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:28:45 2021 +0300 mf/topology: Implement MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES connection method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 99 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 81 insertions(+), 18 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index bbed2cba893..a054eca27e1 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2010,7 +2010,10 @@ struct connect_context IMFTopologyNode *upstream_node; IMFTopologyNode *sink; IMFMediaTypeHandler *sink_handler; - const GUID *converter_category; + unsigned int output_index; + unsigned int input_index; + GUID converter_category; + GUID decoder_category; }; typedef HRESULT (*p_connect_func)(struct transform_output_type *output_type, struct connect_context *context); @@ -2142,7 +2145,7 @@ static HRESULT connect_to_converter(struct transform_output_type *output_type, s sink_ctx = *context; sink_ctx.upstream_node = node; - if (SUCCEEDED(hr = topology_loader_enumerate_output_types(context->converter_category, output_type->type, + if (SUCCEEDED(hr = topology_loader_enumerate_output_types(&context->converter_category, output_type->type, connect_to_sink, &sink_ctx))) { hr = IMFTopology_AddNode(context->context->output_topology, node); @@ -2225,13 +2228,62 @@ static HRESULT topology_loader_get_mft_categories(IMFMediaTypeHandler *handler, return S_OK; } +static HRESULT topology_loader_connect(IMFMediaTypeHandler *sink_handler, unsigned int sink_method, + struct connect_context *sink_ctx, struct connect_context *convert_ctx, IMFMediaType *media_type) +{ + HRESULT hr; + + if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(sink_handler, media_type, NULL)) + && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(sink_handler, media_type))) + { + hr = IMFTopologyNode_ConnectOutput(sink_ctx->upstream_node, sink_ctx->output_index, sink_ctx->sink, sink_ctx->input_index); + } + + if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_CONVERTER) + { + hr = topology_loader_enumerate_output_types(&convert_ctx->converter_category, media_type, connect_to_sink, sink_ctx); + } + + if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_DECODER) + { + hr = topology_loader_enumerate_output_types(&convert_ctx->decoder_category, media_type, + connect_to_converter, convert_ctx); + } + + return hr; +} + +static HRESULT topology_loader_foreach_source_type(IMFMediaTypeHandler *sink_handler, IMFMediaTypeHandler *source_handler, + unsigned int sink_method, struct connect_context *sink_ctx, struct connect_context *convert_ctx) +{ + unsigned int index = 0; + IMFMediaType *media_type; + HRESULT hr; + + while (SUCCEEDED(hr = IMFMediaTypeHandler_GetMediaTypeByIndex(source_handler, index++, &media_type))) + { + hr = topology_loader_connect(sink_handler, sink_method, sink_ctx, convert_ctx, media_type); + if (SUCCEEDED(hr)) break; + IMFMediaType_Release(media_type); + media_type = NULL; + } + + if (media_type) + { + hr = IMFMediaTypeHandler_SetCurrentMediaType(source_handler, media_type); + IMFMediaType_Release(media_type); + } + + return hr; +} + static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context *context, IMFTopologyNode *source, unsigned int output_index, IMFTopologyNode *sink, unsigned int input_index) { IMFMediaTypeHandler *source_handler = NULL, *sink_handler = NULL; struct connect_context convert_ctx, sink_ctx; MF_CONNECT_METHOD source_method, sink_method; - GUID decode_cat, convert_cat; + unsigned int enumerate_source_types = 0; IMFMediaType *media_type; HRESULT hr; @@ -2248,35 +2300,46 @@ static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context if (FAILED(IMFTopologyNode_GetUINT32(sink, &MF_TOPONODE_CONNECT_METHOD, &sink_method))) sink_method = MF_CONNECT_ALLOW_DECODER; - if (FAILED(hr = topology_loader_get_mft_categories(source_handler, &decode_cat, &convert_cat))) - goto done; - sink_ctx.context = context; sink_ctx.upstream_node = source; sink_ctx.sink = sink; sink_ctx.sink_handler = sink_handler; + sink_ctx.output_index = output_index; + sink_ctx.input_index = input_index; convert_ctx = sink_ctx; - convert_ctx.converter_category = &convert_cat; + if (FAILED(hr = topology_loader_get_mft_categories(source_handler, &convert_ctx.decoder_category, + &convert_ctx.converter_category))) + goto done; - if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(source_handler, &media_type))) + IMFTopology_GetUINT32(context->output_topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, &enumerate_source_types); + + if (enumerate_source_types) { - /* Direct connection. */ - if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(sink_handler, media_type, NULL)) - && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(sink_handler, media_type))) + if (source_method & MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES) { - hr = IMFTopologyNode_ConnectOutput(source, output_index, sink, input_index); + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_DECODER, + &sink_ctx, &convert_ctx); } - if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_CONVERTER) + else { - hr = topology_loader_enumerate_output_types(&convert_cat, media_type, connect_to_sink, &sink_ctx); + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_DIRECT, + &sink_ctx, &convert_ctx); + if (FAILED(hr)) + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_CONVERTER, + &sink_ctx, &convert_ctx); + if (FAILED(hr)) + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_DECODER, + &sink_ctx, &convert_ctx); } - if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_DECODER) + } + else + { + if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(source_handler, &media_type))) { - hr = topology_loader_enumerate_output_types(&decode_cat, media_type, connect_to_converter, &convert_ctx); + hr = topology_loader_connect(sink_handler, sink_method, &sink_ctx, &convert_ctx, media_type); + IMFMediaType_Release(media_type); } - - IMFMediaType_Release(media_type); } done:

1 0

Nikolay Sivov : mfmediaengine: Add missing initialization of vertex buffer components (Coverity).
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: c7339d62813b9b911c746160350b1bfc6172758f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7339d62813b9b911c746160… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:29:36 2021 +0300 mfmediaengine: Add missing initialization of vertex buffer components (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4f01f6ddada..510b1c5885f 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2054,15 +2054,19 @@ static HRESULT media_engine_transfer_to_d3d11_texture(struct media_engine *engin quad[0].x = 2.0f * rect.left / desc.Width - 1.0f; quad[0].y = -2.0f * rect.bottom / desc.Height + 1.0f; + quad[0].z = 0.0f; quad[1].x = quad[0].x; quad[1].y = -2.0f * rect.top / desc.Height + 1.0f; + quad[1].z = 0.0f; quad[2].x = 2.0f * rect.right / desc.Width - 1.0f; quad[2].y = quad[0].y; + quad[2].z = 0.0f; quad[3].x = quad[2].x; quad[3].y = quad[1].y; + quad[3].z = 0.0f; set_rect(&dst, dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom); }

1 0

Nikolay Sivov : propsys: Add support for VT_VECTOR|VT_UI1 type in PropVariantCompareEx().
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: e91b05bb5be6fd70a767bea9991e818a49cc5547 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91b05bb5be6fd70a767bea9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:31:11 2021 +0300 propsys: Add support for VT_VECTOR|VT_UI1 type in PropVariantCompareEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 13 +++++++- dlls/propsys/tests/propsys.c | 75 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index a18d83eabab..977fbebb918 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -798,7 +798,10 @@ static BOOL isemptyornull(const PROPVARIANT *propvar) if (propvar->vt == VT_CLSID) return !propvar->puuid; - /* FIXME: vectors, byrefs, errors? */ + if (propvar->vt & VT_VECTOR) + return !propvar->caub.cElems; + + /* FIXME: byrefs, errors? */ return FALSE; } @@ -807,6 +810,7 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 { const PROPVARIANT *propvar2_converted; PROPVARIANT propvar2_static; + unsigned int count; HRESULT hr; INT res=-1; @@ -894,6 +898,13 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 res = memcmp(propvar1->puuid, propvar2->puuid, sizeof(*propvar1->puuid)); if (res) res = res > 0 ? 1 : -1; break; + case VT_VECTOR | VT_UI1: + count = min(propvar1->caub.cElems, propvar2->caub.cElems); + res = count ? memcmp(propvar1->caub.pElems, propvar2->caub.pElems, sizeof(*propvar1->caub.pElems) * count) : 0; + if (res) res = res > 0 ? 1 : -1; + if (!res && propvar1->caub.cElems != propvar2->caub.cElems) + res = propvar1->caub.cElems > propvar2->caub.cElems ? 1 : -1; + break; default: FIXME("vartype %#x not handled\n", propvar1->vt); res = -1; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 07d035376d9..9ffa048a8b7 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -666,15 +666,18 @@ static void test_PropVariantToStringAlloc(void) CoTaskMemFree(str); } -static void test_PropVariantCompare(void) +static void test_PropVariantCompareEx(void) { PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b; PROPVARIANT clsid_null, clsid, clsid2, r4_0, r4_2, r8_0, r8_2; + PROPVARIANT var1, var2; INT res; static const WCHAR str_2W[] = {'2', 0}; static const WCHAR str_02W[] = {'0', '2', 0}; static const WCHAR str_bW[] = {'b', 0}; SAFEARRAY emptysafearray; + unsigned char bytevector1[] = {1,2,3}; + unsigned char bytevector2[] = {4,5,6}; PropVariantInit(&empty); PropVariantInit(&null); @@ -847,6 +850,74 @@ todo_wine res = PropVariantCompareEx(&r8_2, &r8_0, 0, 0); ok(res == 1, "res=%i\n", res); + /* VT_VECTOR | VT_UI1 */ + var1.vt = VT_VECTOR | VT_UI1; + var1.caub.cElems = 1; + var1.caub.pElems = bytevector1; + var2.vt = VT_VECTOR | VT_UI1; + var2.caub.cElems = 1; + var2.caub.pElems = bytevector2; + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + /* Vector length mismatch */ + var1.caub.cElems = 2; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.pElems = bytevector2; + var2.caub.pElems = bytevector1; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.pElems = bytevector1; + var2.caub.pElems = bytevector2; + + var1.caub.cElems = 1; + var2.caub.cElems = 2; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + /* Length mismatch over same data */ + var1.caub.pElems = bytevector1; + var2.caub.pElems = bytevector1; + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.cElems = 1; + var2.caub.cElems = 1; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 0, "res=%i\n", res); + + var1.caub.cElems = 0; + res = PropVariantCompareEx(&var1, &var2, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == 1, "res=%i\n", res); + res = PropVariantCompareEx(&var2, &var1, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var2.caub.cElems = 0; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 0, "res=%i\n", res); + SysFreeString(str_2.bstrVal); SysFreeString(str_02.bstrVal); SysFreeString(str_b.bstrVal); @@ -1957,7 +2028,7 @@ START_TEST(propsys) test_InitPropVariantFromBuffer(); test_PropVariantToGUID(); test_PropVariantToStringAlloc(); - test_PropVariantCompare(); + test_PropVariantCompareEx(); test_intconversions(); test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean();

1 0

Nikolay Sivov : evr/mixer: Set aperture attributes for output type candidates.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 5d83662217364447dab7278610068e055673d510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d83662217364447dab72786… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:31:12 2021 +0300 evr/mixer: Set aperture attributes for output type candidates. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c18bf0450bf..187a13be364 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -664,6 +664,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const unsigned int i, j, format_count, count; struct rt_format *rt_formats = NULL, *ptr; HRESULT hr = MF_E_INVALIDMEDIATYPE; + MFVideoArea aperture; D3DFORMAT *formats; GUID subtype; @@ -691,29 +692,32 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (count && !(flags & MFT_SET_TYPE_TEST_ONLY)) { + if (!(mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) + { + free(rt_formats); + return E_OUTOFMEMORY; + } + memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); - if ((mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) + memset(&aperture, 0, sizeof(aperture)); + aperture.Area.cx = video_desc->SampleWidth; + aperture.Area.cy = video_desc->SampleHeight; + for (i = 0; i < count; ++i) { - for (i = 0; i < count; ++i) - { - IMFMediaType *rt_media_type; + IMFMediaType *rt_media_type; - subtype.Data1 = rt_formats[i].format; - mixer->output.rt_formats[i] = rt_formats[i]; + subtype.Data1 = rt_formats[i].format; + mixer->output.rt_formats[i] = rt_formats[i]; - MFCreateMediaType(&rt_media_type); - IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)rt_media_type); - IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); + MFCreateMediaType(&rt_media_type); + IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)rt_media_type); + IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); + IMFMediaType_SetBlob(rt_media_type, &MF_MT_GEOMETRIC_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); + IMFMediaType_SetBlob(rt_media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); - mixer->output.rt_formats[i].media_type = rt_media_type; - } - mixer->output.rt_formats_count = count; - } - else - { - hr = E_OUTOFMEMORY; - count = 0; + mixer->output.rt_formats[i].media_type = rt_media_type; } + mixer->output.rt_formats_count = count; } free(rt_formats);

1 0

Nikolay Sivov : evr/presenter: Use correct sample size attribute value when setting output mixer type.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: a00a09c470322875ff7db58e3376c30ff08b7793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a00a09c470322875ff7db58e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:31:13 2021 +0300 evr/presenter: Use correct sample size attribute value when setting output mixer type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 414ba5bcaa0..e9890c9f6e4 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -334,7 +334,7 @@ static HRESULT video_presenter_configure_output_type(struct video_presenter *pre if (SUCCEEDED(hr)) hr = IMFMediaType_SetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, stride); if (SUCCEEDED(hr)) - hr = IMFMediaType_SetUINT32(media_type, &MF_MT_SAMPLE_SIZE, stride); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_SAMPLE_SIZE, size); } return hr;

1 0

Nikolay Sivov : evr/presenter: Make sure to use positive stride for output mixer types.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 595eded230137b72a5aea1e1837c5dce224741ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=595eded230137b72a5aea1e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:31:14 2021 +0300 evr/presenter: Make sure to use positive stride for output mixer types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index e9890c9f6e4..fa116c18ccc 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -332,7 +332,7 @@ static HRESULT video_presenter_configure_output_type(struct video_presenter *pre if (SUCCEEDED(hr)) hr = MFGetPlaneSize(subtype.Data1, aperture->Area.cx, aperture->Area.cy, &size); if (SUCCEEDED(hr)) - hr = IMFMediaType_SetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, stride); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, abs(stride)); if (SUCCEEDED(hr)) hr = IMFMediaType_SetUINT32(media_type, &MF_MT_SAMPLE_SIZE, size); }

1 0

Nikolay Sivov : mfplat: Implement MFInitVideoFormat_RGB().
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 31f4ad064ee49c472725960a4599399609279977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f4ad064ee49c472725960a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:31:15 2021 +0300 mfplat: Implement MFInitVideoFormat_RGB(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.spec | 2 +- dlls/mfplat/mediatype.c | 52 ++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 106 +++++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 1 + 5 files changed, 161 insertions(+), 2 deletions(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index 67eee3122cf..a655e1cdd07 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -24,5 +24,5 @@ @ stub MFGetStrideForBitmapInfoHeader @ stub MFGetUncompressedVideoFormat @ stub MFInitVideoFormat -@ stub MFInitVideoFormat_RGB +@ stdcall -import MFInitVideoFormat_RGB(ptr long long long) @ stub MFIsFormatYUV diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 61f1a75d90b..4f24ccbd237 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3443,3 +3443,55 @@ DXGI_FORMAT WINAPI MFMapDX9FormatToDXGIFormat(DWORD format) return DXGI_FORMAT_UNKNOWN; } } + +/*********************************************************************** + * MFInitVideoFormat_RGB (mfplat.@) + */ +HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD height, DWORD d3dformat) +{ + unsigned int transfer_function; + + TRACE("%p, %u, %u, %#x.\n", format, width, height, d3dformat); + + if (!format) + return E_INVALIDARG; + + if (!d3dformat) d3dformat = D3DFMT_X8R8G8B8; + + switch (d3dformat) + { + case D3DFMT_X8R8G8B8: + case D3DFMT_R8G8B8: + case D3DFMT_A8R8G8B8: + case D3DFMT_R5G6B5: + case D3DFMT_X1R5G5B5: + case D3DFMT_A2B10G10R10: + case D3DFMT_P8: + transfer_function = MFVideoTransFunc_sRGB; + break; + default: + transfer_function = MFVideoTransFunc_10; + } + + memset(format, 0, sizeof(*format)); + format->dwSize = sizeof(*format); + format->videoInfo.dwWidth = width; + format->videoInfo.dwHeight = height; + format->videoInfo.PixelAspectRatio.Numerator = 1; + format->videoInfo.PixelAspectRatio.Denominator = 1; + format->videoInfo.InterlaceMode = MFVideoInterlace_Progressive; + format->videoInfo.TransferFunction = transfer_function; + format->videoInfo.ColorPrimaries = MFVideoPrimaries_BT709; + format->videoInfo.SourceLighting = MFVideoLighting_office; + format->videoInfo.FramesPerSecond.Numerator = 60; + format->videoInfo.FramesPerSecond.Denominator = 1; + format->videoInfo.NominalRange = MFNominalRange_Normal; + format->videoInfo.GeometricAperture.Area.cx = width; + format->videoInfo.GeometricAperture.Area.cy = height; + format->videoInfo.MinimumDisplayAperture = format->videoInfo.GeometricAperture; + memcpy(&format->guidFormat, &MFVideoFormat_Base, sizeof(format->guidFormat)); + format->guidFormat.Data1 = d3dformat; + format->surfaceInfo.Format = d3dformat; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 9a78c2fb0bc..6cc3fb07105 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -127,7 +127,7 @@ @ stub MFInitMediaTypeFromVideoInfoHeader @ stdcall MFInitMediaTypeFromWaveFormatEx(ptr ptr long) @ stub MFInitVideoFormat -@ stub MFInitVideoFormat_RGB +@ stdcall MFInitVideoFormat_RGB(ptr long long long) @ stdcall MFInvokeCallback(ptr) @ stub MFJoinIoPort @ stdcall MFJoinWorkQueue(long long ptr) rtworkq.RtwqJoinWorkQueue diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 65ab72bd57b..ae9bd60c6df 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -264,6 +264,7 @@ static HRESULT (WINAPI *pMFCreateVideoMediaTypeFromSubtype)(const GUID *subtype, static HRESULT (WINAPI *pMFLockSharedWorkQueue)(const WCHAR *name, LONG base_priority, DWORD *taskid, DWORD *queue); static HRESULT (WINAPI *pMFLockDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); static HRESULT (WINAPI *pMFUnlockDXGIDeviceManager)(void); +static HRESULT (WINAPI *pMFInitVideoFormat_RGB)(MFVIDEOFORMAT *format, DWORD width, DWORD height, DWORD d3dformat); static HWND create_window(void) { @@ -937,6 +938,7 @@ static void init_functions(void) X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); + X(MFInitVideoFormat_RGB); X(MFLockDXGIDeviceManager); X(MFLockSharedWorkQueue); X(MFMapDX9FormatToDXGIFormat); @@ -7206,6 +7208,109 @@ static void test_shared_dxgi_device_manager(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); } +static void check_video_format(const MFVIDEOFORMAT *format, unsigned int width, unsigned int height, + DWORD d3dformat) +{ + unsigned int transfer_function; + GUID guid; + + if (!d3dformat) d3dformat = D3DFMT_X8R8G8B8; + + switch (d3dformat) + { + case D3DFMT_X8R8G8B8: + case D3DFMT_R8G8B8: + case D3DFMT_A8R8G8B8: + case D3DFMT_R5G6B5: + case D3DFMT_X1R5G5B5: + case D3DFMT_A2B10G10R10: + case D3DFMT_P8: + transfer_function = MFVideoTransFunc_sRGB; + break; + default: + transfer_function = MFVideoTransFunc_10; + } + + memcpy(&guid, &MFVideoFormat_Base, sizeof(guid)); + guid.Data1 = d3dformat; + + ok(format->dwSize == sizeof(*format), "Unexpected format size.\n"); + ok(format->videoInfo.dwWidth == width, "Unexpected width %u.\n", format->videoInfo.dwWidth); + ok(format->videoInfo.dwHeight == height, "Unexpected height %u.\n", format->videoInfo.dwHeight); + ok(format->videoInfo.PixelAspectRatio.Numerator == 1 && + format->videoInfo.PixelAspectRatio.Denominator == 1, "Unexpected PAR.\n"); + ok(format->videoInfo.SourceChromaSubsampling == MFVideoChromaSubsampling_Unknown, "Unexpected chroma subsampling.\n"); + ok(format->videoInfo.InterlaceMode == MFVideoInterlace_Progressive, "Unexpected interlace mode %u.\n", + format->videoInfo.InterlaceMode); + ok(format->videoInfo.TransferFunction == transfer_function, "Unexpected transfer function %u.\n", + format->videoInfo.TransferFunction); + ok(format->videoInfo.ColorPrimaries == MFVideoPrimaries_BT709, "Unexpected color primaries %u.\n", + format->videoInfo.ColorPrimaries); + ok(format->videoInfo.TransferMatrix == MFVideoTransferMatrix_Unknown, "Unexpected transfer matrix.\n"); + ok(format->videoInfo.SourceLighting == MFVideoLighting_office, "Unexpected source lighting %u.\n", + format->videoInfo.SourceLighting); + ok(format->videoInfo.FramesPerSecond.Numerator == 60 && + format->videoInfo.FramesPerSecond.Denominator == 1, "Unexpected frame rate %u/%u.\n", + format->videoInfo.FramesPerSecond.Numerator, format->videoInfo.FramesPerSecond.Denominator); + ok(format->videoInfo.NominalRange == MFNominalRange_Normal, "Unexpected nominal range %u.\n", + format->videoInfo.NominalRange); + ok(format->videoInfo.GeometricAperture.Area.cx == width && format->videoInfo.GeometricAperture.Area.cy == height, + "Unexpected geometric aperture.\n"); + ok(!memcmp(&format->videoInfo.GeometricAperture, &format->videoInfo.MinimumDisplayAperture, sizeof(MFVideoArea)), + "Unexpected minimum display aperture.\n"); + ok(format->videoInfo.PanScanAperture.Area.cx == 0 && format->videoInfo.PanScanAperture.Area.cy == 0, + "Unexpected geometric aperture.\n"); + ok(format->videoInfo.VideoFlags == 0, "Unexpected video flags.\n"); + ok(IsEqualGUID(&format->guidFormat, &guid), "Unexpected format guid %s.\n", wine_dbgstr_guid(&format->guidFormat)); + ok(format->compressedInfo.AvgBitrate == 0, "Unexpected bitrate.\n"); + ok(format->compressedInfo.AvgBitErrorRate == 0, "Unexpected error bitrate.\n"); + ok(format->compressedInfo.MaxKeyFrameSpacing == 0, "Unexpected MaxKeyFrameSpacing.\n"); + ok(format->surfaceInfo.Format == d3dformat, "Unexpected format %u.\n", format->surfaceInfo.Format); + ok(format->surfaceInfo.PaletteEntries == 0, "Unexpected palette size %u.\n", format->surfaceInfo.PaletteEntries); +} + +static void test_MFInitVideoFormat_RGB(void) +{ + static const DWORD formats[] = + { + 0, /* same D3DFMT_X8R8G8B8 */ + D3DFMT_X8R8G8B8, + D3DFMT_R8G8B8, + D3DFMT_A8R8G8B8, + D3DFMT_R5G6B5, + D3DFMT_X1R5G5B5, + D3DFMT_A2B10G10R10, + D3DFMT_P8, + D3DFMT_L8, + D3DFMT_YUY2, + D3DFMT_DXT1, + D3DFMT_D16, + D3DFMT_L16, + D3DFMT_A16B16G16R16F, + }; + MFVIDEOFORMAT format; + unsigned int i; + HRESULT hr; + + if (!pMFInitVideoFormat_RGB) + { + win_skip("MFInitVideoFormat_RGB is not available.\n"); + return; + } + + hr = pMFInitVideoFormat_RGB(NULL, 64, 32, 0); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + memset(&format, 0, sizeof(format)); + hr = pMFInitVideoFormat_RGB(&format, 64, 32, formats[i]); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + check_video_format(&format, 64, 32, formats[i]); + } +} + START_TEST(mfplat) { char **argv; @@ -7272,6 +7377,7 @@ START_TEST(mfplat) test_MFMapDX9FormatToDXGIFormat(); test_MFllMulDiv(); test_shared_dxgi_device_manager(); + test_MFInitVideoFormat_RGB(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index a3945bd3a7d..e4a1f6a3dc0 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -552,6 +552,7 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN UINT32 *pcount); HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); +HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD height, DWORD d3dformat); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); LONGLONG WINAPI MFllMulDiv(LONGLONG val, LONGLONG num, LONGLONG denom, LONGLONG factor); HRESULT WINAPI MFLockDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager);

1 0

Nikolay Sivov : evr: Add a forward for MFGetStrideForBitmapInfoHeader().
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: dc4786963380011b4f770087e93fffa28f54d5bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc4786963380011b4f770087… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:31:16 2021 +0300 evr: Add a forward for MFGetStrideForBitmapInfoHeader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index a655e1cdd07..8aea0a607a8 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -21,7 +21,7 @@ @ stdcall MFCreateVideoSampleAllocator(ptr ptr) @ stdcall MFCreateVideoSampleFromSurface(ptr ptr) @ stdcall -import MFGetPlaneSize(long long long ptr) -@ stub MFGetStrideForBitmapInfoHeader +@ stdcall -import MFGetStrideForBitmapInfoHeader(long long ptr) @ stub MFGetUncompressedVideoFormat @ stub MFInitVideoFormat @ stdcall -import MFInitVideoFormat_RGB(ptr long long long)

1 0