March 2024 - Wine-commits - list.winehq.org

Paul Gofman : ntdll/tests: Add more tests for xstate.
by Alexandre Julliard 26 Mar '24

26 Mar '24

Module: wine Branch: master Commit: bb47eb9f723053c512136362a167ddb1cc565d71 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb47eb9f723053c512136362a167dd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 18 13:29:11 2024 -0600 ntdll/tests: Add more tests for xstate. --- dlls/ntdll/tests/exception.c | 100 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 90 insertions(+), 10 deletions(-)

1 0

Paul Gofman : ntdll: Only save AVX xstate in wine_syscall_dispatcher.
by Alexandre Julliard 26 Mar '24

26 Mar '24

Module: wine Branch: master Commit: 7ae23ad7758418012c3d2d40a3acfed5af18afaa URL: https://gitlab.winehq.org/wine/wine/-/commit/7ae23ad7758418012c3d2d40a3acfe… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 18 13:00:30 2024 -0600 ntdll: Only save AVX xstate in wine_syscall_dispatcher. --- dlls/ntdll/unix/signal_i386.c | 6 +++++- dlls/ntdll/unix/signal_x86_64.c | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 51802a57037..c4d553ba8b8 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1005,6 +1005,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset); + if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); copy_xstate( &frame->xstate, xs, xs->Mask ); } @@ -1126,6 +1127,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size) return STATUS_INVALID_PARAMETER; + if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features(); xstate->Mask = frame->xstate.Mask & mask; xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; @@ -2127,6 +2129,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) NtGetContextThread( GetCurrentThread(), &context->c ); if (xstate_extended_features()) { + if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); context_init_xstate( &context->c, &frame->xstate ); saved_compaction = frame->xstate.CompactionMask; } @@ -2617,7 +2620,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "testl $3,(%ecx)\n\t" /* frame->syscall_flags & (SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC) */ "jz 2f\n\t" "movl %fs:0x1fc,%eax\n\t" /* x86_thread_data()->xstate_features_mask */ - "movl %fs:0x200,%edx\n\t" /* x86_thread_data()->xstate_features_mask high dword */ + "xorl %edx,%edx\n\t" + "andl $7,%eax\n\t" "xorl %edi,%edi\n\t" "movl %edi,0x240(%ecx)\n\t" "movl %edi,0x244(%ecx)\n\t" diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d071120af85..8fdcc37f078 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1051,6 +1051,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset); + if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); copy_xstate( &frame->xstate, xs, xs->Mask ); } @@ -1159,6 +1160,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size) return STATUS_INVALID_PARAMETER; + if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features(); xstate->Mask = frame->xstate.Mask & mask; xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; @@ -1276,6 +1278,7 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset); + if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); copy_xstate( &frame->xstate, xs, xs->Mask ); frame->restore_flags |= CONTEXT_XSTATE; } @@ -1367,6 +1370,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size) return STATUS_INVALID_PARAMETER; + if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features(); xstate->Mask = frame->xstate.Mask & mask; xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; @@ -2162,6 +2166,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) NtGetContextThread( GetCurrentThread(), &context->c ); if (xstate_extended_features()) { + if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); context_init_xstate( &context->c, &frame->xstate ); saved_compaction = frame->xstate.CompactionMask; } @@ -2664,11 +2669,11 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, #ifdef __APPLE__ "movq %gs:0x30,%rdx\n\t" "movl 0x340(%rdx),%eax\n\t" - "movl 0x344(%rdx),%edx\n\t" #else "movl %gs:0x340,%eax\n\t" /* amd64_thread_data()->xstate_features_mask */ - "movl %gs:0x344,%edx\n\t" /* amd64_thread_data()->xstate_features_mask high dword */ #endif + "xorl %edx,%edx\n\t" + "andl $7,%eax\n\t" "xorq %rbp,%rbp\n\t" "movq %rbp,0x2c0(%rcx)\n\t" "movq %rbp,0x2c8(%rcx)\n\t"

1 0

Paul Gofman : ntdll: Preserve untouched parts of xstate in NtSetContextThread().
by Alexandre Julliard 26 Mar '24

26 Mar '24

