Alexandre Julliard : ntdll: Avoid calling init_handler() twice in signal handler on i386.

Alexandre Julliard julliard at winehq.org
Fri Sep 13 15:34:19 CDT 2019


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Sep 13 16:58:28 2019 +0200

ntdll: Avoid calling init_handler() twice in signal handler on i386.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/signal_i386.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 8876790195..35abc288b3 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2168,10 +2168,10 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext )
 static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext )
 {
     WORD fs, gs;
-    init_handler( sigcontext, &fs, &gs );
+    void *stack_ptr = init_handler( sigcontext, &fs, &gs );
     if (!dispatch_signal(SIGINT))
     {
-        struct stack_layout *stack = setup_exception( sigcontext );
+        struct stack_layout *stack = setup_exception_record( sigcontext, stack_ptr, fs, gs );
         stack->rec.ExceptionCode = CONTROL_C_EXIT;
         setup_raise_exception( sigcontext, stack );
     }




More information about the wine-cvs mailing list