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

Re: [PATCH v5 1/5] mf/tests: Add more consistent reference count checks.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117717 Your paranoid android. === debian11 (32 bit report) === Report validation errors: mf:mf prints too much data (40734 bytes) === debian11 (32 bit WoW report) === Report validation errors: mf:mf prints too much data (40694 bytes)

June 27, 2022

Re: [PATCH v4 3/5] mf: Avoid leaking nodes in IMFTopoLoader_Load.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117714 Your paranoid android. === debian11 (32 bit report) === Report validation errors: mf:mf prints too much data (39971 bytes) === debian11 (32 bit WoW report) === Report validation errors: mf:mf prints too much data (40453 bytes)

June 27, 2022

Re: [PATCH v8 0/9] MR6: Avoid performance degradation due to vDSO unmapping (BZ#52313)

by Jinoh Kang (＠iamahuman)

> When running under qemu-user CPU emulation, this can mean we not only remove the vdso from the process being launched (a performance degradation), but also clobber it out from under the qemu-user emulator hosting the wine-preloader process - which is in fact in the midst of a call to mmap that is *using* the vdso, so the emulator then segfaults before returning I'd call a QEMU bug. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6#note_2791

June 27, 2022

Re: [PATCH v4 2/5] mf/tests: Add some missing IMFActivate_Shutdown calls.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117713 Your paranoid android. === debian11 (32 bit report) === mf: mf.c:2559: Test failed: Release returned 2 mf.c:7395: Test failed: ProcessOutput returned 0xd0000001 mf.c:7398: Test failed: got dwStatus 0 mf.c:7401: Test failed: got status 0 mf.c:7414: Test failed: got cbSize 0x3fc000 mf.c:7422: Test failed: out 0: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7422: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 1920:1080 mf.c:7422: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 3110400 mf.c:7422: Test failed: out 0: "MF_MT_DEFAULT_STRIDE" mismatch, type 19, value 1920 mf.c:7422: Test failed: out 0: "MF_MT_MINIMUM_DISPLAY_APERTURE" missing, hr 0xc00d36e6 mf.c:7422: Test failed: out 1: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7422: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 1920:1080 mf.c:7422: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 3110400 mf.c:7422: Test failed: out 1: "MF_MT_DEFAULT_STRIDE" mismatch, type 19, value 1920 mf.c:7422: Test failed: out 1: "MF_MT_MINIMUM_DISPLAY_APERTURE" missing, hr 0xc00d36e6 mf.c:7422: Test failed: out 2: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7422: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 1920:1080 mf.c:7422: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 3110400 mf.c:7422: Test failed: out 2: "MF_MT_DEFAULT_STRIDE" mismatch, type 19, value 1920 mf.c:7422: Test failed: out 2: "MF_MT_MINIMUM_DISPLAY_APERTURE" missing, hr 0xc00d36e6 mf.c:7422: Test failed: out 3: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7422: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 1920:1080 mf.c:7422: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 3110400 mf.c:7422: Test failed: out 3: "MF_MT_DEFAULT_STRIDE" mismatch, type 19, value 1920 mf.c:7422: Test failed: out 3: "MF_MT_MINIMUM_DISPLAY_APERTURE" missing, hr 0xc00d36e6 mf.c:7422: Test failed: out 4: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7422: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 1920:1080 mf.c:7422: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 4147200 mf.c:7422: Test failed: out 4: "MF_MT_DEFAULT_STRIDE" mismatch, type 19, value 3840 mf.c:7422: Test failed: out 4: "MF_MT_MINIMUM_DISPLAY_APERTURE" missing, hr 0xc00d36e6 mf.c:7455: Test failed: ProcessOutput returned 0xc00d36b1 mf.c:7477: Test failed: GetSampleTime returned 0xc00d36c8 mf.c:7478: Test failed: got time 3735928559 mf.c:7483: Test failed: GetSampleDuration returned 0xc00d36c9 mf.c:7484: Test failed: got duration 3735928559 mf.c:7492: Test failed: got length 0 mf.c:7519: Test failed: SetOutputType returned 0. mf.c:7522: Test failed: SetOutputType returned 0xc00d36b4. mf.c:7638: Test failed: ProcessOutput returned 0xc00d36b1 === debian11 (32 bit Arabic:Morocco report) === mf: mf.c:2559: Test failed: Release returned 2 === debian11 (32 bit German report) === mf: mf.c:2559: Test failed: Release returned 2 === debian11 (32 bit French report) === mf: mf.c:2559: Test failed: Release returned 2 === debian11 (32 bit Hebrew:Israel report) === mf: mf.c:2559: Test failed: Release returned 2 === debian11 (32 bit Hindi:India report) === mf: mf.c:2559: Test failed: Release returned 2 === debian11 (32 bit Japanese:Japan report) === mf: mf.c:2559: Test failed: Release returned 2 === debian11 (32 bit Chinese:China report) === mf: mf.c:2559: Test failed: Release returned 2 === debian11 (build log) === 0100:err:winediag:color_convert_create GStreamer doesn't support video conversion, please install appropriate plugins. === debian11 (32 bit WoW report) === mf: mf.c:2559: Test failed: Release returned 2 Report validation errors: mf:mf prints too much data (40378 bytes) === debian11 (64 bit WoW report) === mf: mf.c:2559: Test failed: Release returned 2

June 27, 2022

Re: [PATCH v4 1/5] mf/tests: And more consistent reference count checks.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117712 Your paranoid android. === debian11 (32 bit report) === Report validation errors: mf:mf prints too much data (40734 bytes) === debian11 (32 bit WoW report) === Report validation errors: mf:mf prints too much data (40753 bytes)

June 27, 2022

Re: [PATCH 1/2] riched20/tests: Test for Windows Rich Edit EM_UNDO/EM_REDO status bug.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117710 Your paranoid android. === w7u_2qxl (32 bit report) === riched20: editor.c:6645: Test failed: wrong event mask (0x0) during WM_COMMAND

June 27, 2022

Re: [PATCH v5 0/5] MR310: mf: Fix several reference leaks.

by Rémi Bernon

v4: Split the test changes. v5: Fixup split leftovers in commit messages. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310#note_2787

June 27, 2022

[PATCH v5 5/5] mf: Uninitialize renderer before creating mixer and presenter.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/evr.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 90702ff3d95..c9506af9143 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1702,11 +1702,8 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere return hr; } -static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTransform *mixer, - IMFVideoPresenter *presenter) +static void video_renderer_uninitialize(struct video_renderer *renderer) { - HRESULT hr; - video_renderer_release_services(renderer); if (renderer->mixer) @@ -1726,6 +1723,12 @@ static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTra IUnknown_Release(renderer->device_manager); renderer->device_manager = NULL; } +} + +static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTransform *mixer, + IMFVideoPresenter *presenter) +{ + HRESULT hr; renderer->mixer = mixer; IMFTransform_AddRef(renderer->mixer); @@ -1747,11 +1750,22 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, TRACE("%p, %p, %p.\n", iface, mixer, presenter); + EnterCriticalSection(&renderer->cs); + + if (renderer->flags & EVR_SHUT_DOWN) + { + LeaveCriticalSection(&renderer->cs); + return MF_E_SHUTDOWN; + } + + video_renderer_uninitialize(renderer); + if (mixer) IMFTransform_AddRef(mixer); else if (FAILED(hr = video_renderer_create_mixer(NULL, &mixer))) { WARN("Failed to create default mixer object, hr %#lx.\n", hr); + LeaveCriticalSection(&renderer->cs); return hr; } @@ -1760,21 +1774,15 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, &presenter))) { WARN("Failed to create default presenter, hr %#lx.\n", hr); + LeaveCriticalSection(&renderer->cs); IMFTransform_Release(mixer); return hr; } - EnterCriticalSection(&renderer->cs); - - if (renderer->flags & EVR_SHUT_DOWN) - hr = MF_E_SHUTDOWN; - else - { - /* FIXME: check clock state */ - /* FIXME: check that streams are not initialized */ + /* FIXME: check clock state */ + /* FIXME: check that streams are not initialized */ - hr = video_renderer_initialize(renderer, mixer, presenter); - } + hr = video_renderer_initialize(renderer, mixer, presenter); LeaveCriticalSection(&renderer->cs); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/310