Module: wine Branch: master Commit: a10da8a42a25c6b72d863767461b85e1f3f0ea12 URL: https://gitlab.winehq.org/wine/wine/-/commit/a10da8a42a25c6b72d863767461b85… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 8 14:09:12 2024 -0600 ntdll: Preserve untouched parts of xstate in NtSetContextThread(). --- dlls/ntdll/unix/signal_i386.c | 2 ++ dlls/ntdll/unix/signal_x86_64.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index c4d553ba8b8..94799522202 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1004,9 +1004,11 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) { CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset); + UINT64 mask = frame->xstate.Mask; if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); copy_xstate( &frame->xstate, xs, xs->Mask ); + if (xs->CompactionMask) frame->xstate.Mask |= mask & ~xs->CompactionMask; } frame->restore_flags |= flags & ~CONTEXT_INTEGER; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 8fdcc37f078..f4a6fcce8ca 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1050,9 +1050,11 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) { CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset); + UINT64 mask = frame->xstate.Mask; if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); copy_xstate( &frame->xstate, xs, xs->Mask ); + if (xs->CompactionMask) frame->xstate.Mask |= mask & ~xs->CompactionMask; } frame->restore_flags |= flags & ~CONTEXT_INTEGER;

1 0

Zhiyi Zhang : mfmediaengine: Implement IMFMediaEngineEx::SetCurrentTimeEx().
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: 283d4bab2229c4accae8453f24c76319741dec96 URL: https://gitlab.winehq.org/wine/wine/-/commit/283d4bab2229c4accae8453f24c763… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 20 15:21:56 2024 +0800 mfmediaengine: Implement IMFMediaEngineEx::SetCurrentTimeEx(). --- dlls/mfmediaengine/main.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 96eeb4bdbcc..444c6f1bb65 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -3020,9 +3020,24 @@ static HRESULT WINAPI media_engine_SetRealTimeMode(IMFMediaEngineEx *iface, BOOL static HRESULT WINAPI media_engine_SetCurrentTimeEx(IMFMediaEngineEx *iface, double seektime, MF_MEDIA_ENGINE_SEEK_MODE mode) { - FIXME("%p, %f, %#x stub.\n", iface, seektime, mode); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %f, %#x.\n", iface, seektime, mode); + + if (mode) + FIXME("mode %#x is ignored.\n", mode); + + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = media_engine_set_current_time(engine, seektime); + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_EnableTimeUpdateTimer(IMFMediaEngineEx *iface, BOOL enable)

1 0

Zhiyi Zhang : mfmediaengine/tests: Test IMFMediaEngineEx::SetCurrentTime/Ex().
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: de89f777271a2b3fe2ab7fd7779bb6a0a70c09c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/de89f777271a2b3fe2ab7fd7779bb6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 20 15:22:25 2024 +0800 mfmediaengine/tests: Test IMFMediaEngineEx::SetCurrentTime/Ex(). --- dlls/mfmediaengine/tests/mfmediaengine.c | 201 +++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+)

1 0

Nikolay Sivov : gdi32/emf: Zero-initialize handles array (Valgrind).
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: 8dec8cc96c2bfc636b34da145e0ec56adbed257b URL: https://gitlab.winehq.org/wine/wine/-/commit/8dec8cc96c2bfc636b34da145e0ec5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 24 21:42:14 2024 +0100 gdi32/emf: Zero-initialize handles array (Valgrind). It's checked in emr_reset(), and reallocation already zero-initializes new slots. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/emfdc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index b2d1c894359..d81374a073e 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2669,7 +2669,7 @@ static struct emf *emf_create( HDC hdc, const RECT *rect, const WCHAR *descripti size = sizeof(ENHMETAHEADER) + aligned_size(length); if (!(emf->emh = HeapAlloc( GetProcessHeap(), 0, size )) || - !(emf->handles = HeapAlloc( GetProcessHeap(), 0, + !(emf->handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, HANDLE_LIST_INC * sizeof(emf->handles[0]) ))) { HeapFree( GetProcessHeap(), 0, emf->emh );

1 0

