September 2019 - Wine-Devel

[PATCH] mfmediaengine: Add IMFMediaEngine stub.
by Jactry Zeng Sept. 4, 2019

Sept. 4, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 482 ++++++++++++++++++++++- dlls/mfmediaengine/tests/Makefile.in | 2 +- dlls/mfmediaengine/tests/mfmediaengine.c | 152 +++++++ include/mfmediaengine.idl | 51 +++ 4 files changed, 684 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4bca0fe0ba..9e33b973d4 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -24,8 +24,11 @@ #include "winbase.h" #include "mfmediaengine.h" +#include "mferror.h" +#include "dxgi.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -43,6 +46,432 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } +enum media_engine_mode +{ + MEDIA_ENGINE_INVIAL, + MEDIA_ENGINE_AUDIO_MODE, + MEDIA_ENGINE_RENDERING_MODE, + MEDIA_ENGINE_FRAME_SERVER_MODE, +}; + +struct media_engine_attributes +{ + IMFMediaEngineNotify *callback; + HWND playback_hwnd; + DXGI_FORMAT output_format; + IMFDXGIDeviceManager *dxgi_manager; + enum media_engine_mode mode; +}; + +struct media_engine +{ + IMFMediaEngine IMFMediaEngine_iface; + LONG refcount; + DWORD flags; + struct media_engine_attributes attributes; +}; + +static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); +} + +static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) +{ + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaEngine) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngine_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) +{ + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + ULONG refcount = InterlockedIncrement(&engine->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + return refcount; +} + +static void free_media_engine_attributes(struct media_engine_attributes engine_attr) +{ + if (engine_attr.callback) + IMFMediaEngineNotify_Release(engine_attr.callback); + if (engine_attr.dxgi_manager) + IMFDXGIDeviceManager_Release(engine_attr.dxgi_manager); +} + +static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) +{ + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + ULONG refcount = InterlockedDecrement(&engine->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + if (!refcount) + { + free_media_engine_attributes(engine->attributes); + HeapFree(GetProcessHeap(), 0, engine); + } + + return refcount; +} + +static HRESULT WINAPI media_engine_GetError(IMFMediaEngine *iface, IMFMediaError **error) +{ + FIXME("(%p, %p): stub.\n", iface, error); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngine *iface, MF_MEDIA_ENGINE_ERR error) +{ + FIXME("(%p, %d): stub.\n", iface, error); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetSourceElements(IMFMediaEngine *iface, IMFMediaEngineSrcElements *elements) +{ + FIXME("(%p, %p): stub.\n", iface, elements); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) +{ + FIXME("(%p, %s): stub.\n", iface, debugstr_w(url)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngine *iface, BSTR *url) +{ + FIXME("(%p, %p): stub.\n", iface, url); + + return E_NOTIMPL; +} + +static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return MF_MEDIA_ENGINE_PRELOAD_NONE; +} + +static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_ENGINE_PRELOAD preload) +{ + FIXME("(%p, %d): stub.\n", iface, preload); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **buffered) +{ + FIXME("(%p, %p): stub.\n", iface, buffered); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Load(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_CanPlayType(IMFMediaEngine *iface, BSTR type, MF_MEDIA_ENGINE_CANPLAY *answer) +{ + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_w(type), answer); + + return E_NOTIMPL; +} + +static USHORT WINAPI media_engine_GetReadyState(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) +{ + FIXME("(%p, %f): stub.\n", iface, time); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetStartTime(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngine *iface, double rate) +{ + FIXME("(%p, %f): stub.\n", iface, rate); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngine *iface, double rate) +{ + FIXME("(%p, %f): stub.\n", iface, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngine *iface, IMFMediaTimeRange **played) +{ + FIXME("(%p, %p): stub.\n", iface, played); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngine *iface, IMFMediaTimeRange **seekable) +{ + FIXME("(%p, %p): stub.\n", iface, seekable); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autoplay) +{ + FIXME("(%p, %d): stub.\n", iface, autoplay); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetLoop(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) +{ + FIXME("(%p, %d): stub.\n", iface, loop); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetMuted(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngine *iface, BOOL muted) +{ + FIXME("(%p, %d): stub.\n", iface, muted); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngine *iface, double volume) +{ + FIXME("(%p, %f): stub.\n", iface, volume); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_HasVideo(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static BOOL WINAPI media_engine_HasAudio(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) +{ + FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) +{ + FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_TransferVideoFrame(IMFMediaEngine *iface, IUnknown *surface, + const MFVideoNormalizedRect *src, + const RECT *dst, const MFARGB *color) +{ + FIXME("(%p, %p, %p, %p, %p): stub.\n", iface, surface, src, dst, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_OnVideoStreamTick(IMFMediaEngine *iface, LONGLONG *time) +{ + FIXME("(%p, %p): stub.\n", iface, time); + + return E_NOTIMPL; +} + +static const IMFMediaEngineVtbl media_engine_vtbl = +{ + media_engine_QueryInterface, + media_engine_AddRef, + media_engine_Release, + media_engine_GetError, + media_engine_SetErrorCode, + media_engine_SetSourceElements, + media_engine_SetSource, + media_engine_GetCurrentSource, + media_engine_GetNetworkState, + media_engine_GetPreload, + media_engine_SetPreload, + media_engine_GetBuffered, + media_engine_Load, + media_engine_CanPlayType, + media_engine_GetReadyState, + media_engine_IsSeeking, + media_engine_GetCurrentTime, + media_engine_SetCurrentTime, + media_engine_GetStartTime, + media_engine_GetDuration, + media_engine_IsPaused, + media_engine_GetDefaultPlaybackRate, + media_engine_SetDefaultPlaybackRate, + media_engine_GetPlaybackRate, + media_engine_SetPlaybackRate, + media_engine_GetPlayed, + media_engine_GetSeekable, + media_engine_IsEnded, + media_engine_GetAutoPlay, + media_engine_SetAutoPlay, + media_engine_GetLoop, + media_engine_SetLoop, + media_engine_Play, + media_engine_Pause, + media_engine_GetMuted, + media_engine_SetMuted, + media_engine_GetVolume, + media_engine_SetVolume, + media_engine_HasVideo, + media_engine_HasAudio, + media_engine_GetNativeVideoSize, + media_engine_GetVideoAspectRatio, + media_engine_Shutdown, + media_engine_TransferVideoFrame, + media_engine_OnVideoStreamTick, +}; + static HRESULT WINAPI media_engine_factory_QueryInterface(IMFMediaEngineClassFactory *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFMediaEngineClassFactory) || @@ -68,12 +497,61 @@ static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *ifa return 1; } +static void init_media_engine_attributes(IMFAttributes *attributes, struct media_engine_attributes *engine_attr) +{ + HRESULT hr; + + memset(engine_attr, 0, sizeof(*engine_attr)); + hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, + (void **)&engine_attr->callback); + if (FAILED(hr)) + return; + + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, (UINT64 *)&engine_attr->playback_hwnd); + IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, + (void **)&engine_attr->dxgi_manager); + hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &engine_attr->output_format); + if (engine_attr->playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ + engine_attr->mode = MEDIA_ENGINE_RENDERING_MODE; + else + { + if (SUCCEEDED(hr)) + engine_attr->mode = MEDIA_ENGINE_FRAME_SERVER_MODE; + else + engine_attr->mode = MEDIA_ENGINE_AUDIO_MODE; + } +} + static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFactory *iface, DWORD flags, IMFAttributes *attributes, IMFMediaEngine **engine) { - FIXME("(%p, %#x, %p, %p): stub.\n", iface, flags, attributes, engine); + struct media_engine_attributes engine_attr; + struct media_engine *object; - return E_NOTIMPL; + FIXME("(%p, %#x, %p, %p): semi-stub.\n", iface, flags, attributes, engine); + + if (!attributes || !engine) + return E_POINTER; + + init_media_engine_attributes(attributes, &engine_attr); + if (!engine_attr.mode) + return MF_E_ATTRIBUTENOTFOUND; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + { + free_media_engine_attributes(engine_attr); + return E_OUTOFMEMORY; + } + + object->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + object->refcount = 1; + object->flags = flags; + object->attributes = engine_attr; + + *engine = &object->IMFMediaEngine_iface; + + return S_OK; } static HRESULT WINAPI media_engine_factory_CreateTimeRange(IMFMediaEngineClassFactory *iface, diff --git a/dlls/mfmediaengine/tests/Makefile.in b/dlls/mfmediaengine/tests/Makefile.in index 3f2bb5a094..d508db9f6f 100644 --- a/dlls/mfmediaengine/tests/Makefile.in +++ b/dlls/mfmediaengine/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfmediaengine.dll -IMPORTS = ole32 mfplat mfmediaengine mfuuid +IMPORTS = ole32 mfplat mfmediaengine mfuuid uuid C_SRCS = \ mfmediaengine.c diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index c7fc89f2b1..a264d0d033 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -24,11 +24,85 @@ #include "winbase.h" #include "mfapi.h" +#include "mfidl.h" #include "mfmediaengine.h" +#include "mferror.h" +#include "dxgi.h" +#include "initguid.h" #include "wine/heap.h" #include "wine/test.h" +static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); +} + +static void init_functions(void) +{ + HMODULE mod = GetModuleHandleA("mfplat.dll"); + +#define X(f) p##f = (void*)GetProcAddress(mod, #f) + X(MFCreateDXGIDeviceManager); +#undef X +} + +struct media_engine_notify +{ + IMFMediaEngineNotify IMFMediaEngineNotify_iface; + LONG refcount; +}; + +static inline struct media_engine_notify *impl_from_IMFMediaEngineNotify(IMFMediaEngineNotify *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine_notify, IMFMediaEngineNotify_iface); +} + +static HRESULT WINAPI media_engine_notify_QueryInterface(IMFMediaEngineNotify *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFMediaEngineNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngineNotify_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_notify_AddRef(IMFMediaEngineNotify *iface) +{ + struct media_engine_notify *notify = impl_from_IMFMediaEngineNotify(iface); + return InterlockedIncrement(&notify->refcount); +} + +static ULONG WINAPI media_engine_notify_Release(IMFMediaEngineNotify *iface) +{ + struct media_engine_notify *notify = impl_from_IMFMediaEngineNotify(iface); + return InterlockedDecrement(&notify->refcount); +} + +static HRESULT WINAPI media_engine_notify_EventNotify(IMFMediaEngineNotify *iface, DWORD event, DWORD_PTR param1, DWORD param2) +{ + return S_OK; +} + +static IMFMediaEngineNotifyVtbl media_engine_notify_vtbl = +{ + media_engine_notify_QueryInterface, + media_engine_notify_AddRef, + media_engine_notify_Release, + media_engine_notify_EventNotify, +}; + static void test_factory(void) { IMFMediaEngineClassFactory *factory, *factory2; @@ -47,7 +121,83 @@ static void test_factory(void) "Unexpected hr %#x.\n", hr); if (factory) + { + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine, *media_engine2; + IMFDXGIDeviceManager *manager; + IMFAttributes *attributes; + UINT token; + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "MFCreateAttributes failed: %#x.\n", hr); + + if (0) + { + /* Crashed on Windows 8 */ + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + NULL, &media_engine); + ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + NULL, NULL); + ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + } + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* pre win10v1809 */, + "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFMediaEngine_Release(media_engine); + + EXPECT_REF(factory, 1); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + if (0) + { + /* Different version of Windows has different reference count behaviour, and I didn't + see their logics. So skipping these tests on Windows. */ + EXPECT_REF(media_engine, 1); + EXPECT_REF(factory, 1); + } + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine2); + ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + if (0) + { + EXPECT_REF(media_engine, 1); + EXPECT_REF(media_engine2, 1); + EXPECT_REF(factory, 1); + } + + IMFMediaEngine_Release(media_engine); + IMFMediaEngine_Release(media_engine2); + IMFAttributes_DeleteAllItems(attributes); + IMFAttributes_Release(attributes); + IMFDXGIDeviceManager_Release(manager); IMFMediaEngineClassFactory_Release(factory); + } + else + win_skip("Not IMFMediaEngineClassFactory support.\n"); CoUninitialize(); } @@ -56,6 +206,8 @@ START_TEST(mfmediaengine) { HRESULT hr; + init_functions(); + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "MFStartup failed: %#x.\n", hr); diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index 940cacc9c1..556d2fba2b 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -20,6 +20,36 @@ import "mfidl.idl"; cpp_quote("EXTERN_GUID(CLSID_MFMediaEngineClassFactory, 0xb44392da, 0x499b, 0x446b, 0xa4, 0xcb, 0x00, 0x5f, 0xea, 0xd0, 0xe6, 0xd5);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_AUDIO_CATEGORY, 0xc8d4c51d, 0x350e, 0x41f2, 0xba, 0x46, 0xfa, 0xeb, 0xbb, 0x08, 0x57, 0xf6);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE, 0xd2cb93d1, 0x116a, 0x44f2, 0x93, 0x85, 0xf7, 0xd0, 0xfd, 0xa2, 0xfb, 0x46);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE, 0x4e0212e2, 0xe18f, 0x41e1, 0x95, 0xe5, 0xc0, 0xe7, 0xe9, 0x23, 0x5b, 0xc3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE9, 0x052c2d39, 0x40c0, 0x4188, 0xab, 0x86, 0xf8, 0x28, 0x27, 0x3b, 0x75, 0x22);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE10, 0x11a47afd, 0x6589, 0x4124, 0xb3, 0x12, 0x61, 0x58, 0xec, 0x51, 0x7f, 0xc3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE11, 0x1cf1315f, 0xce3f, 0x4035, 0x93, 0x91, 0x16, 0x14, 0x2f, 0x77, 0x51, 0x89);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE_EDGE, 0xa6f3e465, 0x3aca, 0x442c, 0xa3, 0xf0, 0xad, 0x6d, 0xda, 0xd8, 0x39, 0xae);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CALLBACK, 0xc60381b8, 0x83a4, 0x41f8, 0xa3, 0xd0, 0xde, 0x05, 0x07, 0x68, 0x49, 0xa9);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE, 0x3ef26ad4, 0xdc54, 0x45de, 0xb9, 0xaf, 0x76, 0xc8, 0xc6, 0x6b, 0xfa, 0x8e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WIN10, 0x5b25e089, 0x6ca7, 0x4139, 0xa2, 0xcb, 0xfc, 0xaa, 0xb3, 0x95, 0x52, 0xa3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WWA_EDGE, 0x15b29098, 0x9f01, 0x4e4d, 0xb6, 0x5a, 0xc0, 0x6c, 0x6c, 0x89, 0xda, 0x2a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTENT_PROTECTION_FLAGS, 0xe0350223, 0x5aaf, 0x4d76, 0xa7, 0xc3, 0x06, 0xde, 0x70, 0x89, 0x4d, 0xb4);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTENT_PROTECTION_MANAGER, 0xfdd6dfaa, 0xbd85, 0x4af3, 0x9e, 0x0f, 0xa0, 0x1d, 0x53, 0x9d, 0x87, 0x6a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTINUE_ON_CODEC_ERROR, 0xdbcdb7f9, 0x48e4, 0x4295, 0xb7, 0x0d, 0xd5, 0x18, 0x23, 0x4e, 0xeb, 0x38);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COREWINDOW, 0xfccae4dc, 0x0b7f, 0x41c2, 0x9f, 0x96, 0x46, 0x59, 0x94, 0x8a, 0xcd, 0xdc);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_DXGI_MANAGER, 0x065702da, 0x1094, 0x486d, 0x86, 0x17, 0xee, 0x7c, 0xc4, 0xee, 0x46, 0x48);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_EME_CALLBACK, 0x494553a7, 0xa481, 0x4cb7, 0xbe, 0xc5, 0x38, 0x09, 0x03, 0x51, 0x37, 0x31);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_EXTENSION, 0x3109fd46, 0x060d, 0x4b62, 0x8d, 0xcf, 0xfa, 0xff, 0x81, 0x13, 0x18, 0xd2);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_MEDIA_PLAYER_MODE, 0x3ddd8d45, 0x5aa1, 0x4112, 0x82, 0xe5, 0x36, 0xf6, 0xa2, 0x19, 0x7e, 0x6e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_NEEDKEY_CALLBACK, 0x7ea80843, 0xb6e4, 0x432c, 0x8e, 0xa4, 0x78, 0x48, 0xff, 0xe4, 0x22, 0x0e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_OPM_HWND, 0xa0be8ee7, 0x0572, 0x4f2c, 0xa8, 0x01, 0x2a, 0x15, 0x1b, 0xd3, 0xe7, 0x26);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_PLAYBACK_HWND, 0xd988879b, 0x67c9, 0x4d92, 0xba, 0xa7, 0x6e, 0xad, 0xd4, 0x46, 0x03, 0x9d);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_PLAYBACK_VISUAL, 0x6debd26f, 0x6ab9, 0x4d7e, 0xb0, 0xee, 0xc6, 0x1a, 0x73, 0xff, 0xad, 0x15);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, 0x0ac0c497, 0xb3c4, 0x48c9, 0x9c, 0xde, 0xbb, 0x8c, 0xa2, 0x44, 0x2c, 0xa3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_STREAM_CONTAINS_ALPHA_CHANNEL, 0x5cbfaf44, 0xd2b2, 0x4cfb, 0x80, 0xa7, 0xd4, 0x29, 0xc7, 0x4c, 0x78, 0x9d);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_SYNCHRONOUS_CLOSE, 0xc3c2e12f, 0x7e0e, 0x4e43, 0xb9, 0x1c, 0xdc, 0x99, 0x2c, 0xcd, 0xfa, 0x5e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TELEMETRY_APPLICATION_ID, 0x1e7b273b, 0xa7e4, 0x402a, 0x8f, 0x51, 0xc4, 0x8e, 0x88, 0xa2, 0xca, 0xbc);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TRACK_ID, 0x65bea312, 0x4043, 0x4815, 0x8e, 0xab, 0x44, 0xdc, 0xe2, 0xef, 0x8f, 0x2a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, 0x5066893c, 0x8cf9, 0x42bc, 0x8b, 0x8a, 0x47, 0x22, 0x12, 0xe5, 0x27, 0x26);") + typedef enum MF_MEDIA_ENGINE_ERR { MF_MEDIA_ENGINE_ERR_NOERROR, @@ -54,6 +84,16 @@ typedef struct MFVideoNormalizedRect float bottom; } MFVideoNormalizedRect; +typedef enum MF_MEDIA_ENGINE_CREATEFLAGS +{ + MF_MEDIA_ENGINE_AUDIOONLY = 0x1, + MF_MEDIA_ENGINE_WAITFORSTABLE_STATE = 0x2, + MF_MEDIA_ENGINE_FORCEMUTE = 0x4, + MF_MEDIA_ENGINE_REAL_TIME_MODE = 0x8, + MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS = 0x10, + MF_MEDIA_ENGINE_CREATEFLAGS_MASK = 0x1f +} MF_MEDIA_ENGINE_CREATEFLAGS; + [ object, uuid(fc0e10d2-ab2a-4501-a951-06bb1075184c), @@ -166,3 +206,14 @@ interface IMFMediaEngineClassFactory : IUnknown HRESULT CreateTimeRange([out] IMFMediaTimeRange **range); HRESULT CreateError([out] IMFMediaError **error); } + +[ + object, + uuid(fee7c112-e776-42b5-9bbf-0048524e2bd5), + local, + pointer_default(unique) +] +interface IMFMediaEngineNotify : IUnknown +{ + HRESULT EventNotify([in] DWORD event, [in] DWORD_PTR param1, [in] DWORD param2); +} -- 2.23.0.rc1

4 4

[website] German translation for release 4.13
by Julian Rüger Sept. 4, 2019

Sept. 4, 2019

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 2/4] localspl: AddMonitor should create registry entry for a monitor before initializing it.
by Dmitry Timoshkov Sept. 4, 2019

Sept. 4, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index ccd19811cf..8e5e3428d5 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1499,12 +1499,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) return FALSE; } - /* Load and initialize the monitor. SetLastError() is called on failure */ - if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) { - return FALSE; - } - monitor_unload(pm); - SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { @@ -1538,7 +1532,17 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) res = (RegSetValueExW(hentry, driverW, 0, REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); } + + /* Load and initialize the monitor. SetLastError() is called on failure */ + if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) + res = FALSE; + + monitor_unload(pm); + RegCloseKey(hentry); + + if (!res) + RegDeleteKeyW(hroot, mi2w->pName); } RegCloseKey(hroot); -- 2.20.1

2 1

[PATCH 1/4] localspl: Remove useless NULL checks from AddMonitor trace.
by Dmitry Timoshkov Sept. 4, 2019

Sept. 4, 2019

AddMonitor dereferences pMonitors later without any checks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index cb31b194ae..ccd19811cf 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1475,9 +1475,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) mi2w = (LPMONITOR_INFO_2W) pMonitors; TRACE("(%s, %d, %p): %s %s %s\n", debugstr_w(pName), Level, pMonitors, - debugstr_w(mi2w ? mi2w->pName : NULL), - debugstr_w(mi2w ? mi2w->pEnvironment : NULL), - debugstr_w(mi2w ? mi2w->pDLLName : NULL)); + debugstr_w(mi2w->pName), debugstr_w(mi2w->pEnvironment), debugstr_w(mi2w->pDLLName)); if (copy_servername_from_name(pName, NULL)) { FIXME("server %s not supported\n", debugstr_w(pName)); -- 2.20.1

2 1

[PATCH 1/5] amstream: Reimplement IMemInputPin locally for the DirectDraw stream.
by Zebediah Figura Sept. 3, 2019

Sept. 3, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/ddrawstream.c | 102 ++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 1 + 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index abff80ab80a..88fadaf2f73 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -40,13 +40,17 @@ struct ddraw_stream { IAMMediaStream IAMMediaStream_iface; IDirectDrawMediaStream IDirectDrawMediaStream_iface; + IMemInputPin IMemInputPin_iface; LONG ref; + IMultiMediaStream* parent; MSPID purpose_id; STREAM_TYPE stream_type; IDirectDraw7 *ddraw; DirectDrawMediaStreamInputPin *input_pin; CRITICAL_SECTION critical_section; + + IMemAllocator *allocator; }; static inline struct ddraw_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) @@ -85,7 +89,7 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_QueryInterface(IA else if (IsEqualGUID(riid, &IID_IMemInputPin)) { IAMMediaStream_AddRef(iface); - *ret_iface = &This->input_pin->pin.IMemInputPin_iface; + *ret_iface = &This->IMemInputPin_iface; return S_OK; } @@ -725,6 +729,101 @@ static const BaseInputPinFuncTable DirectDrawMediaStreamInputPin_FuncTable = DirectDrawMediaStreamInputPin_Receive, }; +static inline struct ddraw_stream *impl_from_IMemInputPin(IMemInputPin *iface) +{ + return CONTAINING_RECORD(iface, struct ddraw_stream, IMemInputPin_iface); +} + +static HRESULT WINAPI ddraw_meminput_QueryInterface(IMemInputPin *iface, REFIID iid, void **out) +{ + struct ddraw_stream *stream = impl_from_IMemInputPin(iface); + return IAMMediaStream_QueryInterface(&stream->IAMMediaStream_iface, iid, out); +} + +static ULONG WINAPI ddraw_meminput_AddRef(IMemInputPin *iface) +{ + struct ddraw_stream *stream = impl_from_IMemInputPin(iface); + return IAMMediaStream_AddRef(&stream->IAMMediaStream_iface); +} + +static ULONG WINAPI ddraw_meminput_Release(IMemInputPin *iface) +{ + struct ddraw_stream *stream = impl_from_IMemInputPin(iface); + return IAMMediaStream_Release(&stream->IAMMediaStream_iface); +} + +static HRESULT WINAPI ddraw_meminput_GetAllocator(IMemInputPin *iface, IMemAllocator **allocator) +{ + struct ddraw_stream *stream = impl_from_IMemInputPin(iface); + + TRACE("stream %p, allocator %p.\n", stream, allocator); + + if (stream->allocator) + { + IMemAllocator_AddRef(*allocator = stream->allocator); + return S_OK; + } + + *allocator = NULL; + return VFW_E_NO_ALLOCATOR; +} + +static HRESULT WINAPI ddraw_meminput_NotifyAllocator(IMemInputPin *iface, IMemAllocator *allocator, BOOL readonly) +{ + struct ddraw_stream *stream = impl_from_IMemInputPin(iface); + + TRACE("stream %p, allocator %p, readonly %d.\n", stream, allocator, readonly); + + if (!allocator) + return E_POINTER; + + if (allocator) + IMemAllocator_AddRef(allocator); + if (stream->allocator) + IMemAllocator_Release(stream->allocator); + stream->allocator = allocator; + + return S_OK; +} + +static HRESULT WINAPI ddraw_meminput_GetAllocatorRequirements(IMemInputPin *iface, ALLOCATOR_PROPERTIES *props) +{ + TRACE("iface %p, props %p.\n", iface, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample *sample) +{ + FIXME("iface %p, sample %p, stub!\n", iface, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI ddraw_meminput_ReceiveMultiple(IMemInputPin *iface, + IMediaSample **samples, LONG count, LONG *processed) +{ + FIXME("iface %p, samples %p, count %u, processed %p, stub!\n", iface, samples, count, processed); + return E_NOTIMPL; +} + +static HRESULT WINAPI ddraw_meminput_ReceiveCanBlock(IMemInputPin *iface) +{ + TRACE("iface %p.\n", iface); + return S_OK; +} + +static const IMemInputPinVtbl ddraw_meminput_vtbl = +{ + ddraw_meminput_QueryInterface, + ddraw_meminput_AddRef, + ddraw_meminput_Release, + ddraw_meminput_GetAllocator, + ddraw_meminput_NotifyAllocator, + ddraw_meminput_GetAllocatorRequirements, + ddraw_meminput_Receive, + ddraw_meminput_ReceiveMultiple, + ddraw_meminput_ReceiveCanBlock, +}; + HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { @@ -740,6 +839,7 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->IAMMediaStream_iface.lpVtbl = &DirectDrawMediaStreamImpl_IAMMediaStream_Vtbl; object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Vtbl; + object->IMemInputPin_iface.lpVtbl = &ddraw_meminput_vtbl; object->ref = 1; InitializeCriticalSection(&object->critical_section); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c224d00ca30..9176622ab04 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -189,6 +189,7 @@ static void test_interfaces(void) check_interface(stream, &IID_IAMMediaStream, TRUE); check_interface(stream, &IID_IDirectDrawMediaStream, TRUE); check_interface(stream, &IID_IMediaStream, TRUE); + check_interface(stream, &IID_IMemInputPin, TRUE); check_interface(stream, &IID_IPin, TRUE); check_interface(stream, &IID_IUnknown, TRUE); -- 2.22.0

1 4

[PATCH] comctl32/tests: Tweak an ok() message to avoid a spelling error.
by Francois Gouget Sept. 3, 2019

Sept. 3, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comctl32/tests/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 8ba7f543de5..56b6c6adbe1 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1364,7 +1364,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, visibleItem = (HTREEITEM)SendMessageA(pHdr->hwndFrom, TVM_GETNEXTITEM, TVGN_NEXTVISIBLE, (LPARAM)visibleItem); *(HTREEITEM*)&rect = visibleItem; - ok(visibleItem != NULL, "There must be a visible item after the first visisble item.\n"); + ok(visibleItem != NULL, "There must be a visible item after the first one.\n"); ok(SendMessageA(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for second visible item.\n"); } -- 2.20.1

1 0

[PATCH] kernel32/tests: Avoid unneeded strlen*() calls.
by Francois Gouget Sept. 3, 2019

Sept. 3, 2019

Note that neither the subdir nor the p pointer can be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/path.c | 2 +- dlls/kernel32/tests/volume.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f15cc09ee5e..60cd26dd603 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -130,7 +130,7 @@ static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR * ok(! HAS_TRAIL_SLASH_A(curdirshort), "%s: GetShortPathNameA should not have a trailing \\\n",errstr); /* build relative and absolute paths from inputs */ - if(lstrlenA(subdir)) { + if(*subdir) { sprintf(subpath,"%s\\%s",subdir,filename); } else { lstrcpyA(subpath,filename); diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 21a2b313e56..348ce1a76c5 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -83,7 +83,7 @@ static void test_query_dos_deviceA(void) if (ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { p = buffer; for (;;) { - if (!strlen(p)) break; + if (!*p) break; ret2 = QueryDosDeviceA( p, buffer2, sizeof(buffer2) ); ok(ret2, "QueryDosDeviceA failed to return current mapping for %s, last error %u\n", p, GetLastError()); p += strlen(p) + 1; -- 2.20.1

1 0

[PATCH] ntoskrnl.exe: Add -norelay flag for _vsnprintf
by Andrew Eikum Sept. 3, 2019

Sept. 3, 2019

Fixes traces from services when relay logging. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c46891d88c8..955bd00be7f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1457,7 +1457,7 @@ @ cdecl _strrev(str) @ cdecl _strset(str long) @ cdecl _strupr(str) -@ cdecl _vsnprintf(ptr long str ptr) +@ cdecl -norelay _vsnprintf(ptr long str ptr) @ cdecl _vsnwprintf(ptr long wstr ptr) @ cdecl _wcsicmp(wstr wstr) @ cdecl _wcslwr(wstr) -- 2.23.0

2 1

[PATCH resend v3 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself
by Gabriel Ivăncescu Sept. 3, 2019

Sept. 3, 2019

Renaming a file or directory from e.g. foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/path.c | 73 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index b93add9..d108df5 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1136,6 +1136,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -1317,6 +1327,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -1369,18 +1380,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attrib = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attrib = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attrib & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -1390,6 +1405,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); dest_handle = NULL; @@ -1402,13 +1418,60 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { + RtlFreeUnicodeString( &nt_name ); SetLastError( RtlNtStatusToDosError(status) ); goto error; } + /* When it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t nt_filename_len, pathlen; + const WCHAR *nt_filename; + BOOL used_default; + char *tmp; + INT num; + + nt_filename = memrchrW(nt_name.Buffer, '\\', nt_name.Length / sizeof(WCHAR)) + 1; + nt_filename_len = nt_name.Length / sizeof(WCHAR) - (nt_filename - nt_name.Buffer); + + /* Build it from path + filename (the latter converted from nt_name) */ + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, &used_default); + if (!num && GetLastError() == ERROR_INVALID_PARAMETER) + { + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, NULL); + used_default = FALSE; + } + + if (!used_default && num > 0) + { + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (dest_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = dest_unix.Length + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) -- 2.21.0

2 3

[PATCH] mfmediaengine: Add IMFMediaEngine stub.
by Jactry Zeng Sept. 3, 2019

Sept. 3, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 482 ++++++++++++++++++++++- dlls/mfmediaengine/tests/Makefile.in | 2 +- dlls/mfmediaengine/tests/mfmediaengine.c | 152 +++++++ include/mfmediaengine.idl | 51 +++ 4 files changed, 684 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4bca0fe0ba..9e33b973d4 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -24,8 +24,11 @@ #include "winbase.h" #include "mfmediaengine.h" +#include "mferror.h" +#include "dxgi.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -43,6 +46,432 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } +enum media_engine_mode +{ + MEDIA_ENGINE_INVIAL, + MEDIA_ENGINE_AUDIO_MODE, + MEDIA_ENGINE_RENDERING_MODE, + MEDIA_ENGINE_FRAME_SERVER_MODE, +}; + +struct media_engine_attributes +{ + IMFMediaEngineNotify *callback; + HWND playback_hwnd; + DXGI_FORMAT output_format; + IMFDXGIDeviceManager *dxgi_manager; + enum media_engine_mode mode; +}; + +struct media_engine +{ + IMFMediaEngine IMFMediaEngine_iface; + LONG refcount; + DWORD flags; + struct media_engine_attributes attributes; +}; + +static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); +} + +static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) +{ + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaEngine) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngine_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) +{ + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + ULONG refcount = InterlockedIncrement(&engine->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + return refcount; +} + +static void free_media_engine_attributes(struct media_engine_attributes engine_attr) +{ + if (engine_attr.callback) + IMFMediaEngineNotify_Release(engine_attr.callback); + if (engine_attr.dxgi_manager) + IMFDXGIDeviceManager_Release(engine_attr.dxgi_manager); +} + +static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) +{ + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + ULONG refcount = InterlockedDecrement(&engine->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + if (!refcount) + { + free_media_engine_attributes(engine->attributes); + HeapFree(GetProcessHeap(), 0, engine); + } + + return refcount; +} + +static HRESULT WINAPI media_engine_GetError(IMFMediaEngine *iface, IMFMediaError **error) +{ + FIXME("(%p, %p): stub.\n", iface, error); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngine *iface, MF_MEDIA_ENGINE_ERR error) +{ + FIXME("(%p, %d): stub.\n", iface, error); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetSourceElements(IMFMediaEngine *iface, IMFMediaEngineSrcElements *elements) +{ + FIXME("(%p, %p): stub.\n", iface, elements); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) +{ + FIXME("(%p, %s): stub.\n", iface, debugstr_w(url)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngine *iface, BSTR *url) +{ + FIXME("(%p, %p): stub.\n", iface, url); + + return E_NOTIMPL; +} + +static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return MF_MEDIA_ENGINE_PRELOAD_NONE; +} + +static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_ENGINE_PRELOAD preload) +{ + FIXME("(%p, %d): stub.\n", iface, preload); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **buffered) +{ + FIXME("(%p, %p): stub.\n", iface, buffered); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Load(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_CanPlayType(IMFMediaEngine *iface, BSTR type, MF_MEDIA_ENGINE_CANPLAY *answer) +{ + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_w(type), answer); + + return E_NOTIMPL; +} + +static USHORT WINAPI media_engine_GetReadyState(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) +{ + FIXME("(%p, %f): stub.\n", iface, time); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetStartTime(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngine *iface, double rate) +{ + FIXME("(%p, %f): stub.\n", iface, rate); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngine *iface, double rate) +{ + FIXME("(%p, %f): stub.\n", iface, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngine *iface, IMFMediaTimeRange **played) +{ + FIXME("(%p, %p): stub.\n", iface, played); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngine *iface, IMFMediaTimeRange **seekable) +{ + FIXME("(%p, %p): stub.\n", iface, seekable); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autoplay) +{ + FIXME("(%p, %d): stub.\n", iface, autoplay); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetLoop(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) +{ + FIXME("(%p, %d): stub.\n", iface, loop); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetMuted(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngine *iface, BOOL muted) +{ + FIXME("(%p, %d): stub.\n", iface, muted); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngine *iface, double volume) +{ + FIXME("(%p, %f): stub.\n", iface, volume); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_HasVideo(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static BOOL WINAPI media_engine_HasAudio(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) +{ + FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) +{ + FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_TransferVideoFrame(IMFMediaEngine *iface, IUnknown *surface, + const MFVideoNormalizedRect *src, + const RECT *dst, const MFARGB *color) +{ + FIXME("(%p, %p, %p, %p, %p): stub.\n", iface, surface, src, dst, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_OnVideoStreamTick(IMFMediaEngine *iface, LONGLONG *time) +{ + FIXME("(%p, %p): stub.\n", iface, time); + + return E_NOTIMPL; +} + +static const IMFMediaEngineVtbl media_engine_vtbl = +{ + media_engine_QueryInterface, + media_engine_AddRef, + media_engine_Release, + media_engine_GetError, + media_engine_SetErrorCode, + media_engine_SetSourceElements, + media_engine_SetSource, + media_engine_GetCurrentSource, + media_engine_GetNetworkState, + media_engine_GetPreload, + media_engine_SetPreload, + media_engine_GetBuffered, + media_engine_Load, + media_engine_CanPlayType, + media_engine_GetReadyState, + media_engine_IsSeeking, + media_engine_GetCurrentTime, + media_engine_SetCurrentTime, + media_engine_GetStartTime, + media_engine_GetDuration, + media_engine_IsPaused, + media_engine_GetDefaultPlaybackRate, + media_engine_SetDefaultPlaybackRate, + media_engine_GetPlaybackRate, + media_engine_SetPlaybackRate, + media_engine_GetPlayed, + media_engine_GetSeekable, + media_engine_IsEnded, + media_engine_GetAutoPlay, + media_engine_SetAutoPlay, + media_engine_GetLoop, + media_engine_SetLoop, + media_engine_Play, + media_engine_Pause, + media_engine_GetMuted, + media_engine_SetMuted, + media_engine_GetVolume, + media_engine_SetVolume, + media_engine_HasVideo, + media_engine_HasAudio, + media_engine_GetNativeVideoSize, + media_engine_GetVideoAspectRatio, + media_engine_Shutdown, + media_engine_TransferVideoFrame, + media_engine_OnVideoStreamTick, +}; + static HRESULT WINAPI media_engine_factory_QueryInterface(IMFMediaEngineClassFactory *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFMediaEngineClassFactory) || @@ -68,12 +497,61 @@ static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *ifa return 1; } +static void init_media_engine_attributes(IMFAttributes *attributes, struct media_engine_attributes *engine_attr) +{ + HRESULT hr; + + memset(engine_attr, 0, sizeof(*engine_attr)); + hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, + (void **)&engine_attr->callback); + if (FAILED(hr)) + return; + + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, (UINT64 *)&engine_attr->playback_hwnd); + IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, + (void **)&engine_attr->dxgi_manager); + hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &engine_attr->output_format); + if (engine_attr->playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ + engine_attr->mode = MEDIA_ENGINE_RENDERING_MODE; + else + { + if (SUCCEEDED(hr)) + engine_attr->mode = MEDIA_ENGINE_FRAME_SERVER_MODE; + else + engine_attr->mode = MEDIA_ENGINE_AUDIO_MODE; + } +} + static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFactory *iface, DWORD flags, IMFAttributes *attributes, IMFMediaEngine **engine) { - FIXME("(%p, %#x, %p, %p): stub.\n", iface, flags, attributes, engine); + struct media_engine_attributes engine_attr; + struct media_engine *object; - return E_NOTIMPL; + FIXME("(%p, %#x, %p, %p): semi-stub.\n", iface, flags, attributes, engine); + + if (!attributes || !engine) + return E_POINTER; + + init_media_engine_attributes(attributes, &engine_attr); + if (!engine_attr.mode) + return MF_E_ATTRIBUTENOTFOUND; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + { + free_media_engine_attributes(engine_attr); + return E_OUTOFMEMORY; + } + + object->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + object->refcount = 1; + object->flags = flags; + object->attributes = engine_attr; + + *engine = &object->IMFMediaEngine_iface; + + return S_OK; } static HRESULT WINAPI media_engine_factory_CreateTimeRange(IMFMediaEngineClassFactory *iface, diff --git a/dlls/mfmediaengine/tests/Makefile.in b/dlls/mfmediaengine/tests/Makefile.in index 3f2bb5a094..d508db9f6f 100644 --- a/dlls/mfmediaengine/tests/Makefile.in +++ b/dlls/mfmediaengine/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfmediaengine.dll -IMPORTS = ole32 mfplat mfmediaengine mfuuid +IMPORTS = ole32 mfplat mfmediaengine mfuuid uuid C_SRCS = \ mfmediaengine.c diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index c7fc89f2b1..a264d0d033 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -24,11 +24,85 @@ #include "winbase.h" #include "mfapi.h" +#include "mfidl.h" #include "mfmediaengine.h" +#include "mferror.h" +#include "dxgi.h" +#include "initguid.h" #include "wine/heap.h" #include "wine/test.h" +static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); +} + +static void init_functions(void) +{ + HMODULE mod = GetModuleHandleA("mfplat.dll"); + +#define X(f) p##f = (void*)GetProcAddress(mod, #f) + X(MFCreateDXGIDeviceManager); +#undef X +} + +struct media_engine_notify +{ + IMFMediaEngineNotify IMFMediaEngineNotify_iface; + LONG refcount; +}; + +static inline struct media_engine_notify *impl_from_IMFMediaEngineNotify(IMFMediaEngineNotify *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine_notify, IMFMediaEngineNotify_iface); +} + +static HRESULT WINAPI media_engine_notify_QueryInterface(IMFMediaEngineNotify *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFMediaEngineNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngineNotify_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_notify_AddRef(IMFMediaEngineNotify *iface) +{ + struct media_engine_notify *notify = impl_from_IMFMediaEngineNotify(iface); + return InterlockedIncrement(&notify->refcount); +} + +static ULONG WINAPI media_engine_notify_Release(IMFMediaEngineNotify *iface) +{ + struct media_engine_notify *notify = impl_from_IMFMediaEngineNotify(iface); + return InterlockedDecrement(&notify->refcount); +} + +static HRESULT WINAPI media_engine_notify_EventNotify(IMFMediaEngineNotify *iface, DWORD event, DWORD_PTR param1, DWORD param2) +{ + return S_OK; +} + +static IMFMediaEngineNotifyVtbl media_engine_notify_vtbl = +{ + media_engine_notify_QueryInterface, + media_engine_notify_AddRef, + media_engine_notify_Release, + media_engine_notify_EventNotify, +}; + static void test_factory(void) { IMFMediaEngineClassFactory *factory, *factory2; @@ -47,7 +121,83 @@ static void test_factory(void) "Unexpected hr %#x.\n", hr); if (factory) + { + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine, *media_engine2; + IMFDXGIDeviceManager *manager; + IMFAttributes *attributes; + UINT token; + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "MFCreateAttributes failed: %#x.\n", hr); + + if (0) + { + /* Crashed on Windows 8 */ + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + NULL, &media_engine); + ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + NULL, NULL); + ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + } + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* pre win10v1809 */, + "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFMediaEngine_Release(media_engine); + + EXPECT_REF(factory, 1); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + if (0) + { + /* Different version of Windows has different reference count behaviour, and I didn't + see their logics. So skipping these tests on Windows. */ + EXPECT_REF(media_engine, 1); + EXPECT_REF(factory, 1); + } + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine2); + ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + if (0) + { + EXPECT_REF(media_engine, 1); + EXPECT_REF(media_engine2, 1); + EXPECT_REF(factory, 1); + } + + IMFMediaEngine_Release(media_engine); + IMFMediaEngine_Release(media_engine2); + IMFAttributes_DeleteAllItems(attributes); + IMFAttributes_Release(attributes); + IMFDXGIDeviceManager_Release(manager); IMFMediaEngineClassFactory_Release(factory); + } + else + win_skip("Not IMFMediaEngineClassFactory support.\n"); CoUninitialize(); } @@ -56,6 +206,8 @@ START_TEST(mfmediaengine) { HRESULT hr; + init_functions(); + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "MFStartup failed: %#x.\n", hr); diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index 940cacc9c1..556d2fba2b 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -20,6 +20,36 @@ import "mfidl.idl"; cpp_quote("EXTERN_GUID(CLSID_MFMediaEngineClassFactory, 0xb44392da, 0x499b, 0x446b, 0xa4, 0xcb, 0x00, 0x5f, 0xea, 0xd0, 0xe6, 0xd5);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_AUDIO_CATEGORY, 0xc8d4c51d, 0x350e, 0x41f2, 0xba, 0x46, 0xfa, 0xeb, 0xbb, 0x08, 0x57, 0xf6);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE, 0xd2cb93d1, 0x116a, 0x44f2, 0x93, 0x85, 0xf7, 0xd0, 0xfd, 0xa2, 0xfb, 0x46);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE, 0x4e0212e2, 0xe18f, 0x41e1, 0x95, 0xe5, 0xc0, 0xe7, 0xe9, 0x23, 0x5b, 0xc3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE9, 0x052c2d39, 0x40c0, 0x4188, 0xab, 0x86, 0xf8, 0x28, 0x27, 0x3b, 0x75, 0x22);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE10, 0x11a47afd, 0x6589, 0x4124, 0xb3, 0x12, 0x61, 0x58, 0xec, 0x51, 0x7f, 0xc3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE11, 0x1cf1315f, 0xce3f, 0x4035, 0x93, 0x91, 0x16, 0x14, 0x2f, 0x77, 0x51, 0x89);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE_EDGE, 0xa6f3e465, 0x3aca, 0x442c, 0xa3, 0xf0, 0xad, 0x6d, 0xda, 0xd8, 0x39, 0xae);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CALLBACK, 0xc60381b8, 0x83a4, 0x41f8, 0xa3, 0xd0, 0xde, 0x05, 0x07, 0x68, 0x49, 0xa9);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE, 0x3ef26ad4, 0xdc54, 0x45de, 0xb9, 0xaf, 0x76, 0xc8, 0xc6, 0x6b, 0xfa, 0x8e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WIN10, 0x5b25e089, 0x6ca7, 0x4139, 0xa2, 0xcb, 0xfc, 0xaa, 0xb3, 0x95, 0x52, 0xa3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WWA_EDGE, 0x15b29098, 0x9f01, 0x4e4d, 0xb6, 0x5a, 0xc0, 0x6c, 0x6c, 0x89, 0xda, 0x2a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTENT_PROTECTION_FLAGS, 0xe0350223, 0x5aaf, 0x4d76, 0xa7, 0xc3, 0x06, 0xde, 0x70, 0x89, 0x4d, 0xb4);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTENT_PROTECTION_MANAGER, 0xfdd6dfaa, 0xbd85, 0x4af3, 0x9e, 0x0f, 0xa0, 0x1d, 0x53, 0x9d, 0x87, 0x6a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTINUE_ON_CODEC_ERROR, 0xdbcdb7f9, 0x48e4, 0x4295, 0xb7, 0x0d, 0xd5, 0x18, 0x23, 0x4e, 0xeb, 0x38);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COREWINDOW, 0xfccae4dc, 0x0b7f, 0x41c2, 0x9f, 0x96, 0x46, 0x59, 0x94, 0x8a, 0xcd, 0xdc);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_DXGI_MANAGER, 0x065702da, 0x1094, 0x486d, 0x86, 0x17, 0xee, 0x7c, 0xc4, 0xee, 0x46, 0x48);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_EME_CALLBACK, 0x494553a7, 0xa481, 0x4cb7, 0xbe, 0xc5, 0x38, 0x09, 0x03, 0x51, 0x37, 0x31);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_EXTENSION, 0x3109fd46, 0x060d, 0x4b62, 0x8d, 0xcf, 0xfa, 0xff, 0x81, 0x13, 0x18, 0xd2);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_MEDIA_PLAYER_MODE, 0x3ddd8d45, 0x5aa1, 0x4112, 0x82, 0xe5, 0x36, 0xf6, 0xa2, 0x19, 0x7e, 0x6e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_NEEDKEY_CALLBACK, 0x7ea80843, 0xb6e4, 0x432c, 0x8e, 0xa4, 0x78, 0x48, 0xff, 0xe4, 0x22, 0x0e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_OPM_HWND, 0xa0be8ee7, 0x0572, 0x4f2c, 0xa8, 0x01, 0x2a, 0x15, 0x1b, 0xd3, 0xe7, 0x26);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_PLAYBACK_HWND, 0xd988879b, 0x67c9, 0x4d92, 0xba, 0xa7, 0x6e, 0xad, 0xd4, 0x46, 0x03, 0x9d);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_PLAYBACK_VISUAL, 0x6debd26f, 0x6ab9, 0x4d7e, 0xb0, 0xee, 0xc6, 0x1a, 0x73, 0xff, 0xad, 0x15);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, 0x0ac0c497, 0xb3c4, 0x48c9, 0x9c, 0xde, 0xbb, 0x8c, 0xa2, 0x44, 0x2c, 0xa3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_STREAM_CONTAINS_ALPHA_CHANNEL, 0x5cbfaf44, 0xd2b2, 0x4cfb, 0x80, 0xa7, 0xd4, 0x29, 0xc7, 0x4c, 0x78, 0x9d);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_SYNCHRONOUS_CLOSE, 0xc3c2e12f, 0x7e0e, 0x4e43, 0xb9, 0x1c, 0xdc, 0x99, 0x2c, 0xcd, 0xfa, 0x5e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TELEMETRY_APPLICATION_ID, 0x1e7b273b, 0xa7e4, 0x402a, 0x8f, 0x51, 0xc4, 0x8e, 0x88, 0xa2, 0xca, 0xbc);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TRACK_ID, 0x65bea312, 0x4043, 0x4815, 0x8e, 0xab, 0x44, 0xdc, 0xe2, 0xef, 0x8f, 0x2a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, 0x5066893c, 0x8cf9, 0x42bc, 0x8b, 0x8a, 0x47, 0x22, 0x12, 0xe5, 0x27, 0x26);") + typedef enum MF_MEDIA_ENGINE_ERR { MF_MEDIA_ENGINE_ERR_NOERROR, @@ -54,6 +84,16 @@ typedef struct MFVideoNormalizedRect float bottom; } MFVideoNormalizedRect; +typedef enum MF_MEDIA_ENGINE_CREATEFLAGS +{ + MF_MEDIA_ENGINE_AUDIOONLY = 0x1, + MF_MEDIA_ENGINE_WAITFORSTABLE_STATE = 0x2, + MF_MEDIA_ENGINE_FORCEMUTE = 0x4, + MF_MEDIA_ENGINE_REAL_TIME_MODE = 0x8, + MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS = 0x10, + MF_MEDIA_ENGINE_CREATEFLAGS_MASK = 0x1f +} MF_MEDIA_ENGINE_CREATEFLAGS; + [ object, uuid(fc0e10d2-ab2a-4501-a951-06bb1075184c), @@ -166,3 +206,14 @@ interface IMFMediaEngineClassFactory : IUnknown HRESULT CreateTimeRange([out] IMFMediaTimeRange **range); HRESULT CreateError([out] IMFMediaError **error); } + +[ + object, + uuid(fee7c112-e776-42b5-9bbf-0048524e2bd5), + local, + pointer_default(unique) +] +interface IMFMediaEngineNotify : IUnknown +{ + HRESULT EventNotify([in] DWORD event, [in] DWORD_PTR param1, [in] DWORD param2); +} -- 2.23.0.rc1

1 0