[ros-diffs] [tfaber] 66663: [DDK][NDK][XDK] - Update some definitions to match WDK8.1. Fixes a few compatibility issues between NDK and WDK. CORE-9356 #resolve

Author: tfaber
Date: Wed Mar 11 09:21:10 2015
New Revision: 66663

URL: http://svn.reactos.org/svn/reactos?rev=66663&view=rev
Log:
[DDK][NDK][XDK]
- Update some definitions to match WDK8.1. Fixes a few compatibility issues between NDK
and WDK.
CORE-9356 #resolve

Modified:
    trunk/reactos/include/asm/genincdata.c
    trunk/reactos/include/ddk/ntddk.h
    trunk/reactos/include/ddk/wdm.h
    trunk/reactos/include/ndk/halfuncs.h
    trunk/reactos/include/ndk/ketypes.h
    trunk/reactos/include/ndk/rtltypes.h
    trunk/reactos/include/xdk/ketypes.h

Modified: trunk/reactos/include/asm/genincdata.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/genincdata.c?r…
==============================================================================
--- trunk/reactos/include/asm/genincdata.c	[iso-8859-1] (original)
+++ trunk/reactos/include/asm/genincdata.c	[iso-8859-1] Wed Mar 11 09:21:10 2015
@@ -2,6 +2,7 @@
 #include <psdk/ntverp.h>
 
 /* DDK/IFS/NDK Headers */
+#define _NTSYSTEM_
 #include <excpt.h>
 #include <setjmp.h>
 #include <ntdef.h>

Modified: trunk/reactos/include/ddk/ntddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=66…
==============================================================================
--- trunk/reactos/include/ddk/ntddk.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntddk.h	[iso-8859-1] Wed Mar 11 09:21:10 2015
@@ -1938,6 +1938,12 @@
 /******************************************************************************
  *                              Kernel Types                                  *
  ******************************************************************************/
+
+typedef struct _EXCEPTION_REGISTRATION_RECORD
+{
+  struct _EXCEPTION_REGISTRATION_RECORD *Next;
+  PEXCEPTION_ROUTINE Handler;
+} EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD;
 
 typedef struct _NT_TIB {
   struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList;

Modified: trunk/reactos/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6666…
==============================================================================
--- trunk/reactos/include/ddk/wdm.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ddk/wdm.h	[iso-8859-1] Wed Mar 11 09:21:10 2015
@@ -1151,6 +1151,7 @@
   KD_OPTION_SET_BLOCK_ENABLE,
 } KD_OPTION;
 
+#ifdef _NTSYSTEM_
 typedef VOID
 (NTAPI *PKNORMAL_ROUTINE)(
   IN PVOID NormalContext OPTIONAL,
@@ -1168,6 +1169,7 @@
   IN OUT PVOID *NormalContext OPTIONAL,
   IN OUT PVOID *SystemArgument1 OPTIONAL,
   IN OUT PVOID *SystemArgument2 OPTIONAL);
+#endif
 
 typedef struct _KAPC {
   UCHAR Type;
@@ -1177,9 +1179,13 @@
   ULONG SpareLong0;
   struct _KTHREAD *Thread;
   LIST_ENTRY ApcListEntry;
+#ifdef _NTSYSTEM_
   PKKERNEL_ROUTINE KernelRoutine;
   PKRUNDOWN_ROUTINE RundownRoutine;
   PKNORMAL_ROUTINE NormalRoutine;
+#else
+  PVOID Reserved[3];
+#endif
   PVOID NormalContext;
   PVOID SystemArgument1;
   PVOID SystemArgument2;

Modified: trunk/reactos/include/ndk/halfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/halfuncs.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/halfuncs.h	[iso-8859-1] Wed Mar 11 09:21:10 2015
@@ -52,16 +52,6 @@
 #define KdUnmapVirtualAddress           HALPRIVATEDISPATCH->KdUnmapVirtualAddress
 
 //
-// The DDK steals these away from you.
-//
-#ifdef _MSC_VER
-void __cdecl _enable(void);
-void __cdecl _disable(void);
-#pragma intrinsic(_enable)
-#pragma intrinsic(_disable)
-#endif
-
-//
 // Display Functions
 //
 NTHALAPI

Modified: trunk/reactos/include/ndk/ketypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/ketypes.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/ketypes.h	[iso-8859-1] Wed Mar 11 09:21:10 2015
@@ -538,6 +538,26 @@
     PVOID StartContext
 );
 