Alexandre Julliard : ntdll: Copy the context contents instead of the pointer on collided unwind.
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: 47f94fcf5f8e4be9fc418c2aa2cdf13b0d223ddc URL: https://gitlab.winehq.org/wine/wine/-/commit/47f94fcf5f8e4be9fc418c2aa2cdf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 25 18:04:37 2024 +0100 ntdll: Copy the context contents instead of the pointer on collided unwind. Similar to how it's done on ARM platforms. --- dlls/ntdll/signal_x86_64.c | 44 ++++++++++++-------------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 80636037cb7..6930f4df34e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -210,6 +210,7 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) DISPATCHER_CONTEXT dispatch; CONTEXT context; NTSTATUS status; + ULONG_PTR frame; context = *orig_context; context.ContextFlags &= ~0x40; /* Clear xstate flag. */ @@ -246,16 +247,10 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) rec->ExceptionFlags |= EXCEPTION_NESTED_CALL; TRACE( "nested exception\n" ); break; - case ExceptionCollidedUnwind: { - ULONG64 frame; - - context = *dispatch.ContextRecord; - dispatch.ContextRecord = &context; - RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, - dispatch.ControlPc, dispatch.FunctionEntry, - &context, NULL, &frame, NULL ); + case ExceptionCollidedUnwind: + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, + dispatch.FunctionEntry, &context, NULL, &frame, NULL ); goto unwind_done; - } default: return STATUS_INVALID_DISPOSITION; } @@ -277,17 +272,11 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) rec->ExceptionFlags |= EXCEPTION_NESTED_CALL; TRACE( "nested exception\n" ); break; - case ExceptionCollidedUnwind: { - ULONG64 frame; - - context = *dispatch.ContextRecord; - dispatch.ContextRecord = &context; - RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, - dispatch.ControlPc, dispatch.FunctionEntry, - &context, NULL, &frame, NULL ); + case ExceptionCollidedUnwind: + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, + dispatch.FunctionEntry, &context, NULL, &frame, NULL ); teb_frame = teb_frame->Prev; goto unwind_done; - } default: return STATUS_INVALID_DISPOSITION; } @@ -447,11 +436,12 @@ DWORD __cdecl unwind_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR dispatch->ImageBase = unwind_frame->dispatch->ImageBase; dispatch->FunctionEntry = unwind_frame->dispatch->FunctionEntry; dispatch->EstablisherFrame = unwind_frame->dispatch->EstablisherFrame; - dispatch->ContextRecord = unwind_frame->dispatch->ContextRecord; dispatch->LanguageHandler = unwind_frame->dispatch->LanguageHandler; dispatch->HandlerData = unwind_frame->dispatch->HandlerData; dispatch->HistoryTable = unwind_frame->dispatch->HistoryTable; dispatch->ScopeIndex = unwind_frame->dispatch->ScopeIndex; + *dispatch->ContextRecord = *unwind_frame->dispatch->ContextRecord; + dispatch->ContextRecord->ContextFlags &= ~0x40; TRACE( "detected collided unwind\n" ); return ExceptionCollidedUnwind; } @@ -728,6 +718,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec DISPATCHER_CONTEXT dispatch; CONTEXT new_context; NTSTATUS status; + ULONG_PTR frame; DWORD i; RtlCaptureContext( context ); @@ -783,12 +774,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EXCEPTION_TARGET_UNWIND; if (call_unwind_handler( rec, &dispatch ) == ExceptionCollidedUnwind) { - ULONG64 frame; - - new_context = *dispatch.ContextRecord; - new_context.ContextFlags &= ~0x40; - *context = new_context; - dispatch.ContextRecord = context; + new_context = *context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, &new_context, NULL, &frame, NULL ); @@ -808,14 +794,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.EstablisherFrame = (ULONG64)teb_frame; if (call_teb_unwind_handler( rec, &dispatch, teb_frame ) == ExceptionCollidedUnwind) { - ULONG64 frame; - teb_frame = __wine_pop_frame( teb_frame ); - - new_context = *dispatch.ContextRecord; - new_context.ContextFlags &= ~0x40; - *context = new_context; - dispatch.ContextRecord = context; + new_context = *context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, &new_context, NULL, &frame, NULL );

1 0

