From 3596d2a33987e7967305087ffa2b7ff9d422e532 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Tue, 21 Jun 2005 04:52:46 +0000
Subject: [PATCH] Build kernel32, ntdll, csrss fully with NDK and remove ntdll
 header usage

svn path=/trunk/; revision=16205
---
 reactos/include/epsapi.h       |  3 ---
 reactos/include/ndk/ldrtypes.h | 11 +++++++----
 reactos/include/ndk/umfuncs.h  |  9 +++++++++
 reactos/lib/kernel32/k32.h     |  7 +------
 reactos/lib/ntdll/inc/ntdll.h  |  6 +-----
 reactos/lib/ntdll/inc/ntdllp.h |  4 +---
 reactos/subsys/csrss/init.c    |  3 +--
 7 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/reactos/include/epsapi.h b/reactos/include/epsapi.h
index 29bb9dd6c6c..e6f5888bbe0 100644
--- a/reactos/include/epsapi.h
+++ b/reactos/include/epsapi.h
@@ -25,9 +25,6 @@
 #ifndef __EPSAPI_H_INCLUDED__
 #define __EPSAPI_H_INCLUDED__
 
-/* Remove soon */
-#include <ntdll/ldr.h>
-
 /* TYPES */
 typedef NTSTATUS (NTAPI *PPROC_ENUM_ROUTINE)(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess,
                                              IN OUT PVOID CallbackContext);
diff --git a/reactos/include/ndk/ldrtypes.h b/reactos/include/ndk/ldrtypes.h
index 726dd1f6eb0..260f83e875c 100644
--- a/reactos/include/ndk/ldrtypes.h
+++ b/reactos/include/ndk/ldrtypes.h
@@ -43,7 +43,6 @@ typedef struct _PEB_LDR_DATA
     PVOID               EntryInProgress;
 } PEB_LDR_DATA, *PPEB_LDR_DATA;
 
-#if 0
 typedef struct _LDR_DATA_TABLE_ENTRY
 {
     LIST_ENTRY InLoadOrderModuleList;
@@ -55,16 +54,20 @@ typedef struct _LDR_DATA_TABLE_ENTRY
     UNICODE_STRING FullDllName;
     UNICODE_STRING BaseDllName;
     ULONG Flags;
-    SHORT LoadCount; /* FIXME: HACK!!! FIX ASAP */
-    SHORT TlsIndex;  /* FIXME: HACK!!! FIX ASAP */
+    USHORT LoadCount; /* FIXME: HACK!!! FIX ASAP */
+    USHORT TlsIndex;  /* FIXME: HACK!!! FIX ASAP */
     LIST_ENTRY HashLinks;
     PVOID SectionPointer;
     ULONG CheckSum;
     ULONG TimeDateStamp;
     PVOID LoadedImports;
     PVOID EntryPointActivationContext;
+    PVOID PatchInformation;
+#if defined(DBG) || defined(KDBG)
+    /* FIXME: THIS _REALLY_ NEEDS TO GO SOMEWHERE ELSE */
+    PVOID RosSymInfo;
+#endif /* KDBG */
 } LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY;
