wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Paul Gofman : ntdll: Fixup instruction pointer for EXCEPTION_BREAKPOINT in the Unix part on x86/x86_64.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: e722660114e268179344e2e076a8e10b0f8ab3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e722660114e268179344e2e0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 9 18:36:52 2020 +0300 ntdll: Fixup instruction pointer for EXCEPTION_BREAKPOINT in the Unix part on x86/x86_64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 3 --- dlls/ntdll/signal_x86_64.c | 3 --- dlls/ntdll/tests/exception.c | 53 ++++++++++++++++++++++++++++++++--------- dlls/ntdll/unix/signal_i386.c | 13 +++++++++- dlls/ntdll/unix/signal_x86_64.c | 13 ++++++++++ 5 files changed, 67 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5e0c0bd090..a130638cb3 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -230,9 +230,6 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) context->SegEs, context->SegFs, context->SegGs, context->EFlags ); } - /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; - if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) NtContinue( context, FALSE ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c7c8b96405..57f9aee810 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -564,9 +564,6 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) context->R12, context->R13, context->R14, context->R15 ); } - /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; - if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) NtContinue( context, FALSE ); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f39e6f9794..c78f491108 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1671,6 +1671,9 @@ static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGIST CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { ok(hook_called, "Hook was not called.\n"); + + ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + got_exception = 1; dbg_except_continue_handler_eip = (void *)context->Eip; ++context->Eip; @@ -1682,11 +1685,22 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE EXCEPTION_RECORD *rec = e->ExceptionRecord; CONTEXT *context = e->ContextRecord; - trace("dbg_except_continue_vectored_handler, code %#x, eip %#x.\n", rec->ExceptionCode, context->Eip); + trace("dbg_except_continue_vectored_handler, code %#x, eip %#x, ExceptionAddress %p.\n", + rec->ExceptionCode, context->Eip, rec->ExceptionAddress); + + ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); got_exception = 1; - ++context->Eip; + if ((ULONG_PTR)rec->ExceptionAddress == context->Eip + 1) + { + /* XP and Vista+ have ExceptionAddress == Eip + 1, Eip is adjusted even + * for software raised breakpoint exception. + * Win2003 has Eip not adjusted and matching ExceptionAddress. + * Win2008 has Eip not adjuated and ExceptionAddress not filled for + * software raised exception. */ + context->Eip = (ULONG_PTR)rec->ExceptionAddress; + } return EXCEPTION_CONTINUE_EXECUTION; } @@ -1775,7 +1789,7 @@ static void test_kiuserexceptiondispatcher(void) ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, "Got unexpected exception address %p, expected %p.\n", hook_exception_address, code_mem); - todo_wine ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", + ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", hook_KiUserExceptionDispatcher_eip, code_mem); ok(dbg_except_continue_handler_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", dbg_except_continue_handler_eip, code_mem); @@ -1796,7 +1810,7 @@ static void test_kiuserexceptiondispatcher(void) pRtlRaiseException(&record); ok(got_exception, "Handler was not called.\n"); - ok(hook_called, "Hook was not called.\n"); + ok(hook_called || broken(!hook_called) /* 2003 */, "Hook was not called.\n"); RemoveVectoredExceptionHandler(dbg_except_continue_vectored_handler); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), @@ -2832,13 +2846,13 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE trace("dbg_except_continue_vectored_handler, code %#x, Rip %#lx.\n", rec->ExceptionCode, context->Rip); + ok(rec->ExceptionCode == 0x80000003, "Got unexpected exception code %#x.\n", rec->ExceptionCode); + got_exception = 1; - if (NtCurrentTeb()->Peb->BeingDebugged || !strcmp( winetest_platform, "wine" )) - { - todo_wine_if(!NtCurrentTeb()->Peb->BeingDebugged) - ok(NtCurrentTeb()->Peb->BeingDebugged, "context->Rip misplaced for dbg breakpoint exception.\n"); + dbg_except_continue_handler_rip = (void *)context->Rip; + if (NtCurrentTeb()->Peb->BeingDebugged) ++context->Rip; - } + return EXCEPTION_CONTINUE_EXECUTION; } @@ -2934,7 +2948,7 @@ static void test_kiuserexceptiondispatcher(void) ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, "Got unexpected exception address %p, expected %p.\n", hook_exception_address, code_mem); - todo_wine ok(hook_KiUserExceptionDispatcher_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", + ok(hook_KiUserExceptionDispatcher_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", hook_KiUserExceptionDispatcher_rip, code_mem); ok(dbg_except_continue_handler_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", dbg_except_continue_handler_rip, code_mem); @@ -2969,10 +2983,27 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - NtCurrentTeb()->Peb->BeingDebugged = 0; + ok(hook_exception_address == (BYTE *)hook_KiUserExceptionDispatcher_rip + 1 + || broken(!hook_exception_address) /* 2008 */, "Got unexpected addresses %p, %p.\n", + hook_KiUserExceptionDispatcher_rip, hook_exception_address); RemoveVectoredExceptionHandler(dbg_except_continue_vectored_handler); + memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, + sizeof(patched_KiUserExceptionDispatcher_bytes)); + got_exception = 0; + hook_called = FALSE; + run_exception_test(dbg_except_continue_handler, NULL, except_code, ARRAY_SIZE(except_code), PAGE_EXECUTE_READ); + + ok(got_exception, "Handler was not called.\n"); + ok(hook_called, "Hook was not called.\n"); + ok(hook_KiUserExceptionDispatcher_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_rip, code_mem); + ok(dbg_except_continue_handler_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_rip, code_mem); + + NtCurrentTeb()->Peb->BeingDebugged = 0; + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), old_protect2, &old_protect2); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 1e0774e84d..44195fc205 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1584,11 +1584,22 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * SS_sig(sigcontext) = get_ds(); stack->rec_ptr = &stack->rec; /* arguments for KiUserExceptionDispatcher */ stack->context_ptr = &stack->context; + + if (stack->rec.ExceptionCode == EXCEPTION_BREAKPOINT) + { + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + stack->context.Eip--; + } } __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "add $4,%esp\n\t" - "jmp *8(%esp)") + "movl (%esp),%eax\n\t" /* rec */ + "cmpl $0x80000003,(%eax)\n\t" /* ExceptionCode */ + "jne 1f\n\t" + "movl 4(%esp),%eax\n\t" /* context */ + "decl 0xb8(%eax)\n\t" /* Eip */ + "1:\tjmp *8(%esp)") /********************************************************************** * get_fpu_code diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6e103a78fb..eed622851f 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1958,6 +1958,12 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * return; } + if (stack->rec.ExceptionCode == EXCEPTION_BREAKPOINT) + { + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + stack->context.Rip--; + } + /* now modify the sigcontext to return to the raise function */ RIP_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; R8_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; @@ -1983,6 +1989,13 @@ void WINAPI do_call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *c { memmove(&stack->context, context, sizeof(*context)); memcpy(&stack->rec, rec, sizeof(*rec)); + + if (stack->rec.ExceptionCode == EXCEPTION_BREAKPOINT) + { + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + stack->context.Rip--; + } + user_exception_dispatcher_trampoline( stack, dispatcher ); }

1 0

Huw Davies : include: Update some members of KUSER_SHARED_DATA.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: b72270cb16bc670bbf46be6fdc8dffc525d82f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72270cb16bc670bbf46be6f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 9 16:15:40 2020 +0100 include: Update some members of KUSER_SHARED_DATA. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 36 ++++++++++++++++++++++++++++++++---- server/mapping.c | 2 +- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 23ac630f41..59af860708 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1246,6 +1246,7 @@ typedef struct _KUSER_SHARED_DATA { ULONG SuiteMask; /* 0x2d0 */ BOOLEAN KdDebuggerEnabled; /* 0x2d4 */ UCHAR NXSupportPolicy; /* 0x2d5 */ + USHORT CyclesPerYield; /* 0x2d6 */ volatile ULONG ActiveConsoleId; /* 0x2d8 */ volatile ULONG DismountCount; /* 0x2dc */ ULONG ComPlusPackage; /* 0x2e0 */ @@ -1253,16 +1254,43 @@ typedef struct _KUSER_SHARED_DATA { ULONG NumberOfPhysicalPages; /* 0x2e8 */ BOOLEAN SafeBootMode; /* 0x2ec */ UCHAR VirtualizationFlags; /* 0x2ed */ - ULONG TraceLogging; /* 0x2f0 */ + union { + ULONG SharedDataFlags; /* 0x2f0 */ + struct { + ULONG DbgErrorPortPresent : 1; + ULONG DbgElevationEnabed : 1; + ULONG DbgVirtEnabled : 1; + ULONG DbgInstallerDetectEnabled : 1; + ULONG DbgLkgEnabled : 1; + ULONG DbgDynProcessorEnabled : 1; + ULONG DbgConsoleBrokerEnabled : 1; + ULONG DbgSecureBootEnabled : 1; + ULONG DbgMultiSessionSku : 1; + ULONG DbgMultiUsersInSessionSku : 1; + ULONG DbgStateSeparationEnabled : 1; + ULONG SpareBits : 21; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME2; + ULONG DataFlagsPad[1]; /* 0x2f4 */ ULONGLONG TestRetInstruction; /* 0x2f8 */ - ULONG SystemCall; /* 0x300 */ - ULONG SystemCallReturn; /* 0x304 */ - ULONGLONG SystemCallPad[3]; /* 0x308 */ + LONGLONG QpcFrequency; /* 0x300 */ + ULONG SystemCall; /* 0x308 */ + union { + ULONG AllFlags; /* 0x30c */ + struct { + ULONG Win32Process : 1; + ULONG Sgx2Enclave : 1; + ULONG VbsBasicEnclave : 1; + ULONG SpareBits : 29; + } DUMMYSTRUCTNAME; + } UserCetAvailableEnvironments; + ULONGLONG SystemCallPad[2]; /* 0x310 */ union { volatile KSYSTEM_TIME TickCount; /* 0x320 */ volatile ULONG64 TickCountQuad; } DUMMYUNIONNAME; ULONG Cookie; /* 0x330 */ + ULONG CookiePad[1]; /* 0x334 */ LONGLONG ConsoleSessionForegroundProcessId; /* 0x338 */ ULONGLONG TimeUpdateLock; /* 0x340 */ ULONGLONG BaselineSystemTimeQpc; /* 0x348 */ diff --git a/server/mapping.c b/server/mapping.c index ce70b696bd..db0debe0af 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -967,7 +967,7 @@ struct object *create_user_data_mapping( struct object *root, const struct unico if (ptr != MAP_FAILED) { user_shared_data = ptr; - user_shared_data->SystemCallPad[0] = 1; + user_shared_data->SystemCall = 1; } return &mapping->obj; }

1 0

Nikolay Sivov : mf/evr: Let mixer request necessary services.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 67a840dc5cbb7f07e2c482047a896b1c90ebb7ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a840dc5cbb7f07e2c48204… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 9 15:08:52 2020 +0300 mf/evr: Let mixer request necessary services. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 42a6c98cf6..8a4aa3c350 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -28,7 +28,8 @@ enum video_renderer_flags { EVR_SHUT_DOWN = 0x1, EVR_INIT_SERVICES = 0x2, /* Currently in InitServices() call. */ - EVR_PRESENTER_INITED_SERVICES = 0x4, + EVR_MIXER_INITED_SERVICES = 0x4, + EVR_PRESENTER_INITED_SERVICES = 0x8, }; struct video_renderer @@ -96,6 +97,14 @@ static void video_renderer_release_services(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; + if (renderer->flags & EVR_MIXER_INITED_SERVICES && SUCCEEDED(IMFTransform_QueryInterface(renderer->mixer, + &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) + { + IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); + IMFTopologyServiceLookupClient_Release(lookup_client); + renderer->flags &= ~EVR_MIXER_INITED_SERVICES; + } + if (renderer->flags & EVR_PRESENTER_INITED_SERVICES && SUCCEEDED(IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) { @@ -716,8 +725,10 @@ static const IMediaEventSinkVtbl media_event_sink_vtbl = video_renderer_event_sink_Notify, }; -static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) +static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFAttributes *attributes, + IMFTransform **out) { + IMFTopologyServiceLookupClient *lookup_client; unsigned int flags = 0; IMFActivate *activate; CLSID clsid; @@ -736,7 +747,23 @@ static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransfo if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); - return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); + if (SUCCEEDED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out))) + { + if (SUCCEEDED(hr = IMFTransform_QueryInterface(*out, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) + { + renderer->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &renderer->IMFTopologyServiceLookup_iface))) + { + renderer->flags |= EVR_MIXER_INITED_SERVICES; + } + renderer->flags &= ~EVR_INIT_SERVICES; + IMFTopologyServiceLookupClient_Release(lookup_client); + } + } + + return hr; } static HRESULT video_renderer_create_presenter(struct video_renderer *renderer, IMFAttributes *attributes, @@ -805,7 +832,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, goto failed; /* Create mixer and presenter. */ - if (FAILED(hr = video_renderer_create_mixer(attributes, &object->mixer))) + if (FAILED(hr = video_renderer_create_mixer(object, attributes, &object->mixer))) goto failed; if (FAILED(hr = video_renderer_create_presenter(object, attributes, &object->presenter)))

1 0

Nikolay Sivov : evr/mixer: Request EVR event sink.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: cdf8118ab37b27ffaa7a039d410b859ce100da90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf8118ab37b27ffaa7a039d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 9 15:08:51 2020 +0300 evr/mixer: Request EVR event sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index f274a2a447..7b9949b01d 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -73,6 +73,8 @@ struct video_mixer IDirect3DDeviceManager9 *device_manager; + IMediaEventSink *event_sink; + CRITICAL_SECTION cs; }; @@ -899,16 +901,44 @@ static ULONG WINAPI video_mixer_service_client_Release(IMFTopologyServiceLookupC static HRESULT WINAPI video_mixer_service_client_InitServicePointers(IMFTopologyServiceLookupClient *iface, IMFTopologyServiceLookup *service_lookup) { - FIXME("%p, %p.\n", iface, service_lookup); + struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); + unsigned int count; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, service_lookup); + + if (!service_lookup) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + + count = 1; + if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&mixer->event_sink, &count))) + { + WARN("Failed to get renderer event sink, hr %#x.\n", hr); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_service_client_ReleaseServicePointers(IMFTopologyServiceLookupClient *iface) { - FIXME("%p.\n", iface); + struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&mixer->cs); + + if (mixer->event_sink) + IMediaEventSink_Release(mixer->event_sink); + mixer->event_sink = NULL; + + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static const IMFTopologyServiceLookupClientVtbl video_mixer_service_client_vtbl =

1 0

Nikolay Sivov : mf/evr: Return mixer's transform for MR_VIDEO_MIXER_SERVICE requests.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 34d453529216114e59115ed1e6853a7ef13c8057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d453529216114e59115ed1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 9 15:08:50 2020 +0300 mf/evr: Return mixer's transform for MR_VIDEO_MIXER_SERVICE requests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index b702ed2e22..42a6c98cf6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -642,8 +642,16 @@ static HRESULT WINAPI video_renderer_service_lookup_LookupService(IMFTopologySer } else if (IsEqualGUID(service, &MR_VIDEO_MIXER_SERVICE)) { - FIXME("Unimplemented lookup for mixer service.\n"); - hr = MF_E_UNSUPPORTED_SERVICE; + if (IsEqualIID(riid, &IID_IMFTransform)) + { + *objects = renderer->mixer; + IUnknown_AddRef((IUnknown *)*objects); + } + else + { + FIXME("Unsupported interface %s for mixer service.\n", debugstr_guid(riid)); + hr = E_NOINTERFACE; + } } else {

1 0

Nikolay Sivov : mf/evr: Add support for LookupService() for MR_VIDEO_RENDER_SERVICE/IMediaEventSink.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 03401edef8a4a460f455af39f34b7367909cce4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=03401edef8a4a460f455af39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 9 15:08:49 2020 +0300 mf/evr: Add support for LookupService() for MR_VIDEO_RENDER_SERVICE/IMediaEventSink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 123 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 4a70f79872..b702ed2e22 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); enum video_renderer_flags { EVR_SHUT_DOWN = 0x1, + EVR_INIT_SERVICES = 0x2, /* Currently in InitServices() call. */ + EVR_PRESENTER_INITED_SERVICES = 0x4, }; struct video_renderer @@ -38,6 +40,7 @@ struct video_renderer IMFMediaEventGenerator IMFMediaEventGenerator_iface; IMFGetService IMFGetService_iface; IMFTopologyServiceLookup IMFTopologyServiceLookup_iface; + IMediaEventSink IMediaEventSink_iface; LONG refcount; IMFMediaEventQueue *event_queue; @@ -84,6 +87,24 @@ static struct video_renderer *impl_from_IMFTopologyServiceLookup(IMFTopologyServ return CONTAINING_RECORD(iface, struct video_renderer, IMFTopologyServiceLookup_iface); } +static struct video_renderer *impl_from_IMediaEventSink(IMediaEventSink *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMediaEventSink_iface); +} + +static void video_renderer_release_services(struct video_renderer *renderer) +{ + IMFTopologyServiceLookupClient *lookup_client; + + if (renderer->flags & EVR_PRESENTER_INITED_SERVICES && SUCCEEDED(IMFVideoPresenter_QueryInterface(renderer->presenter, + &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) + { + IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); + IMFTopologyServiceLookupClient_Release(lookup_client); + renderer->flags &= ~EVR_PRESENTER_INITED_SERVICES; + } +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -285,6 +306,7 @@ static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) renderer->flags |= EVR_SHUT_DOWN; IMFMediaEventQueue_Shutdown(renderer->event_queue); video_renderer_set_presentation_clock(renderer, NULL); + video_renderer_release_services(renderer); LeaveCriticalSection(&renderer->cs); return S_OK; @@ -595,10 +617,43 @@ static HRESULT WINAPI video_renderer_service_lookup_LookupService(IMFTopologySer MF_SERVICE_LOOKUP_TYPE lookup_type, DWORD index, REFGUID service, REFIID riid, void **objects, DWORD *num_objects) { + struct video_renderer *renderer = impl_from_IMFTopologyServiceLookup(iface); + HRESULT hr = S_OK; + TRACE("%p, %u, %u, %s, %s, %p, %p.\n", iface, lookup_type, index, debugstr_guid(service), debugstr_guid(riid), objects, num_objects); - return E_NOTIMPL; + EnterCriticalSection(&renderer->cs); + + if (!(renderer->flags & EVR_INIT_SERVICES)) + hr = MF_E_NOTACCEPTING; + else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) + { + if (IsEqualIID(riid, &IID_IMediaEventSink)) + { + *objects = &renderer->IMediaEventSink_iface; + IUnknown_AddRef((IUnknown *)*objects); + } + else + { + FIXME("Unsupported interface %s for render service.\n", debugstr_guid(riid)); + hr = E_NOINTERFACE; + } + } + else if (IsEqualGUID(service, &MR_VIDEO_MIXER_SERVICE)) + { + FIXME("Unimplemented lookup for mixer service.\n"); + hr = MF_E_UNSUPPORTED_SERVICE; + } + else + { + WARN("Unsupported service %s.\n", debugstr_guid(service)); + hr = MF_E_UNSUPPORTED_SERVICE; + } + + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMFTopologyServiceLookupVtbl video_renderer_service_lookup_vtbl = @@ -609,6 +664,50 @@ static const IMFTopologyServiceLookupVtbl video_renderer_service_lookup_vtbl = video_renderer_service_lookup_LookupService, }; +static HRESULT WINAPI video_renderer_event_sink_QueryInterface(IMediaEventSink *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMediaEventSink) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMediaEventSink_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI video_renderer_event_sink_AddRef(IMediaEventSink *iface) +{ + struct video_renderer *renderer = impl_from_IMediaEventSink(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_event_sink_Release(IMediaEventSink *iface) +{ + struct video_renderer *renderer = impl_from_IMediaEventSink(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, LONG event, LONG_PTR param1, LONG_PTR param2) +{ + FIXME("%p, %d, %ld, %ld.\n", iface, event, param1, param2); + + return E_NOTIMPL; +} + +static const IMediaEventSinkVtbl media_event_sink_vtbl = +{ + video_renderer_event_sink_QueryInterface, + video_renderer_event_sink_AddRef, + video_renderer_event_sink_Release, + video_renderer_event_sink_Notify, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -632,8 +731,10 @@ static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransfo return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); } -static HRESULT video_renderer_create_presenter(IMFAttributes *attributes, IMFVideoPresenter **out) +static HRESULT video_renderer_create_presenter(struct video_renderer *renderer, IMFAttributes *attributes, + IMFVideoPresenter **out) { + IMFTopologyServiceLookupClient *lookup_client; unsigned int flags = 0; IMFActivate *activate; CLSID clsid; @@ -652,7 +753,23 @@ static HRESULT video_renderer_create_presenter(IMFAttributes *attributes, IMFVid if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, &clsid))) memcpy(&clsid, &CLSID_MFVideoPresenter9, sizeof(clsid)); - return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, (void **)out); + if (SUCCEEDED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, (void **)out))) + { + if (SUCCEEDED(hr = IMFVideoPresenter_QueryInterface(*out, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) + { + renderer->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &renderer->IMFTopologyServiceLookup_iface))) + { + renderer->flags |= EVR_PRESENTER_INITED_SERVICES; + } + renderer->flags &= ~EVR_INIT_SERVICES; + IMFTopologyServiceLookupClient_Release(lookup_client); + } + } + + return hr; } static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) @@ -672,6 +789,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFClockStateSink_iface.lpVtbl = &video_renderer_clock_sink_vtbl; object->IMFGetService_iface.lpVtbl = &video_renderer_get_service_vtbl; object->IMFTopologyServiceLookup_iface.lpVtbl = &video_renderer_service_lookup_vtbl; + object->IMediaEventSink_iface.lpVtbl = &media_event_sink_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); @@ -682,7 +800,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, if (FAILED(hr = video_renderer_create_mixer(attributes, &object->mixer))) goto failed; - if (FAILED(hr = video_renderer_create_presenter(attributes, &object->presenter))) + if (FAILED(hr = video_renderer_create_presenter(object, attributes, &object->presenter))) goto failed; *obj = (IUnknown *)&object->IMFMediaSink_iface; @@ -691,6 +809,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, failed: + video_renderer_release_services(object); IMFMediaSink_Release(&object->IMFMediaSink_iface); return hr;

