[NTOSKRNL]

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

diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h
index 22407ac..4261d02 100644 (file)
--- a/reactos/ntoskrnl/include/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/ntoskrnl.h
@@ -8,34 +8,38 @@
 
 /* INCLUDES ******************************************************************/
 
+/* ARM Bringup Hack */
+#ifdef _M_ARM
+#define DbgPrint DbgPrintEarly
+#endif
+
+/* WDK hacks */
+#ifdef _M_AMD64
+#define IoAllocateAdapterChannel _IoAllocateAdapterChannel
+#define KeGetCurrentThread _KeGetCurrentThread
+#endif
+
 /* Version Data */
 #undef __MSVCRT__
 #include <psdk/ntverp.h>
-#define _WIN32_WINNT _WIN32_WINNT_WS03
-#define NTDDI_VERSION NTDDI_WS03SP1
 
 /* DDK/IFS/NDK Headers */
-#ifdef _MSC_VER
+#define _REALLY_GET_CALLERS_CALLER
 #include <excpt.h>
 #include <ntdef.h>
-#undef DECLSPEC_IMPORT
-#define DECLSPEC_IMPORT
-#endif
 #include <ntifs.h>
 #include <wdmguid.h>
 #include <arc/arc.h>
+#undef NTHALAPI
+#define NTHALAPI __declspec(dllimport)
 #include <ntndk.h>
 #undef TEXT
 #define TEXT(s) L##s
 #include <regstr.h>
 
-/* FIXME: Temporary until CC Ros is gone */
-#include <ccros.h>
+/* FIXME: Temporary until Winldr is used */
 #include <rosldr.h>
 
-/* Disk Dump Driver Header */
-#include <diskdump/diskdump.h>
-
 /* C Headers */
 #include <stdlib.h>
 #include <stdio.h>
@@ -44,13 +48,11 @@
 #include <wchar.h>
 
 /* SEH support with PSEH */
-#include <pseh/pseh.h>
+#include <pseh/pseh2.h>
 
 /* ReactOS Headers */
 #include <reactos/buildno.h>
 #include <reactos/bugcodes.h>
-#define ExRaiseStatus RtlRaiseStatus
-#include <reactos/probe.h>
 
 /* SetupLDR Support */
 #include <arc/setupblk.h>
@@ -67,13 +69,14 @@
 /* PNP GUIDs */
 #include <umpnpmgr/sysguid.h>
 
-/* Helper Header */
-#include <reactos/helper.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
 //
@@ -100,3 +103,4 @@ extern PUSHORT _NlsOemLeadByteInfo;
 #define HalDispatchTable                _HalDispatchTable
 #undef HALDISPATCH
 #define HALDISPATCH                     (&HalDispatchTable)
+#define ExRaiseStatus RtlRaiseStatus