From 7c9e6a1c96712de4a152c4fb086d00a151e4e59e Mon Sep 17 00:00:00 2001 From: Derek Lesho Date: Mon, 30 Nov 2020 15:25:15 +0300 Subject: [PATCH] mf/topoloader: Unstub IMFTopologyLoader::Load. Signed-off-by: Derek Lesho Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/mf/tests/mf.c | 6 ++---- dlls/mf/topology.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5e5c30ec6fc..20e3e8713c6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1735,7 +1735,6 @@ static void test_topology_loader(void) MF_CONNECT_DIRECT, MF_E_INVALIDMEDIATYPE, - LOADER_TODO, }, { @@ -1766,7 +1765,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_CONVERTER, S_OK, - LOADER_EXPECTED_CONVERTER, + LOADER_EXPECTED_CONVERTER | LOADER_TODO, }, { @@ -1794,7 +1793,6 @@ static void test_topology_loader(void) MF_CONNECT_DIRECT, MF_E_INVALIDMEDIATYPE, - LOADER_TODO, }, { @@ -1850,7 +1848,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_DECODER, S_OK, - LOADER_EXPECTED_DECODER, + LOADER_EXPECTED_DECODER | LOADER_TODO, }, }; diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e3a4dfd5141..7001a33f088 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2429,11 +2429,9 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in break; } - /* For now return original topology. */ - *ret_topology = output_topology; - return IMFTopology_CloneFrom(output_topology, input_topology); + return hr; } static const IMFTopoLoaderVtbl topologyloadervtbl =