[PATCH 0/1] MR4882: mf/tests: Fully cleanup when skipping tests.

[Nikolay Sivov (＠nsivov)]

Hopefully enough to fix a couple of remaining failures.

[PATCH 1/1] mf/tests: Fully cleanup when skipping tests.

[Nikolay Sivov]

From: Nikolay Sivov

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

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 13b55b1f836..1fa832e11fa 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -3733,6 +3733,23 @@ static void test_topology_loader_evr(void)
     hr = CoInitialize(NULL);
     ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr);

+    /* EVR sink node. */
+    window = create_window();
+
+    hr = MFCreateVideoRendererActivate(window, &activate);
+    ok(hr == S_OK, "Failed to create activate object, hr %#lx.\n", hr);
+
+    hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink);
+    if (FAILED(hr))
+    {
+        skip("Failed to create an EVR sink, skipping tests.\n");
+        DestroyWindow(window);
+        IMFActivate_Release(activate);
+        CoUninitialize();
+        return;
+    }
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
     hr = MFCreateTopoLoader(&loader);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

@@ -3749,21 +3766,6 @@ static void test_topology_loader_evr(void)
     IMFPresentationDescriptor_Release(pd);
     IMFStreamDescriptor_Release(sd);

-    /* EVR sink node. */
-    window = create_window();
-
-    hr = MFCreateVideoRendererActivate(window, &activate);
-    ok(hr == S_OK, "Failed to create activate object, hr %#lx.\n", hr);
-
-    hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink);
-    if (FAILED(hr))
-    {
-        skip("Failed to create an EVR sink, skipping tests.\n");
-        DestroyWindow(window);
-        IMFActivate_Release(activate);
-        return;
-    }
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);