- 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

diff --git a/reactos/ReactOS.xml b/reactos/ReactOS.xml
index f575319..d37a34f 100644 (file)
--- a/reactos/ReactOS.xml
+++ b/reactos/ReactOS.xml
@@ -32,6 +32,9 @@
 \r
        <include>include</include>\r
        <include>include/reactos</include>\r
 \r
        <include>include</include>\r
        <include>include/reactos</include>\r

+       <include>include/libs</include>\r
+       <include>include/drivers</include>\r
+       <include>include/subsys</include>\r

        <include>w32api/include</include>\r
        <include>w32api/include/ddk</include>\r
 \r
        <include>w32api/include</include>\r
        <include>w32api/include/ddk</include>\r
 \r

diff --git a/reactos/drivers/storage/directory.xml b/reactos/drivers/storage/directory.xml
index a38cfe9..536e884 100644 (file)
--- a/reactos/drivers/storage/directory.xml
+++ b/reactos/drivers/storage/directory.xml
@@ -16,3 +16,6 @@
 <directory name="scsiport">\r
        <xi:include href="scsiport/scsiport.xml" />\r
 </directory>\r
 <directory name="scsiport">\r
        <xi:include href="scsiport/scsiport.xml" />\r
 </directory>\r

+<directory name="diskdump">\r
+       <xi:include href="diskdump/diskdump.xml" />\r
+</directory>
\ No newline at end of file

diff --git a/reactos/drivers/storage/diskdump/diskdump.c b/reactos/drivers/storage/diskdump/diskdump.c
index a961bef..1f4310a 100644 (file)
--- a/reactos/drivers/storage/diskdump/diskdump.c
+++ b/reactos/drivers/storage/diskdump/diskdump.c
@@ -31,8 +31,8 @@
 #include <ddk/scsi.h>
 #include <ddk/ntdddisk.h>
 #include <ddk/ntddscsi.h>
 #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>
 
 #include <ndk/extypes.h>
 #include <ndk/rtlfuncs.h>

diff --git a/reactos/drivers/storage/diskdump/diskdump.xml b/reactos/drivers/storage/diskdump/diskdump.xml
index a1156b5..55b0c02 100644 (file)
--- a/reactos/drivers/storage/diskdump/diskdump.xml
+++ b/reactos/drivers/storage/diskdump/diskdump.xml
@@ -5,6 +5,7 @@
        <library>ntoskrnl</library>\r
        <library>hal</library>\r
        <library>class2</library>\r
        <library>ntoskrnl</library>\r
        <library>hal</library>\r
        <library>class2</library>\r

+       <include base="diskdump">..</include>\r

        <file>diskdump.c</file>\r
        <file>diskdump_helper.S</file>\r
        <file>diskdump.rc</file>\r
        <file>diskdump.c</file>\r
        <file>diskdump_helper.S</file>\r
        <file>diskdump.rc</file>\r

diff --git a/reactos/include/ddk/ntddblue.h b/reactos/include/drivers/blue/ntddblue.h
similarity index 100%
rename from reactos/include/ddk/ntddblue.h
rename to reactos/include/drivers/blue/ntddblue.h

diff --git a/reactos/include/drivers/diskdump/diskdump.h b/reactos/include/drivers/diskdump/diskdump.h
new file mode 100644 (file)
index 0000000..bb3f8b5
--- /dev/null
+++ b/reactos/include/drivers/diskdump/diskdump.h
@@ -0,0 +1,31 @@
+#ifndef __DISKDUMP_H\r
+#define __DISKDUMP_H\r
+\r
+#include <ddk/ntddscsi.h>\r
+#include <ndk/ketypes.h>\r
+\r
+#define MM_CORE_DUMP_HEADER_MAGIC         (0xdeafbead)\r
+#define MM_CORE_DUMP_HEADER_VERSION       (0x1)\r
+\r
+typedef struct _MM_CORE_DUMP_HEADER\r
+{\r
+  ULONG Magic;\r
+  ULONG Version;\r
+  ULONG Type;\r
+  KTRAP_FRAME TrapFrame;\r
+  ULONG BugCheckCode;\r
+  ULONG BugCheckParameters[4];\r
+  PVOID FaultingStackBase;\r
+  ULONG FaultingStackSize;\r
+  ULONG PhysicalMemorySize;\r
+} MM_CORE_DUMP_HEADER, *PMM_CORE_DUMP_HEADER;\r
+\r
+typedef struct MM_CORE_DUMP_FUNCTIONS\r
+{\r
+  NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers);\r
+  NTSTATUS (STDCALL *DumpInit)(VOID);\r
+  NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl);\r
+  NTSTATUS (STDCALL *DumpFinish)(VOID);\r
+} MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS;\r
+\r
+#endif /* __DISKDUMP_H */\r

