branch update for HEAD-2003021201

[reactos.git] / ntoskrnl / rtl / i386 / exception.c

diff --git a/ntoskrnl/rtl/i386/exception.c b/ntoskrnl/rtl/i386/exception.c
index db47357..6cec442 100755 (executable)
--- a/ntoskrnl/rtl/i386/exception.c
+++ b/ntoskrnl/rtl/i386/exception.c
@@ -9,7 +9,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <internal/ke.h>
 #include <internal/ps.h>
 
@@ -58,8 +58,8 @@ __ret_label:
 
 /* Implemented in except.s */
 
-VOID\r
-RtlpCaptureContext(PCONTEXT pContext);\r
+VOID
+RtlpCaptureContext(PCONTEXT pContext);
 
 /* Macros that will help streamline the SEH implementations for
    kernel mode and user mode */
@@ -152,7 +152,7 @@ RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
  
   DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame);
 
-  while ((ULONG_PTR)RegistrationFrame != -1)
+  while ((ULONG_PTR)RegistrationFrame != (ULONG_PTR)-1)
   {
     EXCEPTION_RECORD ExceptionRecord2;
     DWORD Temp = 0;
@@ -363,7 +363,7 @@ RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
   Context.Eax = EaxValue;
  
   // Begin traversing the list of EXCEPTION_REGISTRATION
-  while ((ULONG_PTR)ERHead != -1)
+  while ((ULONG_PTR)ERHead != (ULONG_PTR)-1)
   {
     EXCEPTION_RECORD er2;
  
@@ -466,7 +466,7 @@ RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
   DPRINT("Ran out of exception registrations. RegistrationFrame is (0x%X)\n",
     RegistrationFrame);
 
-  if ((ULONG_PTR)RegistrationFrame == -1)
+  if ((ULONG_PTR)RegistrationFrame == (ULONG_PTR)-1)
     NtContinue(&Context, FALSE);
   else
     NtRaiseException(pExceptRec, &Context, 0);