June 27, 2022

[PATCH v5 4/5] mf: Release video renderer services before re-initializing.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/evr.c | 2 ++ dlls/mf/tests/mf.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index b035b8b601b..90702ff3d95 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1707,6 +1707,8 @@ static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTra { HRESULT hr; + video_renderer_release_services(renderer); + if (renderer->mixer) { IMFTransform_Release(renderer->mixer); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 006709f698c..8d725a65515 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4766,7 +4766,6 @@ static void test_evr(void) IMFMediaSink_Release(sink); ref = IMFVideoRenderer_Release(video_renderer); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); hr = MFCreateVideoRendererActivate(NULL, NULL); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/310

June 27, 2022

[PATCH v5 3/5] mf: Avoid leaking nodes in IMFTopoLoader_Load.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 12 ++---------- dlls/mf/topology.c | 28 +++++++++++++++++++++------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b2528d438af..006709f698c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2175,9 +2175,8 @@ static void test_topology_loader(void) /* Source node only. */ hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); - todo_wine_if(hr == S_OK) + todo_wine_if(hr == E_INVALIDARG) ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) IMFTopology_Release(full_topology); hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node); ok(hr == S_OK, "Failed to create output node, hr %#lx.\n", hr); @@ -2388,28 +2387,23 @@ todo_wine { ref = IMFTopoLoader_Release(loader); ok(ref == 0, "Release returned %ld\n", ref); ref = IMFTopologyNode_Release(src_node); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFTopologyNode_Release(sink_node); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaSource_Release(source); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFPresentationDescriptor_Release(pd); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFStreamDescriptor_Release(sd); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFMediaType_Release(input_type); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); /* FIXME: is native really leaking refs here, or are we? */ ref = IMFMediaType_Release(output_type); + todo_wine ok(ref != 0, "Release returned %ld\n", ref); hr = MFShutdown(); @@ -2542,10 +2536,8 @@ static void test_topology_loader_evr(void) ref = IMFTopology_Release(topology); ok(ref == 0, "Release returned %ld\n", ref); ref = IMFTopologyNode_Release(source_node); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); ref = IMFTopologyNode_Release(evr_node); - todo_wine ok(ref == 0, "Release returned %ld\n", ref); hr = IMFActivate_ShutdownObject(activate); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index ff90bc2c8af..8d64c10b5c7 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2359,6 +2359,7 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context }; MF_TOPOLOGY_TYPE u_type, d_type; IMFTopologyNode *node; + HRESULT hr; TOPOID id; /* Downstream node might have already been cloned. */ @@ -2372,10 +2373,13 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context if (!connectors[u_type][d_type]) { WARN("Unsupported branch kind %d -> %d.\n", u_type, d_type); + IMFTopologyNode_Release(node); return E_FAIL; } - return connectors[u_type][d_type](context, upstream_node, output_index, node, input_index); + hr = connectors[u_type][d_type](context, upstream_node, output_index, node, input_index); + IMFTopologyNode_Release(node); + return hr; } static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, unsigned int *layer_size) @@ -2391,19 +2395,25 @@ static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, { ++size; - IMFTopology_GetNodeByID(context->input_topology, id, &orig_node); - IMFTopologyNode_GetNodeType(node, &node_type); switch (node_type) { case MF_TOPOLOGY_SOURCESTREAM_NODE: - if (FAILED(IMFTopologyNode_GetOutput(orig_node, 0, &downstream_node, &input_index))) + if (SUCCEEDED(hr = IMFTopology_GetNodeByID(context->input_topology, id, &orig_node))) + { + hr = IMFTopologyNode_GetOutput(orig_node, 0, &downstream_node, &input_index); + IMFTopologyNode_Release(orig_node); + } + + if (FAILED(hr)) { IMFTopology_RemoveNode(context->output_topology, node); + IMFTopologyNode_Release(node); continue; } hr = topology_loader_resolve_branch(context, node, 0, downstream_node, input_index); + IMFTopologyNode_Release(downstream_node); break; case MF_TOPOLOGY_TRANSFORM_NODE: case MF_TOPOLOGY_TEE_NODE: @@ -2414,6 +2424,7 @@ static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, } IMFTopologyNode_DeleteItem(node, &context->key); + IMFTopologyNode_Release(node); if (FAILED(hr)) break; @@ -2661,10 +2672,13 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in break; } - if (SUCCEEDED(hr)) + if (FAILED(hr)) + IMFTopology_Release(output_topology); + else + { topology_loader_resolve_complete(&context); - - *ret_topology = output_topology; + *ret_topology = output_topology; + } return hr; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/310

June 27, 2022