Alexandre Julliard : ntdll: Use a common wrapper to call exception handlers on x86-64.
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: 24e9fcac08cf379568ee9e1070189a86dcac8ccd URL: https://gitlab.winehq.org/wine/wine/-/commit/24e9fcac08cf379568ee9e1070189a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 25 18:05:25 2024 +0100 ntdll: Use a common wrapper to call exception handlers on x86-64. --- dlls/ntdll/signal_x86_64.c | 82 +++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 55 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6930f4df34e..021c4c30daf 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -127,76 +127,37 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "fxsave 0x100(%rcx)\n\t" /* context->FltSave */ "ret" ); + /*********************************************************************** - * exception_handler_call_wrapper + * call_seh_handler */ #ifdef __WINE_PE_BUILD -DWORD WINAPI exception_handler_call_wrapper( EXCEPTION_RECORD *rec, void *frame, - CONTEXT *context, DISPATCHER_CONTEXT *dispatch ); - -C_ASSERT( offsetof(DISPATCHER_CONTEXT, LanguageHandler) == 0x30 ); - -__ASM_GLOBAL_FUNC( exception_handler_call_wrapper, +DWORD WINAPI call_seh_handler( EXCEPTION_RECORD *rec, ULONG_PTR frame, + CONTEXT *context, void *dispatch, PEXCEPTION_ROUTINE handler ); +__ASM_GLOBAL_FUNC( call_seh_handler, "subq $0x28, %rsp\n\t" ".seh_stackalloc 0x28\n\t" ".seh_endprologue\n\t" - "callq *0x30(%r9)\n\t" /* dispatch->LanguageHandler */ + ".seh_handler nested_exception_handler, @except\n\t" + "callq *0x50(%rsp)\n\t" /* handler */ "nop\n\t" /* avoid epilogue so handler is called */ "addq $0x28, %rsp\n\t" - "ret\n\t" - ".seh_handler " __ASM_NAME("nested_exception_handler") ", @except\n\t" ) + "ret" ) #else -static DWORD exception_handler_call_wrapper( EXCEPTION_RECORD *rec, void *frame, - CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) +static DWORD call_seh_handler( EXCEPTION_RECORD *rec, ULONG_PTR frame, + CONTEXT *context, void *dispatch, PEXCEPTION_ROUTINE handler ) { EXCEPTION_REGISTRATION_RECORD wrapper_frame; DWORD res; wrapper_frame.Handler = (PEXCEPTION_HANDLER)nested_exception_handler; __wine_push_frame( &wrapper_frame ); - res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); + res = handler( rec, (void *)frame, context, dispatch ); __wine_pop_frame( &wrapper_frame ); return res; } #endif -/********************************************************************** - * call_handler - * - * Call a single exception handler. - */ -static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) -{ - DWORD res; - - TRACE( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); - res = exception_handler_call_wrapper( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); - TRACE( "handler at %p returned %lu\n", dispatch->LanguageHandler, res ); - - rec->ExceptionFlags &= EXCEPTION_NONCONTINUABLE; - return res; -} - - -/********************************************************************** - * call_teb_handler - * - * Call a single exception handler from the TEB chain. - * FIXME: Handle nested exceptions. - */ -static DWORD call_teb_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, - EXCEPTION_REGISTRATION_RECORD *teb_frame ) -{ - DWORD res; - - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); - res = teb_frame->Handler( rec, teb_frame, context, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); - TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res ); - return res; -} - /********************************************************************** * call_seh_handlers @@ -211,6 +172,7 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) CONTEXT context; NTSTATUS status; ULONG_PTR frame; + DWORD res; context = *orig_context; context.ContextFlags &= ~0x40; /* Clear xstate flag. */ @@ -236,7 +198,14 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) if (dispatch.LanguageHandler) { - switch (call_handler( rec, orig_context, &dispatch )) + TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n", + dispatch.LanguageHandler, rec, dispatch.EstablisherFrame, orig_context, &dispatch ); + res = call_seh_handler( rec, dispatch.EstablisherFrame, orig_context, + &dispatch, dispatch.LanguageHandler ); + rec->ExceptionFlags &= EXCEPTION_NONCONTINUABLE; + TRACE( "handler at %p returned %lu\n", dispatch.LanguageHandler, res ); + + switch (res) { case ExceptionContinueExecution: if (rec->ExceptionFlags & EXCEPTION_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; @@ -258,10 +227,13 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) /* hack: call wine handlers registered in the tib list */ else while (is_valid_frame( (ULONG_PTR)teb_frame ) && (ULONG64)teb_frame < context.Rsp) { - TRACE( "found wine frame %p rsp %p handler %p\n", - teb_frame, (void *)context.Rsp, teb_frame->Handler ); - dispatch.EstablisherFrame = (ULONG64)teb_frame; - switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) + TRACE( "calling TEB handler %p (rec=%p frame=%p context=%p dispatch=%p) sp=%I64x\n", + teb_frame->Handler, rec, teb_frame, orig_context, &dispatch, context.Rsp ); + res = call_seh_handler( rec, (ULONG_PTR)teb_frame, orig_context, + &dispatch, (PEXCEPTION_ROUTINE)teb_frame->Handler ); + TRACE( "TEB handler at %p returned %lu\n", teb_frame->Handler, res ); + + switch (res) { case ExceptionContinueExecution: if (rec->ExceptionFlags & EXCEPTION_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION;

