[PATCH v2 0/2] MR5281: Preserve topology id of the original topology in the resolved topology when calling IMFTopoLoader::Load

[Santino Mazza (＠tati1454)]

This merge request is related to MR !4443

--
  v2: mf/topoloader: Preserve input topology id.

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

[PATCH v2 1/2] mf/test: Check the topologies id's in topo loader.

[Santino Mazza]

From: Santino Mazza

---
 dlls/mf/tests/mf.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index c05482778df..58688c0cfba 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -3951,7 +3951,7 @@ static void test_topology_loader(void)
     IMFTopoLoader *loader;
     IUnknown *node_object;
     WORD node_count;
-    TOPOID node_id;
+    TOPOID node_id, oldtopoid, newtopoid;
     DWORD index;
     HRESULT hr;
     BOOL ret;
@@ -4177,6 +4177,11 @@ static void test_topology_loader(void)
         }
         else if (test->expected_result == S_OK)
         {
+            IMFTopology_GetTopologyID(topology, &oldtopoid);
+            IMFTopology_GetTopologyID(full_topology, &newtopoid);
+            todo_wine ok(oldtopoid == newtopoid, "Expected the same topology id. %llu == %llu\n", oldtopoid, newtopoid);
+            ok(topology != full_topology, "Expected a different object for the resolved topology.\n");
+
             hr = IMFTopology_GetCount(full_topology, &count);
             ok(hr == S_OK, "Failed to get attribute count, hr %#lx.\n", hr);
             todo_wine
@@ -4324,6 +4329,9 @@ todo_wine {
             hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL);
             ok(hr == S_OK, "Failed to resolve topology, hr %#lx.\n", hr);
             ok(full_topology != topology2, "Unexpected instance.\n");
+            IMFTopology_GetTopologyID(topology2, &oldtopoid);
+            IMFTopology_GetTopologyID(full_topology, &newtopoid);
+            todo_wine ok(oldtopoid == newtopoid, "Expected the same topology id. %llu == %llu\n", oldtopoid, newtopoid);
             hr = IMFTopology_GetUINT32(topology2, &IID_IMFTopology, &value);
             ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

[PATCH v2 2/2] mf/topoloader: Preserve input topology id.

[Santino Mazza]

From: Santino Mazza

---
 dlls/mf/mf_private.h      |  1 +
 dlls/mf/tests/mf.c        |  4 ++--
 dlls/mf/topology.c        | 25 +++++++++++++++----------
 dlls/mf/topology_loader.c |  4 +++-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h
index bbfadaee5d8..401e1f55b49 100644
--- a/dlls/mf/mf_private.h
+++ b/dlls/mf/mf_private.h
@@ -118,6 +118,7 @@ extern HRESULT urlmon_scheme_handler_construct(REFIID riid, void **obj);

extern BOOL mf_is_sample_copier_transform(IMFTransform *transform);
 extern BOOL mf_is_sar_sink(IMFMediaSink *sink);
+extern HRESULT create_topology(TOPOID id, IMFTopology **topology);
 extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj);
 extern HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaTypeHandler **handler);
 extern HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type);
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 58688c0cfba..fece60d37a7 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -4179,7 +4179,7 @@ static void test_topology_loader(void)
         {
             IMFTopology_GetTopologyID(topology, &oldtopoid);
             IMFTopology_GetTopologyID(full_topology, &newtopoid);
-            todo_wine ok(oldtopoid == newtopoid, "Expected the same topology id. %llu == %llu\n", oldtopoid, newtopoid);
+            ok(oldtopoid == newtopoid, "Expected the same topology id. %llu == %llu\n", oldtopoid, newtopoid);
             ok(topology != full_topology, "Expected a different object for the resolved topology.\n");

hr = IMFTopology_GetCount(full_topology, &count);
@@ -4331,7 +4331,7 @@ todo_wine {
             ok(full_topology != topology2, "Unexpected instance.\n");
             IMFTopology_GetTopologyID(topology2, &oldtopoid);
             IMFTopology_GetTopologyID(full_topology, &newtopoid);
-            todo_wine ok(oldtopoid == newtopoid, "Expected the same topology id. %llu == %llu\n", oldtopoid, newtopoid);
+            ok(oldtopoid == newtopoid, "Expected the same topology id. %llu == %llu\n", oldtopoid, newtopoid);
             hr = IMFTopology_GetUINT32(topology2, &IID_IMFTopology, &value);
             ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c
index f09a9c87a46..572d4d426d3 100644
--- a/dlls/mf/topology.c
+++ b/dlls/mf/topology.c
@@ -866,19 +866,11 @@ static TOPOID topology_generate_id(void)
     return next_topology_id;
 }

-/***********************************************************************
- *      MFCreateTopology (mf.@)
- */
-HRESULT WINAPI MFCreateTopology(IMFTopology **topology)
+HRESULT create_topology(TOPOID id, IMFTopology **topology)
 {
     struct topology *object;
     HRESULT hr;

-    TRACE("%p.\n", topology);
-
-    if (!topology)
-        return E_POINTER;
-
     if (!(object = calloc(1, sizeof(*object))))
         return E_OUTOFMEMORY;

@@ -892,13 +884,26 @@ HRESULT WINAPI MFCreateTopology(IMFTopology **topology)
         return hr;
     }

-    object->id = topology_generate_id();
+    object->id = id;

*topology = &object->IMFTopology_iface;

return S_OK;
 }

+/***********************************************************************
+ *      MFCreateTopology (mf.@)
+ */
+HRESULT WINAPI MFCreateTopology(IMFTopology **topology)
+{
+    TRACE("%p.\n", topology);
+
+    if (!topology)
+        return E_POINTER;
+
+    return create_topology(topology_generate_id(), topology);
+}
+
 static HRESULT WINAPI topology_node_QueryInterface(IMFTopologyNode *iface, REFIID riid, void **out)
 {
     struct topology_node *node = impl_from_IMFTopologyNode(iface);
diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c
index 11d0162d94f..96ae74dbfe2 100644
--- a/dlls/mf/topology_loader.c
+++ b/dlls/mf/topology_loader.c
@@ -721,6 +721,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in
     unsigned short i = 0;
     IMFStreamSink *sink;
     IUnknown *object;
+    TOPOID topoid;
     HRESULT hr = E_FAIL;

FIXME("iface %p, input_topology %p, ret_topology %p, current_topology %p stub!\n",
@@ -763,7 +764,8 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in
             return hr;
     }

-    if (FAILED(hr = MFCreateTopology(&output_topology)))
+    IMFTopology_GetTopologyID(input_topology, &topoid);
+    if (FAILED(hr = create_topology(topoid, &output_topology)))
         return hr;

IMFTopology_CopyAllItems(input_topology, (IMFAttributes *)output_topology);

[PATCH v2 2/2] mf/topoloader: Preserve input topology id.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=144142

Your paranoid android.

=== debian11b (64 bit WoW report) ===

user32:
input.c:3864: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 0000000001BA00EA, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032

[PATCH v2 0/2] MR5281: Preserve topology id of the original topology in the resolved topology when calling IMFTopoLoader::Load - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.