From bbae70bf1e964ee6b30a7e63b0ff03585221d068 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 1 Mar 2021 16:51:15 +0100 Subject: [PATCH] ntdll: Use syscall frame in x86 call_raise_user_exception_dispatcher implementation. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/ntdll/unix/signal_i386.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 5e6d5fb25eb..0234c7aa6f7 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1782,16 +1782,10 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, /*********************************************************************** * call_raise_user_exception_dispatcher */ -__ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, - "movl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ - "movl 0x1c(%eax),%ebx\n\t" /* frame->ebx */ - "movl 0x28(%eax),%edi\n\t" /* frame->edi */ - "movl 0x2c(%eax),%esi\n\t" /* frame->esi */ - "movl 0x30(%eax),%ebp\n\t" /* frame->ebp */ - "movl 4(%esp),%edx\n\t" /* dispatcher */ - "movl $0,%fs:0x1f8\n\t" - "leal 0x38(%eax),%esp\n\t" - "jmp *%edx" ) +void WINAPI call_raise_user_exception_dispatcher( NTSTATUS (WINAPI *dispatcher)(void) ) +{ + x86_thread_data()->syscall_frame->eip = (DWORD)dispatcher; +} /***********************************************************************