October 2023 - Wine-Commits

Alexandre Julliard : ntdll: Move the relay trace on thread startup to LdrInitializeThunk().
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: bf2b38a805fbc8b1309cdff38a3311d8a7b5691c URL: https://gitlab.winehq.org/wine/wine/-/commit/bf2b38a805fbc8b1309cdff38a3311… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 16 11:37:57 2023 +0200 ntdll: Move the relay trace on thread startup to LdrInitializeThunk(). --- dlls/ntdll/signal_arm.c | 2 ++ dlls/ntdll/signal_arm64.c | 2 ++ dlls/ntdll/signal_i386.c | 2 ++ dlls/ntdll/signal_x86_64.c | 2 ++ dlls/ntdll/thread.c | 2 -- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index fd653e16381..50eac39c31b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -34,6 +34,7 @@ #include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(threadname); typedef struct _SCOPE_TABLE @@ -1493,6 +1494,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) { loader_init( context, (void **)&context->R0 ); + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->R0, (void *)context->R1 ); NtContinue( context, TRUE ); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 85d31abc028..b244d77a821 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -36,6 +36,7 @@ #include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(threadname); typedef struct _SCOPE_TABLE @@ -1530,6 +1531,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) { loader_init( context, (void **)&context->X0 ); + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->X0, (void *)context->X1 ); NtContinue( context, TRUE ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7174bd36afe..946e553cee1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -35,6 +35,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(threadname); struct x86_thread_data @@ -561,6 +562,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) { loader_init( context, (void **)&context->Eax ); + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->Eax, (void *)context->Ebx ); signal_start_thread( context ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ce57722a930..af3ea1af305 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(unwind); WINE_DECLARE_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(threadname); typedef struct _SCOPE_TABLE @@ -1614,6 +1615,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) { loader_init( context, (void **)&context->Rcx ); + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->Rcx, (void *)context->Rdx ); signal_start_thread( context ); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 82a470271d9..8d072dafa42 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -275,7 +275,6 @@ void DECLSPEC_HIDDEN call_thread_func( PRTL_THREAD_START_ROUTINE entry, void *ar { __TRY { - TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); call_thread_func_wrapper( pBaseThreadInitThunk, entry, arg ); } __EXCEPT(call_unhandled_exception_filter) @@ -325,7 +324,6 @@ void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) { __TRY { - TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); pBaseThreadInitThunk( 0, (LPTHREAD_START_ROUTINE)entry, arg ); } __EXCEPT(call_unhandled_exception_filter)

1 0

Esme Povirk : user32/tests: Reduce size demand in test_hvredraw.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 431d1943f53c0f317d8bf07f808dffb42723d574 URL: https://gitlab.winehq.org/wine/wine/-/commit/431d1943f53c0f317d8bf07f808dff… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Oct 14 14:20:37 2023 -0500 user32/tests: Reduce size demand in test_hvredraw. --- dlls/user32/tests/msg.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ae0e6f3de56..07df7d5cb86 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9598,19 +9598,19 @@ static void subtest_hvredraw(HWND hparent, UINT class_style, DWORD style) static const struct movesize_test { int dx, dy, dw, dh; } movesize_tests[] = { - { 0, 0, 0, 50 }, - { 0, 0, 50, 0 }, - { 0, 0, 50, 50 }, - { 0, 0, -50, -50 }, - { -50, -50, 0, 50 }, - { -50, -50, 50, 0 }, - { -50, -50, 50, 50 }, + { 0, 0, 0, 5 }, + { 0, 0, 5, 0 }, + { 0, 0, 5, 5 }, + { 0, 0, -5, -5 }, + { -5, -5, 0, 5 }, + { -5, -5, 5, 0 }, + { -5, -5, 5, 5 }, }; HRGN hrgn_old_vis = CreateRectRgn( 0, 0, 0, 0 ); HRGN hrgn_new_vis = CreateRectRgn( 0, 0, 0, 0 ); HRGN hrgn_expect = CreateRectRgn( 0, 0, 0, 0 ); HRGN hrgn_actual = CreateRectRgn( 0, 0, 0, 0 ); - const int x0 = 100, y0 = 100, w0 = 200, h0 = 200; + const int x0 = 100, y0 = 100, w0 = 150, h0 = 150; size_t i; HWND hwnd; WNDCLASSA cls = {

1 0

Connor McAdams : uiautomationcore: Potentially raise focus event for serverside providers in response to EVENT_OBJECT_FOCUS.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 2be7de9898131bf40712a76cebfc282e3d41400d URL: https://gitlab.winehq.org/wine/wine/-/commit/2be7de9898131bf40712a76cebfc28… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 11 09:10:31 2023 -0400 uiautomationcore: Potentially raise focus event for serverside providers in response to EVENT_OBJECT_FOCUS. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 16 +++---- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 68 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 47 +++++++++++++++++++++ dlls/uiautomationcore/uia_event.c | 3 +- dlls/uiautomationcore/uia_private.h | 8 ++++ 6 files changed, 133 insertions(+), 10 deletions(-)

