Build kernel32, ntdll, csrss fully with NDK and remove ntdll header usage

Modified: trunk/reactos/include/epsapi.h
Modified: trunk/reactos/include/ndk/ldrtypes.h
Modified: trunk/reactos/include/ndk/umfuncs.h
Modified: trunk/reactos/lib/kernel32/k32.h
Modified: trunk/reactos/lib/ntdll/inc/ntdll.h
Modified: trunk/reactos/lib/ntdll/inc/ntdllp.h
Modified: trunk/reactos/subsys/csrss/init.c

--- trunk/reactos/include/epsapi.h	2005-06-21 04:28:03 UTC (rev 16204)
+++ trunk/reactos/include/epsapi.h	2005-06-21 04:52:46 UTC (rev 16205)
@@ -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);

--- trunk/reactos/include/ndk/ldrtypes.h	2005-06-21 04:28:03 UTC (rev 16204)
+++ trunk/reactos/include/ndk/ldrtypes.h	2005-06-21 04:52:46 UTC (rev 16205)
@@ -43,7 +43,6 @@

     PVOID               EntryInProgress;
 } PEB_LDR_DATA, *PPEB_LDR_DATA;
 

-#if 0

 typedef struct _LDR_DATA_TABLE_ENTRY
 {
     LIST_ENTRY InLoadOrderModuleList;
@@ -55,16 +54,20 @@

     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 
 {

--- trunk/reactos/include/ndk/umfuncs.h	2005-06-21 04:28:03 UTC (rev 16204)
+++ trunk/reactos/include/ndk/umfuncs.h	2005-06-21 04:52:46 UTC (rev 16205)
@@ -10,6 +10,7 @@

 /* DEPENDENCIES **************************************************************/
 #include "ldrtypes.h"
 #include "lpctypes.h"

+#include "rtltypes.h"

 #include <csrss/csrss.h> /* FIXME: Temporary */
 
 /* PROTOTYPES ****************************************************************/
@@ -195,6 +196,14 @@

 
 NTSTATUS 
 STDCALL

+LdrQueryProcessModuleInformation(
+    IN PMODULE_INFORMATION ModuleInformation OPTIONAL,
+    IN ULONG Size OPTIONAL,
+    OUT PULONG ReturnedSize
+);
+
+NTSTATUS 
+STDCALL

 LdrShutdownProcess(VOID);
 
 NTSTATUS 

--- trunk/reactos/lib/kernel32/k32.h	2005-06-21 04:28:03 UTC (rev 16204)
+++ trunk/reactos/lib/kernel32/k32.h	2005-06-21 04:52:46 UTC (rev 16205)
@@ -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"
 

--- trunk/reactos/lib/ntdll/inc/ntdll.h	2005-06-21 04:28:03 UTC (rev 16204)
+++ trunk/reactos/lib/ntdll/inc/ntdll.h	2005-06-21 04:52:46 UTC (rev 16205)
@@ -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"
 

--- trunk/reactos/lib/ntdll/inc/ntdllp.h	2005-06-21 04:28:03 UTC (rev 16204)
+++ trunk/reactos/lib/ntdll/inc/ntdllp.h	2005-06-21 04:52:46 UTC (rev 16205)
@@ -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 @@

 		      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(

--- trunk/reactos/subsys/csrss/init.c	2005-06-21 04:28:03 UTC (rev 16204)
+++ trunk/reactos/subsys/csrss/init.c	2005-06-21 04:52:46 UTC (rev 16205)
@@ -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>