Module: wine Branch: master Commit: 8f278f89df31a0874a73bd0e8004e0af75b652e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f278f89df31a0874a73bd0e8004e0a...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Feb 13 21:08:26 2024 +0100
ntdll: Make APCs alertable by default on ARM platforms.
---
dlls/ntdll/unix/signal_arm.c | 9 +++++---- dlls/ntdll/unix/signal_arm64.c | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 0f6f81d2ee1..9501f8fbaef 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1035,10 +1035,11 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a NtGetContextThread( GetCurrentThread(), &stack->context ); stack->context.R0 = status; } - stack->func = func; - stack->args[0] = arg1; - stack->args[1] = arg2; - stack->args[2] = arg3; + stack->func = func; + stack->args[0] = arg1; + stack->args[1] = arg2; + stack->args[2] = arg3; + stack->alertable = TRUE;
frame->sp = (DWORD)stack; frame->pc = (DWORD)pKiUserApcDispatcher; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index bc5b8f0b88a..6d6f7bcc8b9 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -754,10 +754,11 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a NtGetContextThread( GetCurrentThread(), &stack->context ); stack->context.X0 = status; } - stack->func = func; - stack->args[0] = arg1; - stack->args[1] = arg2; - stack->args[2] = arg3; + stack->func = func; + stack->args[0] = arg1; + stack->args[1] = arg2; + stack->args[2] = arg3; + stack->alertable = TRUE;
frame->sp = (ULONG64)stack; frame->pc = (ULONG64)pKiUserApcDispatcher;