1 0

Paul Gofman : ntdll: Use .seh handler instead of __TRY in RtlUserThreadStart() on x64.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: c22aa54e9977785eafcd7cc3811116e5f4dd2da8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c22aa54e9977785eafcd7cc3811116… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 1 22:39:42 2022 +0300 ntdll: Use .seh handler instead of __TRY in RtlUserThreadStart() on x64. --- dlls/ntdll/thread.c | 36 +++++++++++++++++++++++++++++++++++- include/wine/asm.h | 1 + 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 01733585a75..82a470271d9 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -285,7 +285,41 @@ void DECLSPEC_HIDDEN call_thread_func( PRTL_THREAD_START_ROUTINE entry, void *ar __ENDTRY } -#else /* __i386__ */ +#elif /* __i386__ */ defined(__x86_64__) && defined(__ASM_SEH_SUPPORTED) +EXCEPTION_DISPOSITION WINAPI call_thread_func_handler( EXCEPTION_RECORD *rec, ULONG64 frame, + CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) +{ + EXCEPTION_POINTERS ep = { rec, context }; + + WARN( "Unhandled exception, calling filter.\n" ); + + switch (call_unhandled_exception_filter( &ep )) + { + case EXCEPTION_CONTINUE_SEARCH: + return ExceptionContinueSearch; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + case EXCEPTION_EXECUTE_HANDLER: + break; + } + NtTerminateProcess( GetCurrentProcess(), rec->ExceptionCode ); + return ExceptionContinueExecution; +} + +extern void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC( RtlUserThreadStart, + "subq $0x28,%rsp\n\t" + ".seh_stackalloc 0x28\n\t" + ".seh_endprologue\n\t" + "movq %rdx,%r8\n\t" + "movq %rcx,%rdx\n\t" + "xorq %rcx,%rcx\n\t" + "movq " __ASM_NAME( "pBaseThreadInitThunk" ) "(%rip),%r9\n\t" + "call *%r9\n\t" + "int3\n\t" + ".seh_handler call_thread_func_handler, @except\n\t" ) + +#else /* defined(__x86_64__) && defined(__ASM_SEH_SUPPORTED) */ void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) { diff --git a/include/wine/asm.h b/include/wine/asm.h index a158449d6a5..2a21bceb55e 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -54,6 +54,7 @@ # define __ASM_SEH(str) # else # define __ASM_SEH(str) str +# define __ASM_SEH_SUPPORTED # endif #else # define __ASM_SEH(str)

1 0

Helix Graziani : uxtheme/tests: Skip the test if the SystemUsesLightTheme value isn't found.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: e5536fa0de6b9e5dc151bfe3593ac6a72ddfc6f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5536fa0de6b9e5dc151bfe3593ac6… Author: Helix Graziani <helix.graziani(a)hotmail.com> Date: Sat Oct 14 17:48:22 2023 -0400 uxtheme/tests: Skip the test if the SystemUsesLightTheme value isn't found. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=55771 --- dlls/uxtheme/tests/system.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 390baece969..197cd86f6b6 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2617,8 +2617,8 @@ static void test_ShouldSystemUseDarkMode(void) L"SystemUsesLightTheme", RRF_RT_REG_DWORD, NULL, &light_theme, &light_theme_size); if (ls == ERROR_FILE_NOT_FOUND) { - light_theme = 1; - ls = 0; + skip("SystemUsesLightTheme registry value not found.\n"); + return; } ok(ls == 0, "RegGetValue failed: %ld.\n", ls);

1 0

Connor McAdams : uiautomationcore: Add support for translating EVENT_OBJECT_FOCUS for native MSAA IAccessibles.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: cc75dbd315c108298a5f601152040ca7eb47043c URL: https://gitlab.winehq.org/wine/wine/-/commit/cc75dbd315c108298a5f601152040c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Sep 26 11:17:28 2023 -0400 uiautomationcore: Add support for translating EVENT_OBJECT_FOCUS for native MSAA IAccessibles. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 169 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 74 +++++++++++++ dlls/uiautomationcore/uia_event.c | 6 +- dlls/uiautomationcore/uia_private.h | 3 + 4 files changed, 248 insertions(+), 4 deletions(-)

1 0

