mfplat: Return S_OK from MFStartup stub.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mfplat: Return S_OK from MFStartup stub.
beb3094c · Alistair Leslie-Hughes · Alexandre Julliard · 0645fa13 · beb3094c · beb3094c
Commit beb3094c authored Apr 30, 2018 by Alistair Leslie-Hughes Committed by Alexandre Julliard Apr 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

main.c dlls/mfplat/main.c +8 -1

mfplat.c dlls/mfplat/tests/mfplat.c +4 -1

No files found.
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -404,8 +404,15 @@ HRESULT WINAPI MFTUnregister(CLSID clsid)
 */
 HRESULT WINAPI MFStartup(ULONG version, DWORD flags)
 {
+#define MF_VERSION_XP   MAKELONG( MF_API_VERSION, 1 )
+#define MF_VERSION_WIN7 MAKELONG( MF_API_VERSION, 2 )
+
    FIXME("(%u, %u): stub\n", version, flags);
-    return MF_E_BAD_STARTUP_VERSION;
+
+    if(version != MF_VERSION_XP && version != MF_VERSION_WIN7)
+        return MF_E_BAD_STARTUP_VERSION;
+
+    return S_OK;
 }

 /***********************************************************************

--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -202,8 +202,11 @@ static void test_MFCreateMediaType(void)
    HRESULT hr;
    IMFMediaType *mediatype;

+    hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL);
+    ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr);
+
    hr = MFStartup(MF_VERSION, MFSTARTUP_FULL);
-    todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK, "got 0x%08x\n", hr);

 if(0)
 {