[PATCH v2 0/1] MR9742: mf: Prevent invalid topologies from being started.

[Bernhard Kölbl (＠besentv)]

Signed-off-by: Bernhard Kölbl <[e-mail]>

--
  v2: mf: Prevent invalid topologies from being started.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9742

[PATCH v2 1/1] mf: Prevent invalid topologies from being started.

[Bernhard Kölbl]

From: Bernhard Kölbl <[e-mail]>

Signed-off-by: Bernhard Kölbl <[e-mail]>
---
 dlls/mf/session.c  |  4 ++-
 dlls/mf/tests/mf.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 8d2ca079634..b7012e69883 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -2117,7 +2117,7 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF
     session_raise_topology_set(session, topology, hr);
 
     /* With no current topology set it right away, otherwise queue. */
-    if (topology)
+    if (SUCCEEDED(hr) && topology)
     {
         struct queued_topology *queued_topology;
 
@@ -4932,6 +4932,8 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses
         goto failed;
     }
 
+    session_clear_presentation(object);
+
     *session = &object->IMFMediaSession_iface;
 
     return S_OK;
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 0c0590ed195..a4a0a7e6609 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -7279,6 +7279,93 @@ static void test_media_session_Start(void)
         winetest_pop_context();
     }
 
+    /* test starting an invaild topology */
+    source = create_test_source(TRUE);
+    callback = create_test_callback(TRUE);
+
+    hr = MFCreateMediaSession(NULL, &session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = MFCreateAudioRendererActivate(&sink_activate);
+    ok(hr == S_OK, "Failed to create audio renderer sink, hr %#lx.\n", hr);
+
+    topology = create_test_topology(source, sink_activate, &duration);
+    hr = IMFMediaSession_SetTopology(session, 0, topology);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFTopology_Release(topology);
+
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = 0;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar);
+    ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFMediaSession_Stop(session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    IMFMediaSource_Release(source);
+    IMFActivate_ShutdownObject(sink_activate);
+    IMFActivate_Release(sink_activate);
+
+    /* then start a valid topology */
+    source = create_test_source(FALSE);
+
+    grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback());
+    hr = MFCreateMediaType(&output_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(output_type, video_rgb32_desc, -1);
+    hr = MFCreateSampleGrabberSinkActivate(output_type, &grabber_callback->IMFSampleGrabberSinkCallback_iface, &sink_activate);
+    ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
+    IMFMediaType_Release(output_type);
+
+    topology = create_test_topology(source, sink_activate, &duration);
+    hr = IMFMediaSession_SetTopology(session, 0, topology);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFTopology_Release(topology);
+
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = 0;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    IMFMediaSource_Release(source);
+    IMFActivate_ShutdownObject(sink_activate);
+    IMFActivate_Release(sink_activate);
+
+    hr = IMFMediaSession_Stop(session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    /* try invalid topology once again */
+    source = create_test_source(TRUE);
+
+    hr = MFCreateAudioRendererActivate(&sink_activate);
+    ok(hr == S_OK, "Failed to create audio renderer sink, hr %#lx.\n", hr);
+
+    topology = create_test_topology(source, sink_activate, &duration);
+    hr = IMFMediaSession_SetTopology(session, 0, topology);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFTopology_Release(topology);
+
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = 10;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar);
+    ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); /* fails because unseekable source is still in use */
+
+    hr = IMFMediaSession_Stop(session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    IMFMediaSource_Release(source);
+    IMFActivate_ShutdownObject(sink_activate);
+    IMFActivate_Release(sink_activate);
+
+    IMFAsyncCallback_Release(callback);
+    IMFMediaSession_Release(session);
+
     hr = MFShutdown();
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9742

[Bernhard Kölbl (＠besentv)]

v2: Minor test change

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9742#note_125459