From 348e9f5f3db24a43e5e407e37866908d94d9ca37 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Wed, 23 Nov 2005 04:31:58 +0000 Subject: [PATCH] Fix msvc/gcc NDK problem svn path=/trunk/; revision=19479 --- reactos/include/ndk/rtltypes.h | 3 +-- reactos/lib/rtl/rtlp.h | 4 ++-- reactos/w32api/include/ddk/winddk.h | 7 +++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/reactos/include/ndk/rtltypes.h b/reactos/include/ndk/rtltypes.h index 445b9be95d1..c36a733ca72 100644 --- 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_INVALID 0xFFFFFFFF // // 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; - PEXCEPTION_HANDLER Handler; + PEXCEPTION_ROUTINE Handler; } EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; // diff --git a/reactos/lib/rtl/rtlp.h b/reactos/lib/rtl/rtlp.h index 37f9c028f35..e0d0708d377 100644 --- a/reactos/lib/rtl/rtlp.h +++ b/reactos/lib/rtl/rtlp.h @@ -75,7 +75,7 @@ RtlpExecuteHandlerForException(PEXCEPTION_RECORD ExceptionRecord, PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, PCONTEXT Context, PVOID DispatcherContext, - PEXCEPTION_HANDLER ExceptionHandler); + PEXCEPTION_ROUTINE ExceptionHandler); EXCEPTION_DISPOSITION NTAPI @@ -83,7 +83,7 @@ RtlpExecuteHandlerForUnwind(PEXCEPTION_RECORD ExceptionRecord, PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, PCONTEXT Context, PVOID DispatcherContext, - PEXCEPTION_HANDLER ExceptionHandler); + PEXCEPTION_ROUTINE ExceptionHandler); VOID NTAPI diff --git a/reactos/w32api/include/ddk/winddk.h b/reactos/w32api/include/ddk/winddk.h index e930b1a144e..d6cf0b90a9b 100644 --- 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); +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, -- 2.17.1