diff --git a/reactos/include/epsapi/epsapi.h b/reactos/include/libs/epsapi/epsapi.h
similarity index 100%
rename from reactos/include/epsapi/epsapi.h
rename to reactos/include/libs/epsapi/epsapi.h

diff --git a/reactos/include/expat/expat.h b/reactos/include/libs/expat/expat.h
similarity index 100%
rename from reactos/include/expat/expat.h
rename to reactos/include/libs/expat/expat.h

diff --git a/reactos/include/expat/expat_external.h b/reactos/include/libs/expat/expat_external.h
similarity index 100%
rename from reactos/include/expat/expat_external.h
rename to reactos/include/libs/expat/expat_external.h

diff --git a/reactos/include/fmifs/fmifs.h b/reactos/include/libs/fmifs/fmifs.h
similarity index 100%
rename from reactos/include/fmifs/fmifs.h
rename to reactos/include/libs/fmifs/fmifs.h

diff --git a/reactos/include/fslib/vfatlib.h b/reactos/include/libs/fslib/vfatlib.h
similarity index 100%
rename from reactos/include/fslib/vfatlib.h
rename to reactos/include/libs/fslib/vfatlib.h

diff --git a/reactos/include/fslib/vfatxlib.h b/reactos/include/libs/fslib/vfatxlib.h
similarity index 100%
rename from reactos/include/fslib/vfatxlib.h
rename to reactos/include/libs/fslib/vfatxlib.h

diff --git a/reactos/include/pseh/excpt.h b/reactos/include/libs/pseh/excpt.h
similarity index 100%
rename from reactos/include/pseh/excpt.h
rename to reactos/include/libs/pseh/excpt.h

diff --git a/reactos/include/pseh/framebased.h b/reactos/include/libs/pseh/framebased.h
similarity index 100%
rename from reactos/include/pseh/framebased.h
rename to reactos/include/libs/pseh/framebased.h

diff --git a/reactos/include/pseh/framebased/internal.h b/reactos/include/libs/pseh/framebased/internal.h
similarity index 100%
rename from reactos/include/pseh/framebased/internal.h
rename to reactos/include/libs/pseh/framebased/internal.h

diff --git a/reactos/include/pseh/native.h b/reactos/include/libs/pseh/native.h
similarity index 100%
rename from reactos/include/pseh/native.h
rename to reactos/include/libs/pseh/native.h

diff --git a/reactos/include/pseh/prettybased.h b/reactos/include/libs/pseh/prettybased.h
similarity index 100%
rename from reactos/include/pseh/prettybased.h
rename to reactos/include/libs/pseh/prettybased.h

diff --git a/reactos/include/pseh/pseh.h b/reactos/include/libs/pseh/pseh.h
similarity index 100%
rename from reactos/include/pseh/pseh.h
rename to reactos/include/libs/pseh/pseh.h

diff --git a/reactos/include/pseh/setjmp.h b/reactos/include/libs/pseh/setjmp.h
similarity index 100%
rename from reactos/include/pseh/setjmp.h
rename to reactos/include/libs/pseh/setjmp.h

diff --git a/reactos/include/samlib/samlib.h b/reactos/include/libs/samlib/samlib.h
similarity index 100%
rename from reactos/include/samlib/samlib.h
rename to reactos/include/libs/samlib/samlib.h

diff --git a/reactos/include/sm/api.h b/reactos/include/libs/sm/api.h
similarity index 100%
rename from reactos/include/sm/api.h
rename to reactos/include/libs/sm/api.h

diff --git a/reactos/include/sm/helper.h b/reactos/include/libs/sm/helper.h
similarity index 100%
rename from reactos/include/sm/helper.h
rename to reactos/include/libs/sm/helper.h

diff --git a/reactos/include/sm/ns.h b/reactos/include/libs/sm/ns.h
similarity index 100%
rename from reactos/include/sm/ns.h
rename to reactos/include/libs/sm/ns.h

diff --git a/reactos/include/syssetup.h b/reactos/include/libs/syssetup/syssetup.h
similarity index 100%
rename from reactos/include/syssetup.h
rename to reactos/include/libs/syssetup/syssetup.h