1 0

Alexandre Julliard : ntdll: Use a common wrapper to call unwind handlers on x86-64.
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: cf08bbaa0f95f40b972b330e1ee687e2cac0501c URL: https://gitlab.winehq.org/wine/wine/-/commit/cf08bbaa0f95f40b972b330e1ee687… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 25 18:05:39 2024 +0100 ntdll: Use a common wrapper to call unwind handlers on x86-64. --- dlls/ntdll/signal_x86_64.c | 133 +++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 84 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 021c4c30daf..78afadbe387 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -391,6 +391,9 @@ struct unwind_exception_frame * save space when .seh handler is used. */ DISPATCHER_CONTEXT *dispatch; }; +C_ASSERT( sizeof(struct unwind_exception_frame) == 0x28 ); +C_ASSERT( offsetof(struct unwind_exception_frame, dispatch) == 0x20 ); + /********************************************************************** * unwind_exception_handler @@ -418,30 +421,26 @@ DWORD __cdecl unwind_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR return ExceptionCollidedUnwind; } -/*********************************************************************** - * unwind_handler_call_wrapper + +/********************************************************************** + * call_unwind_handler */ #ifdef __WINE_PE_BUILD -DWORD WINAPI unwind_handler_call_wrapper( EXCEPTION_RECORD *rec, void *frame, - CONTEXT *context, DISPATCHER_CONTEXT *dispatch ); - -C_ASSERT( sizeof(struct unwind_exception_frame) == 0x28 ); -C_ASSERT( offsetof(struct unwind_exception_frame, dispatch) == 0x20 ); -C_ASSERT( offsetof(DISPATCHER_CONTEXT, LanguageHandler) == 0x30 ); - -__ASM_GLOBAL_FUNC( unwind_handler_call_wrapper, +DWORD WINAPI call_unwind_handler( EXCEPTION_RECORD *rec, ULONG_PTR frame, + CONTEXT *context, void *dispatch, PEXCEPTION_ROUTINE handler ); +__ASM_GLOBAL_FUNC( call_unwind_handler, "subq $0x28,%rsp\n\t" ".seh_stackalloc 0x28\n\t" ".seh_endprologue\n\t" + ".seh_handler unwind_exception_handler, @except, @unwind\n\t" "movq %r9,0x20(%rsp)\n\t" /* unwind_exception_frame->dispatch */ - "callq *0x30(%r9)\n\t" /* dispatch->LanguageHandler */ + "callq *0x50(%rsp)\n\t" /* handler */ "nop\n\t" /* avoid epilogue so handler is called */ "addq $0x28, %rsp\n\t" - "ret\n\t" - ".seh_handler " __ASM_NAME("unwind_exception_handler") ", @except, @unwind\n\t" ) + "ret" ) #else -static DWORD unwind_handler_call_wrapper( EXCEPTION_RECORD *rec, void *frame, - CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) +static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, ULONG_PTR frame, + CONTEXT *context, void *dispatch, PEXCEPTION_ROUTINE handler ) { struct unwind_exception_frame wrapper_frame; DWORD res; @@ -449,68 +448,12 @@ static DWORD unwind_handler_call_wrapper( EXCEPTION_RECORD *rec, void *frame, wrapper_frame.frame.Handler = unwind_exception_handler; wrapper_frame.dispatch = dispatch; __wine_push_frame( &wrapper_frame.frame ); - res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); + res = handler( rec, (void *)frame, context, dispatch ); __wine_pop_frame( &wrapper_frame.frame ); return res; } #endif -/********************************************************************** - * call_unwind_handler - * - * Call a single unwind handler. - */ -DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) -{ - DWORD res; - - TRACE( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); - res = unwind_handler_call_wrapper( rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); - TRACE( "handler %p returned %lx\n", dispatch->LanguageHandler, res ); - - switch (res) - { - case ExceptionContinueSearch: - case ExceptionCollidedUnwind: - break; - default: - raise_status( STATUS_INVALID_DISPOSITION, rec ); - break; - } - - return res; -} - - -/********************************************************************** - * call_teb_unwind_handler - * - * Call a single unwind handler from the TEB chain. - */ -static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, - EXCEPTION_REGISTRATION_RECORD *teb_frame ) -{ - DWORD res; - - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); - res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); - TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res ); - - switch (res) - { - case ExceptionContinueSearch: - case ExceptionCollidedUnwind: - break; - default: - raise_status( STATUS_INVALID_DISPOSITION, rec ); - break; - } - - return res; -} - /********************************************************************** * call_consolidate_callback @@ -691,7 +634,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec CONTEXT new_context; NTSTATUS status; ULONG_PTR frame; - DWORD i; + DWORD i, res; RtlCaptureContext( context ); new_context = *context; @@ -744,40 +687,62 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); } if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EXCEPTION_TARGET_UNWIND; - if (call_unwind_handler( rec, &dispatch ) == ExceptionCollidedUnwind) + TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n", + dispatch.LanguageHandler, rec, dispatch.EstablisherFrame, + dispatch.ContextRecord, &dispatch ); + res = call_unwind_handler( rec, dispatch.EstablisherFrame, dispatch.ContextRecord, + &dispatch, dispatch.LanguageHandler ); + TRACE( "handler %p returned %lx\n", dispatch.LanguageHandler, res ); + + switch (res) { + case ExceptionContinueSearch: + rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; + break; + case ExceptionCollidedUnwind: new_context = *context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, &new_context, NULL, &frame, NULL ); rec->ExceptionFlags |= EXCEPTION_COLLIDED_UNWIND; goto unwind_done; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; } - rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; } else /* hack: call builtin handlers registered in the tib list */ { - DWORD64 backup_frame = dispatch.EstablisherFrame; while (is_valid_frame( (ULONG_PTR)teb_frame ) && (ULONG64)teb_frame < new_context.Rsp && (ULONG64)teb_frame < (ULONG64)end_frame) { - TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); - dispatch.EstablisherFrame = (ULONG64)teb_frame; - if (call_teb_unwind_handler( rec, &dispatch, teb_frame ) == ExceptionCollidedUnwind) + TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch.ContextRecord, &dispatch ); + res = call_unwind_handler( rec, (ULONG_PTR)teb_frame, dispatch.ContextRecord, &dispatch, + (PEXCEPTION_ROUTINE)teb_frame->Handler ); + TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res ); + teb_frame = __wine_pop_frame( teb_frame ); + + switch (res) { - teb_frame = __wine_pop_frame( teb_frame ); + case ExceptionContinueSearch: + rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; + break; + case ExceptionCollidedUnwind: new_context = *context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, - dispatch.ControlPc, dispatch.FunctionEntry, - &new_context, NULL, &frame, NULL ); + dispatch.ControlPc, dispatch.FunctionEntry, + &new_context, &dispatch.HandlerData, + &frame, NULL ); rec->ExceptionFlags |= EXCEPTION_COLLIDED_UNWIND; goto unwind_done; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; } - teb_frame = __wine_pop_frame( teb_frame ); } if ((ULONG64)teb_frame == (ULONG64)end_frame && (ULONG64)end_frame < new_context.Rsp) break; - dispatch.EstablisherFrame = backup_frame; } if (dispatch.EstablisherFrame == (ULONG64)end_frame) break;

