Rémi Bernon : mf: Always enumerate branch source types for transform nodes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 616ae1e38d15672a0ab59a35c1578713718d3229
URL:    https://gitlab.winehq.org/wine/wine/-/commit/616ae1e38d15672a0ab59a35c157871...

Author: Rémi Bernon 
Date:   Sat Sep  3 17:34:14 2022 +0200

mf: Always enumerate branch source types for transform nodes.

---

dlls/mf/tests/mf.c        | 6 +++---
 dlls/mf/topology_loader.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index c9f8fe96f8b..004f7b50f59 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -2986,13 +2986,13 @@ static void test_topology_loader(void)
             /* Float -> PCM, refuse input type, add converter */
             .input_type = &audio_float_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_DIRECT, .source_method = -1,
             .expected_result = MF_E_NO_MORE_TYPES,
-            .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER | LOADER_TODO,
+            .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER,
         },
         {
             /* Float -> PCM, refuse input type, add converter, allow resampler output type */
             .input_type = &audio_float_44100, .output_type = &audio_pcm_48000_resampler, .sink_method = MF_CONNECT_DIRECT, .source_method = -1,
             .expected_result = S_OK,
-            .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER | LOADER_TODO,
+            .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER,
         },

{
@@ -3449,7 +3449,7 @@ todo_wine {
         else
             ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count);

-        todo_wine_if((test->flags & LOADER_NO_CURRENT_OUTPUT) && !(test->flags & LOADER_SET_MEDIA_TYPES))
+        todo_wine_if(test->flags & LOADER_NO_CURRENT_OUTPUT)
         ok(!handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count);

if (handler.current_type)
diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c
index ab694379237..0c42a93511b 100644
--- a/dlls/mf/topology_loader.c
+++ b/dlls/mf/topology_loader.c
@@ -498,7 +498,7 @@ static HRESULT topology_loader_resolve_branches(struct topoloader_context *conte
             WARN("Failed to clone nodes for branch %s\n", debugstr_topology_branch(branch));
         else
             hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER,
-                    branch, enumerate_source_types);
+                    branch, enumerate_source_types || node_type == MF_TOPOLOGY_TRANSFORM_NODE);

topology_branch_destroy(branch);
         if (FAILED(hr))