[PATCH v4 5/5] mf: Don't shutdown sink activation objects in the media session.

[Bernhard Kölbl]

From: Bernhard Kölbl

Signed-off-by: Bernhard Kölbl 
---
 dlls/mf/session.c  | 3 ---
 dlls/mf/tests/mf.c | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index efe568f987f..0480f0f234e 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -738,7 +738,6 @@ static void session_shutdown_current_topology(struct media_session *session)
     IMFActivate *activate;
     IMFMediaSink *sink;
     WORD idx = 0;
-    HRESULT hr;

topology = session->presentation.current_topology;
     force_shutdown = session->state == SESSION_STATE_SHUT_DOWN;
@@ -758,8 +757,6 @@ static void session_shutdown_current_topology(struct media_session *session)
                 if (SUCCEEDED(IMFTopologyNode_GetUnknown(node, &_MF_TOPONODE_IMFActivate, &IID_IMFActivate,
                         (void **)&activate)))
                 {
-                    if (FAILED(hr = IMFActivate_ShutdownObject(activate)))
-                        WARN("Failed to shut down activation object for the sink, hr %#lx.\n", hr);
                     IMFActivate_Release(activate);
                 }
                 if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink)))
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index c476daac886..1a48ba2221a 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -5495,7 +5495,7 @@ static void test_sample_grabber_shutdown(void)
     hr = IMFMediaSession_Shutdown(session);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(grabber_callback->is_shutdown, "Samplegrabber wasn't shut down.\n");
-    todo_wine ok(!activate_shim->is_shutdown, "Activate Object was shut down.\n");
+    ok(!activate_shim->is_shutdown, "Activate Object was shut down.\n");

hr = IMFMediaSource_Shutdown(source);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);