[PATCH 1/3] mf/tests: Avoid creating now unused sink activate instances.

[Rémi Bernon]

From: R��mi Bernon

---
 dlls/mf/tests/mf.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index eccf4f51e4c..888cea8c4aa 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -2550,6 +2550,15 @@ static void test_topology_loader(void)
     hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL);
     ok(hr == MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED, "Unexpected hr %#lx.\n", hr);

+    hr = IMFTopologyNode_SetObject(sink_node, NULL);
+    ok(hr == S_OK, "Failed to set object, hr %#lx.\n", hr);
+
+    hr = IMFActivate_ShutdownObject(sink_activate);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ref = IMFActivate_Release(sink_activate);
+    ok(ref == 0, "Release returned %ld\n", ref);
+
+
     hr = MFCreateMediaType(&input_type);
     ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr);

@@ -2575,9 +2584,6 @@ static void test_topology_loader(void)
         else
             handler.invalid_type = NULL;

-        hr = MFCreateSampleGrabberSinkActivate(output_type, &test_grabber_callback, &sink_activate);
-        ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
-
         init_source_node(source, test->source_method, src_node, 1, &input_type, test->current_input);
         init_sink_node(&stream_sink.IMFStreamSink_iface, test->sink_method, sink_node);

@@ -2733,11 +2739,6 @@ todo_wine {
         ok(hr == S_OK, "Failed to get attribute count, hr %#lx.\n", hr);
         ok(!count, "Unexpected count %u.\n", count);

-        hr = IMFActivate_ShutdownObject(sink_activate);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        ref = IMFActivate_Release(sink_activate);
-        ok(ref == 0, "Release returned %ld\n", ref);
-
         winetest_pop_context();
     }