+#ifndef _NTSYSTEM_
+typedef VOID
+(NTAPI *PKNORMAL_ROUTINE)(
+  IN PVOID NormalContext OPTIONAL,
+  IN PVOID SystemArgument1 OPTIONAL,
+  IN PVOID SystemArgument2 OPTIONAL);
+
+typedef VOID
+(NTAPI *PKRUNDOWN_ROUTINE)(
+  IN struct _KAPC *Apc);
+
+typedef VOID
+(NTAPI *PKKERNEL_ROUTINE)(
+  IN struct _KAPC *Apc,
+  IN OUT PKNORMAL_ROUTINE *NormalRoutine OPTIONAL,
+  IN OUT PVOID *NormalContext OPTIONAL,
+  IN OUT PVOID *SystemArgument1 OPTIONAL,
+  IN OUT PVOID *SystemArgument2 OPTIONAL);
+#endif
+
 //
 // APC Environment Types
 //

Modified: trunk/reactos/include/ndk/rtltypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/rtltypes.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/rtltypes.h	[iso-8859-1] Wed Mar 11 09:21:10 2015
@@ -848,11 +848,6 @@
     CSHORT Milliseconds;
     CSHORT Weekday;
 } TIME_FIELDS, *PTIME_FIELDS;
-
-//
-// Activation Context
-//
-typedef PVOID PACTIVATION_CONTEXT;
 
 //
 // Activation Context Frame
@@ -1199,6 +1194,7 @@
     PRTL_HANDLE_TABLE_ENTRY MaxReservedHandles;
 } RTL_HANDLE_TABLE, *PRTL_HANDLE_TABLE;
 
+#ifdef NTOS_MODE_USER
 //
 // Exception Record
 //
@@ -1207,6 +1203,7 @@
     struct _EXCEPTION_REGISTRATION_RECORD *Next;
     PEXCEPTION_ROUTINE Handler;
 } EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD;
+#endif /* NTOS_MODE_USER */
 
 //
 // Current Directory Structures

Modified: trunk/reactos/include/xdk/ketypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=…
==============================================================================
--- trunk/reactos/include/xdk/ketypes.h	[iso-8859-1] (original)
+++ trunk/reactos/include/xdk/ketypes.h	[iso-8859-1] Wed Mar 11 09:21:10 2015
@@ -476,6 +476,7 @@
   KD_OPTION_SET_BLOCK_ENABLE,
 } KD_OPTION;
 
+#ifdef _NTSYSTEM_
 typedef VOID
 (NTAPI *PKNORMAL_ROUTINE)(
   IN PVOID NormalContext OPTIONAL,
@@ -493,6 +494,7 @@
   IN OUT PVOID *NormalContext OPTIONAL,
   IN OUT PVOID *SystemArgument1 OPTIONAL,
   IN OUT PVOID *SystemArgument2 OPTIONAL);
+#endif
 
 typedef struct _KAPC {
   UCHAR Type;
@@ -502,9 +504,13 @@
   ULONG SpareLong0;
   struct _KTHREAD *Thread;
   LIST_ENTRY ApcListEntry;
+#ifdef _NTSYSTEM_
   PKKERNEL_ROUTINE KernelRoutine;
   PKRUNDOWN_ROUTINE RundownRoutine;
   PKNORMAL_ROUTINE NormalRoutine;
+#else
+  PVOID Reserved[3];
+#endif
   PVOID NormalContext;
   PVOID SystemArgument1;
   PVOID SystemArgument2;
@@ -992,6 +998,12 @@
 
 $endif (_WDMDDK_)
 $if (_NTDDK_)
+
+typedef struct _EXCEPTION_REGISTRATION_RECORD
+{
+  struct _EXCEPTION_REGISTRATION_RECORD *Next;
+  PEXCEPTION_ROUTINE Handler;
+} EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD;
 
 typedef struct _NT_TIB {
   struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList;