[PATCH 1/2] ntdll: Fix context arch flag cleanup for AMD64 in context_from_server().
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- In particular, fixes a semi-random crash in ntdll exception test (test_extended_context) I am now reproducing locally. The thread is created suspended while the main thread sets context to it. (to_flags & CONTEXT_AMD64_XSTATE) is always TRUE. dlls/ntdll/unix/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 38a03bd4b60..00261edb593 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -755,7 +755,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; @@ -830,7 +830,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; -- 2.33.1
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Other thread may be setting xstate during initial suspend. dlls/ntdll/unix/signal_i386.c | 5 +++++ dlls/ntdll/unix/signal_x86_64.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 16483d8e341..f206d3c8579 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2364,8 +2364,13 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B struct x86_thread_data *thread_data = (struct x86_thread_data *)&teb->GdiTebBatch; struct syscall_frame *frame = thread_data->syscall_frame; CONTEXT *ctx, context = { CONTEXT_ALL }; + DECLSPEC_ALIGN(64) XSTATE xs; DWORD *stack; + context_init_xstate( &context, &xs ); + xs.Mask = 0; + xs.CompactionMask = xstate_compaction_enabled ? 0x8000000000000000 : 0; + context.SegCs = get_cs(); context.SegDs = get_ds(); context.SegEs = get_ds(); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 04e5c3b2982..04c94945649 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2998,9 +2998,13 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B struct amd64_thread_data *thread_data = (struct amd64_thread_data *)&teb->GdiTebBatch; struct syscall_frame *frame = thread_data->syscall_frame; CONTEXT *ctx, context = { 0 }; + DECLSPEC_ALIGN(64) XSTATE xs; I386_CONTEXT *wow_context; context.ContextFlags = CONTEXT_ALL; + context_init_xstate( &context, &xs ); + xs.Mask = 0; + xs.CompactionMask = xstate_compaction_enabled ? 0x8000000000000000 : 0; context.Rcx = (ULONG_PTR)entry; context.Rdx = (ULONG_PTR)arg; context.Rsp = (ULONG_PTR)teb->Tib.StackBase - 0x28; -- 2.33.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=102650 Your paranoid android. === debiant2 (64 bit WoW report) === ntdll: exception.c:4262: Test failed: got context flags 0x1007f
participants (2)
-
Marvin -
Paul Gofman