1 0

Nikolay Sivov : mf/evr: Add IMFTopologyServiceLookup stub.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 1fc9827602361148300b647a984166b6578ff743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fc9827602361148300b647a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 9 15:08:48 2020 +0300 mf/evr: Add IMFTopologyServiceLookup stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ebd4b232fc..4a70f79872 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -37,6 +37,7 @@ struct video_renderer IMFClockStateSink IMFClockStateSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; IMFGetService IMFGetService_iface; + IMFTopologyServiceLookup IMFTopologyServiceLookup_iface; LONG refcount; IMFMediaEventQueue *event_queue; @@ -78,6 +79,11 @@ static struct video_renderer *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct video_renderer, IMFGetService_iface); } +static struct video_renderer *impl_from_IMFTopologyServiceLookup(IMFTopologyServiceLookup *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFTopologyServiceLookup_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -556,6 +562,53 @@ static const IMFGetServiceVtbl video_renderer_get_service_vtbl = video_renderer_get_service_GetService, }; +static HRESULT WINAPI video_renderer_service_lookup_QueryInterface(IMFTopologyServiceLookup *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFTopologyServiceLookup) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFTopologyServiceLookup_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI video_renderer_service_lookup_AddRef(IMFTopologyServiceLookup *iface) +{ + struct video_renderer *renderer = impl_from_IMFTopologyServiceLookup(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_service_lookup_Release(IMFTopologyServiceLookup *iface) +{ + struct video_renderer *renderer = impl_from_IMFTopologyServiceLookup(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_service_lookup_LookupService(IMFTopologyServiceLookup *iface, + MF_SERVICE_LOOKUP_TYPE lookup_type, DWORD index, REFGUID service, REFIID riid, + void **objects, DWORD *num_objects) +{ + TRACE("%p, %u, %u, %s, %s, %p, %p.\n", iface, lookup_type, index, debugstr_guid(service), debugstr_guid(riid), + objects, num_objects); + + return E_NOTIMPL; +} + +static const IMFTopologyServiceLookupVtbl video_renderer_service_lookup_vtbl = +{ + video_renderer_service_lookup_QueryInterface, + video_renderer_service_lookup_AddRef, + video_renderer_service_lookup_Release, + video_renderer_service_lookup_LookupService, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -618,6 +671,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFMediaEventGenerator_iface.lpVtbl = &video_renderer_events_vtbl; object->IMFClockStateSink_iface.lpVtbl = &video_renderer_clock_sink_vtbl; object->IMFGetService_iface.lpVtbl = &video_renderer_get_service_vtbl; + object->IMFTopologyServiceLookup_iface.lpVtbl = &video_renderer_service_lookup_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs);

1 0

Nikolay Sivov : mf/evr: Implement setting/getting sink clock.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 747c8a38c4aa2a372316a7e5c876b5cbd90ec56d URL: https://source.winehq.org/git/wine.git/?a=commit;h=747c8a38c4aa2a372316a7e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 9 15:08:47 2020 +0300 mf/evr: Implement setting/getting sink clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index b35af55353..ebd4b232fc 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -40,6 +40,8 @@ struct video_renderer LONG refcount; IMFMediaEventQueue *event_queue; + IMFPresentationClock *clock; + IMFTransform *mixer; IMFVideoPresenter *presenter; unsigned int flags; @@ -142,6 +144,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) IMFTransform_Release(renderer->mixer); if (renderer->presenter) IMFVideoPresenter_Release(renderer->presenter); + if (renderer->clock) + IMFPresentationClock_Release(renderer->clock); DeleteCriticalSection(&renderer->cs); heap_free(renderer); } @@ -201,18 +205,65 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, return E_NOTIMPL; } +static void video_renderer_set_presentation_clock(struct video_renderer *renderer, IMFPresentationClock *clock) +{ + if (renderer->clock) + { + IMFPresentationClock_RemoveClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); + IMFPresentationClock_Release(renderer->clock); + } + renderer->clock = clock; + if (renderer->clock) + { + IMFPresentationClock_AddRef(renderer->clock); + IMFPresentationClock_AddClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); + } +} + static HRESULT WINAPI video_renderer_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) { - FIXME("%p, %p.\n", iface, clock); + struct video_renderer *renderer = impl_from_IMFMediaSink(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, clock); + + EnterCriticalSection(&renderer->cs); + + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + video_renderer_set_presentation_clock(renderer, clock); + + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI video_renderer_sink_GetPresentationClock(IMFMediaSink *iface, IMFPresentationClock **clock) { - FIXME("%p, %p.\n", iface, clock); + struct video_renderer *renderer = impl_from_IMFMediaSink(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, clock); + + if (!clock) + return E_POINTER; + + EnterCriticalSection(&renderer->cs); + + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (renderer->clock) + { + *clock = renderer->clock; + IMFPresentationClock_AddRef(*clock); + } + else + hr = MF_E_NO_CLOCK; + + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) @@ -227,6 +278,7 @@ static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) EnterCriticalSection(&renderer->cs); renderer->flags |= EVR_SHUT_DOWN; IMFMediaEventQueue_Shutdown(renderer->event_queue); + video_renderer_set_presentation_clock(renderer, NULL); LeaveCriticalSection(&renderer->cs); return S_OK;

1 0

Nikolay Sivov : mf/evr: Do not set user context for activator object.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 65d3383be9cd6c6ba182bd27bb61dab961e90f01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65d3383be9cd6c6ba182bd27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 9 15:08:46 2020 +0300 mf/evr: Do not set user context for activator object. Window handle is passed as an attribute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index d20fb1a395..b35af55353 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -619,7 +619,7 @@ HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) if (!activate) return E_POINTER; - hr = create_activation_object(hwnd, &evr_activate_funcs, activate); + hr = create_activation_object(NULL, &evr_activate_funcs, activate); if (SUCCEEDED(hr)) IMFActivate_SetUINT64(*activate, &MF_ACTIVATE_VIDEO_WINDOW, (ULONG_PTR)hwnd);

1 0

Jacek Caban : winebuild: Use asm_name for __wine_syscall.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 7e4ea871a33f226684ecef9ba158cf9cf8efe42d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e4ea871a33f226684ecef9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 13:31:18 2020 +0200 winebuild: Use asm_name for __wine_syscall. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index edbe8d0c0f..97191ca89e 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1591,7 +1591,7 @@ void output_syscalls( DLLSPEC *spec ) else { output( "\tmovl $%u,%%eax\n", i ); - output( "\tmovl $__wine_syscall,%%edx\n" ); + output( "\tmovl $%s,%%edx\n", asm_name("__wine_syscall") ); } output( "\tcall *%%edx\n" ); output( "\tret $%u\n", get_args_size( odp )); @@ -1650,7 +1650,7 @@ void output_syscalls( DLLSPEC *spec ) { output( "\t.align %d\n", get_alignment(16) ); output( "\t%s\n", func_declaration("__wine_syscall") ); - output( "__wine_syscall:\n" ); + output( "%s:\n", asm_name("__wine_syscall") ); output( "\tjmp *(%s)\n", asm_name("__wine_syscall_dispatcher") ); output_function_size( "__wine_syscall" ); }

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020