Modified: trunk/reactos/ReactOS.xml

--- trunk/reactos/ReactOS.xml	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/ReactOS.xml	2005-07-20 03:42:05 UTC (rev 16657)
@@ -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>

Modified: trunk/reactos/drivers/storage/directory.xml

--- trunk/reactos/drivers/storage/directory.xml	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/drivers/storage/directory.xml	2005-07-20 03:42:05 UTC (rev 16657)
@@ -16,3 +16,6 @@

 <directory name="scsiport">
 	<xi:include href="scsiport/scsiport.xml" />
 </directory>

+<directory name="diskdump">
+	<xi:include href="diskdump/diskdump.xml" />
+</directory>

\ No newline at end of file

Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c

--- trunk/reactos/drivers/storage/diskdump/diskdump.c	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/drivers/storage/diskdump/diskdump.c	2005-07-20 03:42:05 UTC (rev 16657)
@@ -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>

Modified: trunk/reactos/drivers/storage/diskdump/diskdump.xml

--- trunk/reactos/drivers/storage/diskdump/diskdump.xml	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/drivers/storage/diskdump/diskdump.xml	2005-07-20 03:42:05 UTC (rev 16657)
@@ -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>

Deleted: trunk/reactos/include/ddk/ntddblue.h

--- trunk/reactos/include/ddk/ntddblue.h	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/include/ddk/ntddblue.h	2005-07-20 03:42:05 UTC (rev 16657)
@@ -1,64 +0,0 @@

-#ifndef _NTDDBLUE_H_INCLUDED_
-#define _NTDDBLUE_H_INCLUDED_
-
-#define IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO    CTL_CODE(FILE_DEVICE_SCREEN, 0x801, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO    CTL_CODE(FILE_DEVICE_SCREEN, 0x802, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-#define IOCTL_CONSOLE_GET_CURSOR_INFO           CTL_CODE(FILE_DEVICE_SCREEN, 0x803, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_CONSOLE_SET_CURSOR_INFO           CTL_CODE(FILE_DEVICE_SCREEN, 0x804, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-#define IOCTL_CONSOLE_GET_MODE                  CTL_CODE(FILE_DEVICE_SCREEN, 0x805, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_CONSOLE_SET_MODE                  CTL_CODE(FILE_DEVICE_SCREEN, 0x806, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-
-
-#define IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE     CTL_CODE(FILE_DEVICE_SCREEN, 0x810, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-#define IOCTL_CONSOLE_READ_OUTPUT_ATTRIBUTE     CTL_CODE(FILE_DEVICE_SCREEN, 0x811, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-#define IOCTL_CONSOLE_WRITE_OUTPUT_ATTRIBUTE    CTL_CODE(FILE_DEVICE_SCREEN, 0x812, METHOD_IN_DIRECT, FILE_ANY_ACCESS)
-#define IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE        CTL_CODE(FILE_DEVICE_SCREEN, 0x813, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-
-
-#define IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER     CTL_CODE(FILE_DEVICE_SCREEN, 0x820, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-#define IOCTL_CONSOLE_READ_OUTPUT_CHARACTER     CTL_CODE(FILE_DEVICE_SCREEN, 0x821, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-#define IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER    CTL_CODE(FILE_DEVICE_SCREEN, 0x822, METHOD_IN_DIRECT, FILE_ANY_ACCESS)
-
-#define IOCTL_CONSOLE_DRAW                      CTL_CODE(FILE_DEVICE_SCREEN, 0x830, METHOD_IN_DIRECT, FILE_WRITE_ACCESS)
-
-
-/* TYPEDEFS **************************************************************/
-
-
-typedef struct tagCONSOLE_MODE
-{
-  DWORD dwMode;
-} CONSOLE_MODE, *PCONSOLE_MODE;
-
-
-typedef struct tagOUTPUT_ATTRIBUTE
-{
-  WORD  wAttribute;
-  DWORD nLength;
-  COORD dwCoord;
-  DWORD dwTransfered;
-} OUTPUT_ATTRIBUTE, *POUTPUT_ATTRIBUTE;
-
-
-typedef struct tagOUTPUT_CHARACTER
-{
-  CHAR  cCharacter;
-  DWORD nLength;
-  COORD dwCoord;
-  DWORD dwTransfered;
-} OUTPUT_CHARACTER, *POUTPUT_CHARACTER;
-
-
-typedef struct tagCONSOLE_DRAW
-{
-  UINT X;       /* Origin */
-  UINT Y;
-  UINT SizeX;   /* Size of the screen buffer (chars) */
-  UINT SizeY;
-  UINT CursorX; /* New cursor position (screen-relative) */
-  UINT CursorY;
-  /* Followed by screen buffer in char/attrib format */
-} CONSOLE_DRAW, *PCONSOLE_DRAW;
-
-
-#endif /* _NTDDBLUE_H_INCLUDED_ */

Copied: trunk/reactos/include/drivers/blue/ntddblue.h (from rev 16628, trunk/reactos/include/ddk/ntddblue.h)

Added: trunk/reactos/include/drivers/diskdump/diskdump.h

