update for HEAD-2003091401

[reactos.git] / lib / ntdll / rtl / i386 / exception.c

diff --git a/lib/ntdll/rtl/i386/exception.c b/lib/ntdll/rtl/i386/exception.c
index f3803ed..130c68c 100755 (executable)
--- a/lib/ntdll/rtl/i386/exception.c
+++ b/lib/ntdll/rtl/i386/exception.c
@@ -43,6 +43,9 @@ RtlpCaptureContext(PCONTEXT pContext);
        RtlpCaptureContext(Context); \
 }
 
+#define SehpContinue(Context, TestAlert) \
+       NtContinue(Context, TestAlert)
+
 /*** Code below this line is shared with ntoskrnl/rtl/i386/exception.c - please keep in sync ***/
 
 VOID STDCALL
@@ -168,7 +171,7 @@ RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
       Context,
       &DispatcherContext,
       RegistrationFrame->handler);
-
+#ifdef DEBUG
     DPRINT("Exception handler said 0x%X\n", ReturnValue);
        DPRINT("RegistrationFrame == 0x%.08x\n", RegistrationFrame);
        {
@@ -181,7 +184,7 @@ RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
                DPRINT("TryLevel == 0x%.08x\n", sp[5]);
                DPRINT("EBP == 0x%.08x\n", sp[6]);
        }
-
+#endif
     if (RegistrationFrame == NULL)
     {
       ExceptionRecord->ExceptionFlags &= ~EXCEPTION_NESTED_CALL;  // Turn off flag
@@ -203,7 +206,7 @@ RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
       else
       {
         /* Copy the (possibly changed) context back to the trap frame and return */
-        NtContinue(Context, FALSE);
+        SehpContinue(Context, FALSE);
         return ExceptionContinueExecution;
       }
     }
@@ -244,6 +247,9 @@ RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
   return ExceptionContinueExecution;  
 }
 
+/*
+ * @implemented
+ */
 VOID STDCALL
 RtlRaiseStatus(NTSTATUS Status)
 {
@@ -258,6 +264,9 @@ RtlRaiseStatus(NTSTATUS Status)
   RtlRaiseException (& ExceptionRecord);
 }
 
+/*
+ * @implemented
+ */
 VOID STDCALL
 RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
   PVOID ReturnAddress,
@@ -330,7 +339,7 @@ RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
     if (ERHead == RegistrationFrame)
     {
       DPRINT("Continueing execution\n");
-      NtContinue(&Context, FALSE);
+      SehpContinue(&Context, FALSE);
       return;
     }
     else
@@ -425,7 +434,7 @@ RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
     RegistrationFrame);
 
   if ((ULONG_PTR)RegistrationFrame == -1)
-    NtContinue(&Context, FALSE);
+    SehpContinue(&Context, FALSE);
   else
     NtRaiseException(pExceptRec, &Context, 0);
 }