Module: wine Branch: master Commit: beb3094ca8cdf50b5422e7242cb74354f4e03420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb3094ca8cdf50b5422e7242...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Mon Apr 30 00:47:18 2018 +0000
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
---
dlls/mfplat/main.c | 9 ++++++++- dlls/mfplat/tests/mfplat.c | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7c5be65..df61f3c 100644 --- 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; }
/*********************************************************************** diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f85b00c..f3a4521 100644 --- 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) {