--- trunk/reactos/include/drivers/diskdump/diskdump.h	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/include/drivers/diskdump/diskdump.h	2005-07-20 03:42:05 UTC (rev 16657)
@@ -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 */

Copied: trunk/reactos/include/libs/epsapi (from rev 16628, trunk/reactos/include/epsapi)

Copied: trunk/reactos/include/libs/expat (from rev 16628, trunk/reactos/include/expat)

Copied: trunk/reactos/include/libs/fmifs (from rev 16628, trunk/reactos/include/fmifs)

Copied: trunk/reactos/include/libs/fslib (from rev 16628, trunk/reactos/include/fslib)

Copied: trunk/reactos/include/libs/pseh (from rev 16628, trunk/reactos/include/pseh)

Copied: trunk/reactos/include/libs/samlib (from rev 16628, trunk/reactos/include/samlib)

Copied: trunk/reactos/include/libs/sm (from rev 16628, trunk/reactos/include/sm)

Copied: trunk/reactos/include/libs/syssetup/syssetup.h (from rev 16628, trunk/reactos/include/syssetup.h)

Copied: trunk/reactos/include/subsys/csrss (from rev 16628, trunk/reactos/include/csrss)

Modified: trunk/reactos/include/subsys/csrss/csrss.h

--- trunk/reactos/include/csrss/csrss.h	2005-07-17 19:20:12 UTC (rev 16628)
+++ trunk/reactos/include/subsys/csrss/csrss.h	2005-07-20 03:42:05 UTC (rev 16657)
@@ -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

Copied: trunk/reactos/include/subsys/lsass (from rev 16628, trunk/reactos/include/lsass)

Deleted: trunk/reactos/include/syssetup.h

--- trunk/reactos/include/syssetup.h	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/include/syssetup.h	2005-07-20 03:42:05 UTC (rev 16657)
@@ -1,55 +0,0 @@

-/* $Id$
-*/
-/*
- * syssetup.h
- *
- * System setup API, native interface
- *
- * This file is part of the ReactOS Operating System.
- *
- * Contributors:
- *  Created by Eric Kohl <ekohl@rz-online.de>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __SYSSETUP_H_INCLUDED__
-#define __SYSSETUP_H_INCLUDED__
-
-/* System setup APIs */
-
-DWORD STDCALL
-InstallReactOS (HINSTANCE hInstance);
-
-
-/* Log File APIs */
-
-#define SYSSETUP_SEVERITY_INFORMATION   0
-#define SYSSETUP_SEVERITY_WARNING       1
-#define SYSSETUP_SEVERITY_ERROR         2
-#define SYSSETUP_SEVERITY_FATAL_ERROR   3
-
-
-BOOL STDCALL
-InitializeSetupActionLog (BOOL bDeleteOldLogFile);
-
-VOID STDCALL
-TerminateSetupActionLog (VOID);
-
-BOOL STDCALL
-LogItem (DWORD dwSeverity,
-	 LPWSTR lpMessageText);
-
-
-#endif /* __SYSSETUP_H_INCLUDED__ */
-
-/* EOF */

Modified: trunk/reactos/lib/syssetup/install.c

--- trunk/reactos/lib/syssetup/install.c	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/lib/syssetup/install.c	2005-07-20 03:42:05 UTC (rev 16657)
@@ -37,7 +37,7 @@

 #include <stdlib.h>
 
 #include <samlib/samlib.h>

-#include <syssetup.h>

+#include <syssetup/syssetup.h>

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

Modified: trunk/reactos/lib/syssetup/logfile.c

--- trunk/reactos/lib/syssetup/logfile.c	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/lib/syssetup/logfile.c	2005-07-20 03:42:05 UTC (rev 16657)
@@ -31,7 +31,7 @@

 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>

-#include <syssetup.h>

+#include <syssetup/syssetup.h>

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

Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h

--- trunk/reactos/ntoskrnl/include/ntoskrnl.h	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/ntoskrnl/include/ntoskrnl.h	2005-07-20 03:42:05 UTC (rev 16657)
@@ -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>

Modified: trunk/reactos/ntoskrnl/mm/pagefile.c

--- trunk/reactos/ntoskrnl/mm/pagefile.c	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/ntoskrnl/mm/pagefile.c	2005-07-20 03:42:05 UTC (rev 16657)
@@ -29,7 +29,6 @@

 /* INCLUDES *****************************************************************/
 
 #include <ntoskrnl.h>

-#include <ddk/core.h>

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

Modified: trunk/reactos/subsys/csrss/win32csr/w32csr.h

--- trunk/reactos/subsys/csrss/win32csr/w32csr.h	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/subsys/csrss/win32csr/w32csr.h	2005-07-20 03:42:05 UTC (rev 16657)
@@ -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>

Modified: trunk/reactos/subsys/system/usetup/usetup.h

--- trunk/reactos/subsys/system/usetup/usetup.h	2005-07-20 02:52:52 UTC (rev 16656)
+++ trunk/reactos/subsys/system/usetup/usetup.h	2005-07-20 03:42:05 UTC (rev 16657)
@@ -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>