diff --git a/patches/mfplat-MFStartup/0001-mfplat-Return-S_OK-from-MFStartup-stub.patch b/patches/mfplat-MFStartup/0001-mfplat-Return-S_OK-from-MFStartup-stub.patch new file mode 100644 index 00000000..f17ce9eb --- /dev/null +++ b/patches/mfplat-MFStartup/0001-mfplat-Return-S_OK-from-MFStartup-stub.patch @@ -0,0 +1,39 @@ +From 4447aeae75be2479c1008d05367eb3f7422d0c09 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Thu, 31 Aug 2017 01:32:46 +0200 +Subject: mfplat: Return S_OK from MFStartup stub. + +--- + dlls/mfplat/main.c | 2 +- + dlls/mfplat/tests/mfplat.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c +index e6616c81024..6864079d9d8 100644 +--- a/dlls/mfplat/main.c ++++ b/dlls/mfplat/main.c +@@ -405,7 +405,7 @@ HRESULT WINAPI MFTUnregister(CLSID clsid) + HRESULT WINAPI MFStartup(ULONG version, DWORD flags) + { + FIXME("(%u, %u): stub\n", version, flags); +- return MF_E_BAD_STARTUP_VERSION; ++ return S_OK; + } + + /*********************************************************************** +diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c +index 13853c5fb5b..fcf92f30d07 100644 +--- a/dlls/mfplat/tests/mfplat.c ++++ b/dlls/mfplat/tests/mfplat.c +@@ -200,7 +200,7 @@ static void test_MFCreateMediaType(void) + IMFMediaType *mediatype; + + 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) + { +-- +2.14.1 + diff --git a/patches/mfplat-MFStartup/definition b/patches/mfplat-MFStartup/definition new file mode 100644 index 00000000..8ccd0840 --- /dev/null +++ b/patches/mfplat-MFStartup/definition @@ -0,0 +1 @@ +Fixes: [43607] Return S_OK from MFStartup stub diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index a374c30a..57ddfa4e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -216,6 +216,7 @@ patch_enable_all () enable_libs_Unicode_Collation="$1" enable_loader_OSX_Preloader="$1" enable_makedep_PARENTSPEC="$1" + enable_mfplat_MFStartup="$1" enable_mmsystem_dll16_MIDIHDR_Refcount="$1" enable_mountmgr_DosDevices="$1" enable_mpr_WNetGetUniversalNameW="$1" @@ -922,6 +923,9 @@ patch_enable () makedep-PARENTSPEC) enable_makedep_PARENTSPEC="$2" ;; + mfplat-MFStartup) + enable_mfplat_MFStartup="$2" + ;; mmsystem.dll16-MIDIHDR_Refcount) enable_mmsystem_dll16_MIDIHDR_Refcount="$2" ;; @@ -5622,6 +5626,21 @@ if test "$enable_makedep_PARENTSPEC" -eq 1; then ) >> "$patchlist" fi +# Patchset mfplat-MFStartup +# | +# | This patchset fixes the following Wine bugs: +# | * [#43607] Return S_OK from MFStartup stub +# | +# | Modified files: +# | * dlls/mfplat/main.c, dlls/mfplat/tests/mfplat.c +# | +if test "$enable_mfplat_MFStartup" -eq 1; then + patch_apply mfplat-MFStartup/0001-mfplat-Return-S_OK-from-MFStartup-stub.patch + ( + printf '%s\n' '+ { "Sebastian Lackner", "mfplat: Return S_OK from MFStartup stub.", 1 },'; + ) >> "$patchlist" +fi + # Patchset mmsystem.dll16-MIDIHDR_Refcount # | # | This patchset fixes the following Wine bugs: