Merge trunk HEAD (r46369)

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

diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h
index 41d4843..d75265e 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h
@@ -90,6 +90,43 @@
 #include "hal.h"
 #include "arch/intrin_i.h"
 
+extern ULONG (*FrLdrDbgPrint)(const char *Format, ...);
+
+#include <pshpack1.h>
+/*
+ * Defines a descriptor as it appears in the processor tables
+ */
+typedef struct __DESCRIPTOR
+{
+  ULONG a;
+  ULONG b;
+} IDT_DESCRIPTOR, GDT_DESCRIPTOR;
+
+#include <poppack.h>
+//extern GDT_DESCRIPTOR KiGdt[256];
+
+/*
+ * Initalization functions (called once by main())
+ */
+BOOLEAN NTAPI ObInit(VOID);
+BOOLEAN NTAPI CmInitSystem1(VOID);
+VOID NTAPI CmShutdownSystem(VOID);
+BOOLEAN NTAPI KdInitSystem(ULONG Reserved, PLOADER_PARAMETER_BLOCK LoaderBlock);
+
+/* FIXME - RtlpCreateUnicodeString is obsolete and should be removed ASAP! */
+BOOLEAN FASTCALL
+RtlpCreateUnicodeString(
+   IN OUT PUNICODE_STRING UniDest,
+   IN PCWSTR  Source,
+   IN POOL_TYPE PoolType);
+
+VOID
+NTAPI
+RtlpLogException(IN PEXCEPTION_RECORD ExceptionRecord,
+                 IN PCONTEXT ContextRecord,
+                 IN PVOID ContextData,
+                 IN ULONG Size);
+
 /*
  * generic information class probing code
  */
@@ -145,7 +182,7 @@ typedef struct _INFORMATION_CLASS_INFO
 
 #endif
 
-#if defined (_M_IX86) || defined(_M_AMD64)
+#ifndef _WIN64
 C_ASSERT(FIELD_OFFSET(KUSER_SHARED_DATA, SystemCall) == 0x300);
 C_ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK);
 C_ASSERT(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB);