Gabriel Ivăncescu : ntdll: Do not override existing context's EAX when dispatching user APC.

Alexandre Julliard julliard at winehq.org
Fri Jan 8 15:04:54 CST 2021


Module: wine
Branch: master
Commit: 775dac0238845f6696d9ab5053a9238402b0b8a2
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=775dac0238845f6696d9ab5053a9238402b0b8a2

Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date:   Fri Jan  8 19:29:42 2021 +0200

ntdll: Do not override existing context's EAX when dispatching user APC.

Fixes a regression introduced by 175a3649ba04daaad3f2b5b62d6bfe091d6a9e46,
which caused Winamp's in_wave module to crash when playing a wav file
(the previous behavior only changed EAX when there was no context).

Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/unix/signal_i386.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index ff9d8a12c14..f2d58dc654d 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1696,6 +1696,7 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte
     {
         c.ContextFlags = CONTEXT_FULL;
         NtGetContextThread( GetCurrentThread(), &c );
+        c.Eax = STATUS_USER_APC;
         context = &c;
     }
     memmove( &stack->context, context, sizeof(stack->context) );
@@ -1704,7 +1705,6 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte
     stack->arg1 = arg1;
     stack->arg2 = arg2;
     stack->func = func;
-    stack->context.Eax = STATUS_USER_APC;
     return stack;
 }
 




More information about the wine-cvs mailing list