-#endif
 
 typedef struct _LDR_RESOURCE_INFO 
 {
diff --git a/reactos/include/ndk/umfuncs.h b/reactos/include/ndk/umfuncs.h
index 35041a281a5..d712dd5572f 100644
--- a/reactos/include/ndk/umfuncs.h
+++ b/reactos/include/ndk/umfuncs.h
@@ -10,6 +10,7 @@
 /* DEPENDENCIES **************************************************************/
 #include "ldrtypes.h"
 #include "lpctypes.h"
+#include "rtltypes.h"
 #include <csrss/csrss.h> /* FIXME: Temporary */
 
 /* PROTOTYPES ****************************************************************/
@@ -193,6 +194,14 @@ LdrQueryImageFileExecutionOptions(
     OUT PULONG RetunedLength OPTIONAL
 );
 
+NTSTATUS 
+STDCALL
+LdrQueryProcessModuleInformation(
+    IN PMODULE_INFORMATION ModuleInformation OPTIONAL,
+    IN ULONG Size OPTIONAL,
+    OUT PULONG ReturnedSize
+);
+
 NTSTATUS 
 STDCALL
 LdrShutdownProcess(VOID);
diff --git a/reactos/lib/kernel32/k32.h b/reactos/lib/kernel32/k32.h
index 2185e7f8e46..331812fe194 100755
--- a/reactos/lib/kernel32/k32.h
+++ b/reactos/lib/kernel32/k32.h
@@ -11,6 +11,7 @@
 /* PSDK/NDK Headers */
 #include <windows.h>
 #define NTOS_MODE_USER
+#define READY_FOR_NEW_NTDLL
 #include <ndk/ntndk.h>
 
 /* C Headers */
@@ -21,12 +22,6 @@
 #include <ddk/ntddser.h>
 #include <ddk/ntddtape.h>
 
-/* FIXME: Clean this sh*t up */
-#include <ntdll/base.h>
-#include <ntdll/dbg.h>
-#include <ntdll/csr.h>
-#include <ntdll/ldr.h>
-
 /* Internal Kernel32 Header */
 #include "include/kernel32.h"
 
diff --git a/reactos/lib/ntdll/inc/ntdll.h b/reactos/lib/ntdll/inc/ntdll.h
index 9559282a361..d4634281919 100644
--- a/reactos/lib/ntdll/inc/ntdll.h
+++ b/reactos/lib/ntdll/inc/ntdll.h
@@ -11,13 +11,9 @@
 /* SDK/DDK/NDK Headers. */
 #include <windows.h>
 #define NTOS_MODE_USER
+#define READY_FOR_NEW_NTDLL
 #include <ndk/ntndk.h>
 
-/* NTDLL Headers FIXME: These will be gone imminently */
-#include <ntdll/ntdll.h>
-#include <ntdll/ldr.h>
-#include <ntdll/csr.h>
-
 /* Internal NTDLL */
 #include "ntdllp.h"
 
diff --git a/reactos/lib/ntdll/inc/ntdllp.h b/reactos/lib/ntdll/inc/ntdllp.h
index 566b1d5bb63..70a645d664a 100644
--- a/reactos/lib/ntdll/inc/ntdllp.h
+++ b/reactos/lib/ntdll/inc/ntdllp.h
@@ -9,7 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 /* FIXME: Cleanup this mess */
-//typedef NTSTATUS (STDCALL *PEPFUNC)(PPEB);
+typedef NTSTATUS (STDCALL *PEPFUNC)(PPEB);
 NTSTATUS LdrMapSections(HANDLE ProcessHandle,
 			PVOID ImageBase,
 			HANDLE SectionHandle,
@@ -23,12 +23,10 @@ PEPFUNC LdrPEStartup (PVOID  ImageBase,
 		      HANDLE SectionHandle,
 		      PLDR_DATA_TABLE_ENTRY* Module,
 		      PWSTR FullDosName);
-#if 0
 typedef BOOL 
 (STDCALL *PDLLMAIN_FUNC)(HANDLE hInst,
                          ULONG ul_reason_for_call,
                          LPVOID lpReserved);
-#endif 
 VOID
 STDCALL
 RtlpInitDeferedCriticalSection(
diff --git a/reactos/subsys/csrss/init.c b/reactos/subsys/csrss/init.c
index 5adf245f91b..383d212ed2a 100644
--- a/reactos/subsys/csrss/init.c
+++ b/reactos/subsys/csrss/init.c
@@ -12,9 +12,8 @@
 
 #include <windows.h>
 #define NTOS_MODE_USER
+#define READY_FOR_NEW_NTDLL
 #include <ndk/ntndk.h>
-#include <ntdll/csr.h>
-#include <ntdll/ldr.h>
 #include <rosrtl/string.h>
 #include <sm/helper.h>
 
-- 
2.17.1