Fix msvc/gcc NDK problem

svn path=/trunk/; revision=19479

diff --git a/reactos/include/ndk/rtltypes.h b/reactos/include/ndk/rtltypes.h
index 445b9be..c36a733 100644 (file)
--- a/reactos/include/ndk/rtltypes.h
+++ b/reactos/include/ndk/rtltypes.h
@@ -112,7 +112,6 @@ Author:
 #define TIME_ZONE_ID_UNKNOWN                                 0
 #define TIME_ZONE_ID_STANDARD                                1
 #define TIME_ZONE_ID_DAYLIGHT                                2
 #define TIME_ZONE_ID_UNKNOWN                                 0
 #define TIME_ZONE_ID_STANDARD                                1
 #define TIME_ZONE_ID_DAYLIGHT                                2

-#define TIME_ZONE_ID_INVALID                                 0xFFFFFFFF

 
 //
 // RTL Lock Type (Critical Section or Resource)
 
 //
 // RTL Lock Type (Critical Section or Resource)


@@ -669,7 +668,7 @@ typedef struct _RTL_HANDLE_TABLE
 typedef struct _EXCEPTION_REGISTRATION_RECORD
 {
     struct _EXCEPTION_REGISTRATION_RECORD *Next;
 typedef struct _EXCEPTION_REGISTRATION_RECORD
 {
     struct _EXCEPTION_REGISTRATION_RECORD *Next;

-    PEXCEPTION_HANDLER Handler;
+    PEXCEPTION_ROUTINE Handler;

 } EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD;
 
 //
 } EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD;
 
 //

diff --git a/reactos/lib/rtl/rtlp.h b/reactos/lib/rtl/rtlp.h
index 37f9c02..e0d0708 100644 (file)
--- a/reactos/lib/rtl/rtlp.h
+++ b/reactos/lib/rtl/rtlp.h
@@ -75,7 +75,7 @@ RtlpExecuteHandlerForException(PEXCEPTION_RECORD ExceptionRecord,
                                PEXCEPTION_REGISTRATION_RECORD RegistrationFrame,\r
                                PCONTEXT Context,\r
                                PVOID DispatcherContext,\r
                                PEXCEPTION_REGISTRATION_RECORD RegistrationFrame,\r
                                PCONTEXT Context,\r
                                PVOID DispatcherContext,\r

-                               PEXCEPTION_HANDLER ExceptionHandler);\r
+                               PEXCEPTION_ROUTINE ExceptionHandler);\r

 \r
 EXCEPTION_DISPOSITION\r
 NTAPI\r
 \r
 EXCEPTION_DISPOSITION\r
 NTAPI\r


@@ -83,7 +83,7 @@ RtlpExecuteHandlerForUnwind(PEXCEPTION_RECORD ExceptionRecord,
                             PEXCEPTION_REGISTRATION_RECORD RegistrationFrame,\r
                             PCONTEXT Context,\r
                             PVOID DispatcherContext,\r
                             PEXCEPTION_REGISTRATION_RECORD RegistrationFrame,\r
                             PCONTEXT Context,\r
                             PVOID DispatcherContext,\r

-                            PEXCEPTION_HANDLER ExceptionHandler);\r
+                            PEXCEPTION_ROUTINE ExceptionHandler);\r

 \r
 VOID\r
 NTAPI\r
 \r
 VOID\r
 NTAPI\r

diff --git a/reactos/w32api/include/ddk/winddk.h b/reactos/w32api/include/ddk/winddk.h
index e930b1a..d6cf0b9 100644 (file)
--- a/reactos/w32api/include/ddk/winddk.h
+++ b/reactos/w32api/include/ddk/winddk.h
@@ -553,6 +553,13 @@ typedef IO_ALLOCATION_ACTION
   IN PVOID  MapRegisterBase,
   IN PVOID  Context);
 
   IN PVOID  MapRegisterBase,
   IN PVOID  Context);
 

+typedef EXCEPTION_DISPOSITION
+(DDKAPI *PEXCEPTION_ROUTINE)(
+  IN struct _EXCEPTION_RECORD *ExceptionRecord,
+  IN PVOID EstablisherFrame,
+  IN OUT struct _CONTEXT *ContextRecord,
+  IN OUT PVOID DispatcherContext);
+

 typedef VOID
 (DDKAPI *PDRIVER_LIST_CONTROL)(
   IN struct _DEVICE_OBJECT  *DeviceObject,
 typedef VOID
 (DDKAPI *PDRIVER_LIST_CONTROL)(
   IN struct _DEVICE_OBJECT  *DeviceObject,