[NTOSKRNL]

[reactos.git] / ntoskrnl / include / ntoskrnl.h

diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h
index 3b56d34..9a823e4 100644 (file)
--- a/ntoskrnl/include/ntoskrnl.h
+++ b/ntoskrnl/include/ntoskrnl.h
@@ -13,6 +13,13 @@
 #define DbgPrint DbgPrintEarly
 #endif
 
+/* WDK hacks */
+#ifdef _M_AMD64
+#define IoAllocateAdapterChannel _IoAllocateAdapterChannel
+#define KeGetCurrentThread _KeGetCurrentThread
+#define RtlFillMemoryUlong _RtlFillMemoryUlong
+#endif
+
 /* Version Data */
 #undef __MSVCRT__
 #include <psdk/ntverp.h>
@@ -24,15 +31,33 @@
 #include <ntifs.h>
 #include <wdmguid.h>
 #include <arc/arc.h>
+#include <mountmgr.h>
 #undef NTHALAPI
 #define NTHALAPI __declspec(dllimport)
-#include <ntndk.h>
+#include <ndk/asm.h>
+#include <ndk/cctypes.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/dbgkfuncs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/halfuncs.h>
+#include <ndk/inbvfuncs.h>
+#include <ndk/iofuncs.h>
+#include <ndk/kdfuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/ldrfuncs.h>
+#include <ndk/lpcfuncs.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/pofuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/sefuncs.h>
+#include <ndk/vftypes.h>
 #undef TEXT
 #define TEXT(s) L##s
 #include <regstr.h>
-
-/* FIXME: Temporary until Winldr is used */
-#include <rosldr.h>
+#include <ntstrsafe.h>
+#include <ntpoapi.h>
 
 /* C Headers */
 #include <stdlib.h>
@@ -45,7 +70,6 @@
 #include <pseh/pseh2.h>
 
 /* ReactOS Headers */
-#include <reactos/buildno.h>
 #include <reactos/bugcodes.h>
 
 /* SetupLDR Support */
@@ -63,14 +87,6 @@
 /* PNP GUIDs */
 #include <umpnpmgr/sysguid.h>
 
-/* Internal Headers */
-#include "internal/ntoskrnl.h"
-#include "config.h"
-
-#include <reactos/probe.h>
-#include "internal/probe.h"
-#include "resource.h"
-
 //
 // Define the internal versions of external and public global data
 //
@@ -83,6 +99,8 @@
 #define KdDebuggerNotPresent            _KdDebuggerNotPresent
 #define NlsOemLeadByteInfo              _NlsOemLeadByteInfo
 extern PUSHORT _NlsOemLeadByteInfo;
+#define KeNumberProcessors              _KeNumberProcessors
+extern UCHAR _KeNumberProcessors;
 #define FsRtlLegalAnsiCharacterArray    _FsRtlLegalAnsiCharacterArray
 #undef LEGAL_ANSI_CHARACTER_ARRAY
 #undef NLS_MB_CODE_PAGE_TAG
@@ -98,3 +116,12 @@ extern PUSHORT _NlsOemLeadByteInfo;
 #undef HALDISPATCH
 #define HALDISPATCH                     (&HalDispatchTable)
 #define ExRaiseStatus RtlRaiseStatus
+
+/* Internal Headers */
+#include "internal/ntoskrnl.h"
+#include "config.h"
+
+#include <reactos/probe.h>
+#include "internal/probe.h"
+#include "resource.h"
+