Gerald Pfeifer : readme: Update FreeBSD information.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: bd0656b6e26007de1e766085be4a084ebfa35dcf URL: https://gitlab.winehq.org/wine/wine/-/commit/bd0656b6e26007de1e766085be4a08… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 15 22:53:27 2023 +0200 readme: Update FreeBSD information. Bump minimum version from 8.0 to 12.4, the minimum release supported upstream. Streamline the FreeBSD section. --- README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README b/README index 2d754da4b82..cc435b6c110 100644 --- a/README +++ b/README @@ -37,7 +37,7 @@ especially the wealth of information found at https://www.winehq.org. To compile and run Wine, you must have one of the following: Linux version 2.0.36 or later - FreeBSD 8.0 or later + FreeBSD 12.4 or later Solaris x86 9 or later NetBSD-current Mac OS X 10.8 or later @@ -47,7 +47,6 @@ systems mentioned above are supported. Other operating systems which support kernel threads may be supported in the future. FreeBSD info: - Wine will generally not work properly on versions before FreeBSD 8.0. See https://wiki.freebsd.org/Wine for more information. Solaris info:

1 0

Connor McAdams : uiautomationcore/tests: Add tests for COM API EVENT_OBJECT_FOCUS translation.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 5a987d48b29e05b640f7fb503fccdf50ec0f9047 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a987d48b29e05b640f7fb503fccdf… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 28 14:52:28 2023 -0400 uiautomationcore/tests: Add tests for COM API EVENT_OBJECT_FOCUS translation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 228 +++++++++++++++++++++++++++-- 1 file changed, 215 insertions(+), 13 deletions(-)

1 0

Nikolay Sivov : include: Add IMFMediaEngineAudioEndpointId definition.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 5617d78f0d391e1e11723a10dbbda2c1df8ba9dd URL: https://gitlab.winehq.org/wine/wine/-/commit/5617d78f0d391e1e11723a10dbbda2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 13 08:12:30 2023 +0200 include: Add IMFMediaEngineAudioEndpointId definition. --- include/mfmediaengine.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index aaf3bb55e4d..f73b9d78914 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -353,3 +353,15 @@ interface IMFMediaEngineNotify : IUnknown { HRESULT EventNotify([in] DWORD event, [in] DWORD_PTR param1, [in] DWORD param2); } + +[ + object, + uuid(7a3bac98-0e76-49fb-8c20-8a86fd98eaf2), + local, + pointer_default(unique) +] +interface IMFMediaEngineAudioEndpointId : IUnknown +{ + HRESULT SetAudioEndpointId([in] LPCWSTR id); + HRESULT GetAudioEndpointId([out] LPWSTR *id); +}

1 0

