- Created include/libs and moved all library headers there.

- Created include/drivers and moved driver headers there.
 - Brought back core.h as diskdump.h, and re-enabled diskdump...it seems even though I was told it doesn't work, it's still very much used.

svn path=/trunk/; revision=16657

reactos/ReactOS.xml

@@ -32,6 +32,9 @@
 
 	<include>include</include>
 	<include>include/reactos</include>
+	<include>include/libs</include>
+	<include>include/drivers</include>
+	<include>include/subsys</include>
 	<include>w32api/include</include>
 	<include>w32api/include/ddk</include>
 

reactos/drivers/storage/directory.xml

@@ -16,3 +16,6 @@
 <directory name="scsiport">
 	<xi:include href="scsiport/scsiport.xml" />
 </directory>
+<directory name="diskdump">
+	<xi:include href="diskdump/diskdump.xml" />
+</directory>

reactos/drivers/storage/diskdump/diskdump.c

@@ -31,8 +31,8 @@
 #include <ddk/scsi.h>
 #include <ddk/ntdddisk.h>
 #include <ddk/ntddscsi.h>
-#include <ddk/class2.h>
-#include <ddk/core.h>
+#include <include/class2.h>
+#include <diskdump/diskdump.h>
 
 #include <ndk/extypes.h>
 #include <ndk/rtlfuncs.h>

reactos/drivers/storage/diskdump/diskdump.xml

@@ -5,6 +5,7 @@
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<library>class2</library>
+	<include base="diskdump">..</include>
 	<file>diskdump.c</file>
 	<file>diskdump_helper.S</file>
 	<file>diskdump.rc</file>

reactos/include/drivers/diskdump/diskdump.h

@@ -0,0 +1,31 @@
+#ifndef __DISKDUMP_H
+#define __DISKDUMP_H
+
+#include <ddk/ntddscsi.h>
+#include <ndk/ketypes.h>
+
+#define MM_CORE_DUMP_HEADER_MAGIC         (0xdeafbead)
+#define MM_CORE_DUMP_HEADER_VERSION       (0x1)
+
+typedef struct _MM_CORE_DUMP_HEADER
+{
+  ULONG Magic;
+  ULONG Version;
+  ULONG Type;
+  KTRAP_FRAME TrapFrame;
+  ULONG BugCheckCode;
+  ULONG BugCheckParameters[4];
+  PVOID FaultingStackBase;
+  ULONG FaultingStackSize;
+  ULONG PhysicalMemorySize;
+} MM_CORE_DUMP_HEADER, *PMM_CORE_DUMP_HEADER;
+
+typedef struct MM_CORE_DUMP_FUNCTIONS
+{
+  NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers);
+  NTSTATUS (STDCALL *DumpInit)(VOID);
+  NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl);
+  NTSTATUS (STDCALL *DumpFinish)(VOID);
+} MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS;
+
+#endif /* __DISKDUMP_H */

reactos/include/subsys/csrss/csrss.h

@@ -2,7 +2,7 @@
 #define __INCLUDE_CSRSS_CSRSS_H
 
 #include <windows.h>
-#include <ddk/ntddblue.h>
+#include <blue/ntddblue.h>
 
 #define CSR_NATIVE     0x0000
 #define CSR_CONSOLE    0x0001

reactos/lib/syssetup/install.c

@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #include <samlib/samlib.h>
-#include <syssetup.h>
+#include <syssetup/syssetup.h>
 #include <userenv.h>
 #include <setupapi.h>
 

reactos/lib/syssetup/logfile.c

@@ -31,7 +31,7 @@
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
 
-#include <syssetup.h>
+#include <syssetup/syssetup.h>
 
 
 /* GLOBALS ******************************************************************/

reactos/ntoskrnl/include/ntoskrnl.h

@@ -24,12 +24,18 @@
 #undef IO_TYPE_FILE
 #define IO_TYPE_FILE                    0x0F5L /* Temp Hack */
 
+/* FIXME: Temporary until CC Ros is gone */
+#include <ccros.h>        
+
 /* ReactOS Headers */
 #include <reactos/version.h>
 #include <reactos/resource.h>
 #include <reactos/bugcodes.h>
 #include <reactos/rossym.h>
 
+/* Disk Dump Driver Header */
+#include <diskdump/diskdump.h>
+
 /* C Headers */
 #include <malloc.h>
 #include <wchar.h>

reactos/ntoskrnl/mm/pagefile.c

@@ -29,7 +29,6 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntoskrnl.h>
-#include <ddk/core.h>
 #define NDEBUG
 #include <internal/debug.h>
 

reactos/subsys/csrss/win32csr/w32csr.h

@@ -4,7 +4,7 @@
 #include <ndk/ntndk.h>
 
 /* Our own BLUE.SYS Driver for Console Output */
-#include <ddk/ntddblue.h>
+#include <blue/ntddblue.h>
 
 /* External Winlogon Header */
 #include <winlogon.h>

reactos/subsys/system/usetup/usetup.h

@@ -39,8 +39,8 @@
 /* DDK Disk Headers */
 #include <ddk/ntddscsi.h>
 
-/* FIXME: Put outside of DDK */
-#include <ddk/ntddblue.h>
+/* Blue Driver Header */
+#include <blue/ntddblue.h>
 
 /* Helper Header */
 #include <reactos/helper.h>