1 0

Nikolay Sivov : dwrite/shape: Fully initialize shaping context when getting glyph positions (Valgrind).
by Alexandre Julliard 25 Mar '24

25 Mar '24

Module: wine Branch: master Commit: 967f3a5074852f590b9d82aadeb3a7028d0f7277 URL: https://gitlab.winehq.org/wine/wine/-/commit/967f3a5074852f590b9d82aadeb3a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 24 19:15:08 2024 +0100 dwrite/shape: Fully initialize shaping context when getting glyph positions (Valgrind). Actual issue is uninitialized has_gpos_attachment flag, it might be harmless in practice but it's better to avoid. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 8f7327278d7..0fab5b7142e 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1592,7 +1592,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 UINT32 const* feature_range_lengths, UINT32 feature_ranges, float *advances, DWRITE_GLYPH_OFFSET *offsets) { const struct dwritescript_properties *scriptprops; - struct scriptshaping_context context; + struct scriptshaping_context context = { 0 }; struct dwrite_fontface *font_obj; unsigned int i; HRESULT hr; @@ -1666,7 +1666,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite UINT32 const* feature_range_lengths, UINT32 feature_ranges, float *advances, DWRITE_GLYPH_OFFSET *offsets) { const struct dwritescript_properties *scriptprops; - struct scriptshaping_context context; + struct scriptshaping_context context = { 0 }; DWRITE_MEASURING_MODE measuring_mode; struct dwrite_fontface *font_obj; unsigned int i;

1 0