Alexandre Julliard : ntdll: Remove the raise_exception helper function on x86-64.
Alexandre Julliard
julliard at winehq.org
Thu Jul 20 16:20:34 CDT 2017
Module: wine
Branch: master
Commit: 1522280e68645b24c9f57f9cc30717c1a1e1530a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1522280e68645b24c9f57f9cc30717c1a1e1530a
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jul 20 13:25:04 2017 +0200
ntdll: Remove the raise_exception helper function on x86-64.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/signal_x86_64.c | 31 +++++++++----------------------
1 file changed, 9 insertions(+), 22 deletions(-)
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 0c9ef50..c1919e8 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -2574,11 +2574,9 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex
/*******************************************************************
- * raise_exception
- *
- * Implementation of NtRaiseException.
+ * NtRaiseException (NTDLL.@)
*/
-static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance )
+NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance )
{
NTSTATUS status;
@@ -2614,17 +2612,15 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f
context->R12, context->R13, context->R14, context->R15 );
}
status = send_debug_event( rec, TRUE, context );
- if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED)
- return STATUS_SUCCESS;
+ if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) goto done;
/* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */
if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--;
- if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION)
- return STATUS_SUCCESS;
+ if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) goto done;
- if ((status = call_stack_handlers( rec, context )) != STATUS_UNHANDLED_EXCEPTION)
- return status;
+ if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) goto done;
+ if (status != STATUS_UNHANDLED_EXCEPTION) return status;
}
/* last chance exception */
@@ -2641,7 +2637,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress );
NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode );
}
- return STATUS_SUCCESS;
+
+done:
+ return NtSetContextThread( GetCurrentThread(), context );
}
@@ -4027,17 +4025,6 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec,
}
-/*******************************************************************
- * NtRaiseException (NTDLL.@)
- */
-NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance )
-{
- NTSTATUS status = raise_exception( rec, context, first_chance );
- if (status == STATUS_SUCCESS) NtSetContextThread( GetCurrentThread(), context );
- return status;
-}
-
-
/***********************************************************************
* RtlRaiseException (NTDLL.@)
*/
More information about the wine-cvs
mailing list