Nikolay Sivov : mfmediaengine: Keep engine extension pointer.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: b5d43949139ea89e708fd5e3ec9f937b72febec1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5d43949139ea89e708fd5e3ec9f93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 13 11:30:04 2023 +0200 mfmediaengine: Keep engine extension pointer. --- dlls/mfmediaengine/main.c | 17 +++- dlls/mfmediaengine/tests/mfmediaengine.c | 133 +++++++++++++++++++++++++++++++ include/mfmediaengine.idl | 15 ++++ 3 files changed, 162 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 1395eb9bffc..b0c67f031a9 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -158,6 +158,7 @@ struct media_engine IMFMediaSession *session; IMFPresentationClock *clock; IMFSourceResolver *resolver; + IMFMediaEngineExtension *extension; BSTR current_source; struct { @@ -1460,6 +1461,8 @@ static void free_media_engine(struct media_engine *engine) IMFAttributes_Release(engine->attributes); if (engine->resolver) IMFSourceResolver_Release(engine->resolver); + if (engine->extension) + IMFMediaEngineExtension_Release(engine->extension); media_engine_clear_effects(&engine->audio_effects); media_engine_clear_effects(&engine->video_effects); media_engine_release_video_frame_resources(engine); @@ -1559,6 +1562,9 @@ static HRESULT media_engine_set_source(struct media_engine *engine, IMFByteStrea if (url || bytestream) { + if (engine->extension) + FIXME("Use extension to load from.\n"); + flags = MF_RESOLUTION_MEDIASOURCE | MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE; if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS; @@ -3246,10 +3252,15 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->video_frame.pts = MINLONGLONG; InitializeCriticalSection(&engine->cs); - hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, - (void **)&engine->callback); - if (FAILED(hr)) + if (FAILED(hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, + (void **)&engine->callback))) + { + WARN("Notification callback was not provided.\n"); return hr; + } + + IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_EXTENSION, &IID_IMFMediaEngineExtension, + (void **)&engine->extension); IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, (void **)&engine->device_manager); diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 08caa73f8e8..d236d2b4bb8 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -2373,6 +2373,138 @@ done: IMFByteStream_Release(stream); } +struct test_extension +{ + IMFMediaEngineExtension IMFMediaEngineExtension_iface; + LONG refcount; +}; + +static struct test_extension *impl_from_IMFMediaEngineExtension(IMFMediaEngineExtension *iface) +{ + return CONTAINING_RECORD(iface, struct test_extension, IMFMediaEngineExtension_iface); +} + +static HRESULT WINAPI test_extension_QI(IMFMediaEngineExtension *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFMediaEngineExtension) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngineExtension_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_extension_AddRef(IMFMediaEngineExtension *iface) +{ + struct test_extension *extension = impl_from_IMFMediaEngineExtension(iface); + return InterlockedIncrement(&extension->refcount); +} + +static ULONG WINAPI test_extension_Release(IMFMediaEngineExtension *iface) +{ + struct test_extension *extension = impl_from_IMFMediaEngineExtension(iface); + ULONG refcount = InterlockedDecrement(&extension->refcount); + + if (!refcount) + free(extension); + + return refcount; +} + +static HRESULT WINAPI test_extension_CanPlayType(IMFMediaEngineExtension *iface, + BOOL audio_only, BSTR mime_type, MF_MEDIA_ENGINE_CANPLAY *answer) +{ + return 0x80001234; +} + +static HRESULT WINAPI test_extension_BeginCreateObject(IMFMediaEngineExtension *iface, + BSTR url, IMFByteStream *bytestream, MF_OBJECT_TYPE type, IUnknown **cancel_cookie, + IMFAsyncCallback *callback, IUnknown *state) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_extension_CancelObjectCreation(IMFMediaEngineExtension *iface, + IUnknown *cancel_cookie) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_extension_EndCreateObject(IMFMediaEngineExtension *iface, IMFAsyncResult *result, + IUnknown **object) +{ + return E_NOTIMPL; +} + +static const IMFMediaEngineExtensionVtbl test_extension_vtbl = +{ + test_extension_QI, + test_extension_AddRef, + test_extension_Release, + test_extension_CanPlayType, + test_extension_BeginCreateObject, + test_extension_CancelObjectCreation, + test_extension_EndCreateObject, +}; + +static struct test_extension *create_extension(void) +{ + struct test_extension *object; + + object = calloc(1, sizeof(*object)); + + object->IMFMediaEngineExtension_iface.lpVtbl = &test_extension_vtbl; + object->refcount = 1; + + return object; +} + +static void test_media_extension(void) +{ + struct media_engine_notify *notify; + struct test_extension *extension; + MF_MEDIA_ENGINE_CANPLAY answer; + IMFMediaEngine *media_engine; + IMFAttributes *attributes; + HRESULT hr; + BSTR mime; + + notify = create_callback(); + + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + extension = create_extension(); + ok(!!extension, "Failed to create an extension.\n"); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)&notify->IMFMediaEngineNotify_iface); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_EXTENSION, (IUnknown *)&extension->IMFMediaEngineExtension_iface); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_AUDIOONLY, attributes, &media_engine); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IMFAttributes_Release(attributes); + + mime = SysAllocString(L"doesnotexist"); + hr = IMFMediaEngine_CanPlayType(media_engine, mime, &answer); + todo_wine + ok(hr == 0x80001234, "Unexpected hr %#lx.\n", hr); + SysFreeString(mime); + + IMFMediaEngine_Release(media_engine); + + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); + IMFMediaEngineExtension_Release(&extension->IMFMediaEngineExtension_iface); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -2407,6 +2539,7 @@ START_TEST(mfmediaengine) test_effect(); test_GetDuration(); test_GetSeekable(); + test_media_extension(); IMFMediaEngineClassFactory_Release(factory); diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index f73b9d78914..6547ef87462 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -365,3 +365,18 @@ interface IMFMediaEngineAudioEndpointId : IUnknown HRESULT SetAudioEndpointId([in] LPCWSTR id); HRESULT GetAudioEndpointId([out] LPWSTR *id); } + +[ + object, + uuid(2f69d622-20b5-41e9-afdf-89ced1dda04e), + local, + pointer_default(unique) +] +interface IMFMediaEngineExtension : IUnknown +{ + HRESULT CanPlayType([in] BOOL audio_only, [in] BSTR mime_type, [out] MF_MEDIA_ENGINE_CANPLAY *answer); + HRESULT BeginCreateObject([in] BSTR url, [in] IMFByteStream *bytestream, [in] MF_OBJECT_TYPE type, + [out] IUnknown **cancel_cookie, [in] IMFAsyncCallback *callback, [in] IUnknown *state); + HRESULT CancelObjectCreation([in] IUnknown *cancel_cookie); + HRESULT EndCreateObject([in] IMFAsyncResult *result, [out] IUnknown **object); +}

1 0