[PATCH] mf/tests: Fix test crash on Vista.

Nikolay Sivov nsivov at codeweavers.com
Mon Apr 15 02:32:03 CDT 2019


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/mf/tests/mf.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 4dfefdd459..80dc990254 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -298,24 +298,16 @@ static void test_topology(void)
     ok(size == 1, "Unexpected item count.\n");
     IMFCollection_Release(collection);
 
+    hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node);
+    ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr);
+    hr = IMFTopology_AddNode(topology, node);
+    ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr);
+    IMFTopologyNode_Release(node);
+
     hr = IMFTopology_GetOutputNodeCollection(topology, &collection);
     ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get output node collection, hr %#x.\n", hr);
     if (SUCCEEDED(hr))
     {
-        ok(!!collection, "Unexpected object pointer.\n");
-        hr = IMFCollection_GetElementCount(collection, &size);
-        ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr);
-        ok(!size, "Unexpected item count.\n");
-        IMFCollection_Release(collection);
-
-        hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node);
-        ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr);
-        hr = IMFTopology_AddNode(topology, node);
-        ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr);
-        IMFTopologyNode_Release(node);
-
-        hr = IMFTopology_GetOutputNodeCollection(topology, &collection);
-        ok(hr == S_OK, "Failed to get output node collection, hr %#x.\n", hr);
         ok(!!collection, "Unexpected object pointer.\n");
         hr = IMFCollection_GetElementCount(collection, &size);
         ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr);
-- 
2.20.1




More information about the wine-devel mailing list