diff --git a/reactos/include/csrss/csrss.h b/reactos/include/subsys/csrss/csrss.h
similarity index 99%
rename from reactos/include/csrss/csrss.h
rename to reactos/include/subsys/csrss/csrss.h
index 0c67310..3f0eddf 100644 (file)
--- a/reactos/include/csrss/csrss.h
+++ b/reactos/include/subsys/csrss/csrss.h
@@ -2,7 +2,7 @@
 #define __INCLUDE_CSRSS_CSRSS_H
 
 #include <windows.h>
 #define __INCLUDE_CSRSS_CSRSS_H
 
 #include <windows.h>

-#include <ddk/ntddblue.h>
+#include <blue/ntddblue.h>

 
 #define CSR_NATIVE     0x0000
 #define CSR_CONSOLE    0x0001
 
 #define CSR_NATIVE     0x0000
 #define CSR_CONSOLE    0x0001

diff --git a/reactos/include/lsass/lsasrv.h b/reactos/include/subsys/lsass/lsasrv.h
similarity index 100%
rename from reactos/include/lsass/lsasrv.h
rename to reactos/include/subsys/lsass/lsasrv.h

diff --git a/reactos/include/lsass/lsass.h b/reactos/include/subsys/lsass/lsass.h
similarity index 100%
rename from reactos/include/lsass/lsass.h
rename to reactos/include/subsys/lsass/lsass.h

diff --git a/reactos/lib/syssetup/install.c b/reactos/lib/syssetup/install.c
index 6f783c3..6e5bdca 100644 (file)
--- a/reactos/lib/syssetup/install.c
+++ b/reactos/lib/syssetup/install.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #include <samlib/samlib.h>
 #include <stdlib.h>
 
 #include <samlib/samlib.h>

-#include <syssetup.h>
+#include <syssetup/syssetup.h>

 #include <userenv.h>
 #include <setupapi.h>
 
 #include <userenv.h>
 #include <setupapi.h>
 

diff --git a/reactos/lib/syssetup/logfile.c b/reactos/lib/syssetup/logfile.c
index df622a1..5a232f2 100644 (file)
--- a/reactos/lib/syssetup/logfile.c
+++ b/reactos/lib/syssetup/logfile.c
@@ -31,7 +31,7 @@
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
 
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
 

-#include <syssetup.h>
+#include <syssetup/syssetup.h>

 
 
 /* GLOBALS ******************************************************************/
 
 
 /* GLOBALS ******************************************************************/

diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h
index 6f0daa9..7ac2948 100755 (executable)
--- a/reactos/ntoskrnl/include/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/ntoskrnl.h
@@ -24,12 +24,18 @@
 #undef IO_TYPE_FILE
 #define IO_TYPE_FILE                    0x0F5L /* Temp Hack */
 
 #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>
 
 /* 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>
 /* C Headers */
 #include <malloc.h>
 #include <wchar.h>

diff --git a/reactos/ntoskrnl/mm/pagefile.c b/reactos/ntoskrnl/mm/pagefile.c
index f25ba0b..6544bf1 100644 (file)
--- a/reactos/ntoskrnl/mm/pagefile.c
+++ b/reactos/ntoskrnl/mm/pagefile.c
@@ -29,7 +29,6 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntoskrnl.h>
 /* INCLUDES *****************************************************************/
 
 #include <ntoskrnl.h>

-#include <ddk/core.h>

 #define NDEBUG
 #include <internal/debug.h>
 
 #define NDEBUG
 #include <internal/debug.h>
 

diff --git a/reactos/subsys/csrss/win32csr/w32csr.h b/reactos/subsys/csrss/win32csr/w32csr.h
index a2488a7..01a7994 100644 (file)
--- a/reactos/subsys/csrss/win32csr/w32csr.h
+++ b/reactos/subsys/csrss/win32csr/w32csr.h
@@ -4,7 +4,7 @@
 #include <ndk/ntndk.h>
 
 /* Our own BLUE.SYS Driver for Console Output */
 #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>
 
 /* External Winlogon Header */
 #include <winlogon.h>

diff --git a/reactos/subsys/system/usetup/usetup.h b/reactos/subsys/system/usetup/usetup.h
index 4643954..4b6e991 100644 (file)
--- a/reactos/subsys/system/usetup/usetup.h
+++ b/reactos/subsys/system/usetup/usetup.h
@@ -39,8 +39,8 @@
 /* DDK Disk Headers */
 #include <ddk/ntddscsi.h>
 
 /* 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>
 
 /* Helper Header */
 #include <reactos/helper.h>