Fix building issues caused by previous patch

svn path=/trunk/; revision=16074

diff --git a/reactos/boot/freeldr/freeldr/reactos/reactos.c b/reactos/boot/freeldr/freeldr/reactos/reactos.c
index 7180945..a3512e4 100644 (file)
--- a/reactos/boot/freeldr/freeldr/reactos/reactos.c
+++ b/reactos/boot/freeldr/freeldr/reactos/reactos.c
@@ -7,7 +7,6 @@
  */
 
 #include <freeldr.h>
-#include <internal/i386/ke.h>
 #include <reactos/rossym.h>
 
 #include "registry.h"

diff --git a/reactos/drivers/fs/ms/create.c b/reactos/drivers/fs/ms/create.c
index 85bf9d5..c35aeac 100644 (file)
--- a/reactos/drivers/fs/ms/create.c
+++ b/reactos/drivers/fs/ms/create.c
@@ -10,6 +10,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntifs.h>
+#include <ntos/fstypes.h> /* FIXME: NDK */
 /* FIXME: The headers are broken! */
 #undef CreateMailslot
 #include "msfs.h"

diff --git a/reactos/drivers/fs/np/create.c b/reactos/drivers/fs/np/create.c
index 68f711e..5a2b7b5 100644 (file)
--- a/reactos/drivers/fs/np/create.c
+++ b/reactos/drivers/fs/np/create.c
@@ -10,6 +10,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntifs.h>
+#include <ntos/fstypes.h> /* FIXME: NDK */
 #include "npfs.h"
 
 #define NDEBUG

diff --git a/reactos/hal/halx86/xbox/part_xbox.c b/reactos/hal/halx86/xbox/part_xbox.c
index cb34d82..a1b6ad1 100644 (file)
--- a/reactos/hal/halx86/xbox/part_xbox.c
+++ b/reactos/hal/halx86/xbox/part_xbox.c
@@ -11,7 +11,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ddk/ntdddisk.h>
 #include <hal.h>
 #include "halxbox.h"
 

diff --git a/reactos/include/ntdll/rtl.h b/reactos/include/ntdll/rtl.h
index 775e3d1..3e5c347 100644 (file)
--- a/reactos/include/ntdll/rtl.h
+++ b/reactos/include/ntdll/rtl.h
@@ -7,6 +7,7 @@
 
 #include <ddk/ntifs.h>
 #include <ntos/types.h>
+#include <ntos/zwtypes.h>
 #include <napi/teb.h>
 
 #ifdef __cplusplus

diff --git a/reactos/include/ntos/fstypes.h b/reactos/include/ntos/fstypes.h
index 4bf6a45..d468bef 100644 (file)
--- a/reactos/include/ntos/fstypes.h
+++ b/reactos/include/ntos/fstypes.h
@@ -24,4 +24,25 @@ typedef struct _MCB {
     LARGE_MCB LargeMcb;
 } MCB, *PMCB;
 
+
+typedef struct _MAILSLOT_CREATE_PARAMETERS 
+{
+    ULONG           MailslotQuota;
+    ULONG           MaximumMessageSize;
+    LARGE_INTEGER   ReadTimeout;
+    BOOLEAN         TimeoutSpecified;
+} MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS;
+
+typedef struct _NAMED_PIPE_CREATE_PARAMETERS 
+{
+    ULONG           NamedPipeType;
+    ULONG           ReadMode;
+    ULONG           CompletionMode;
+    ULONG           MaximumInstances;
+    ULONG           InboundQuota;
+    ULONG           OutboundQuota;
+    LARGE_INTEGER   DefaultTimeout;
+    BOOLEAN         TimeoutSpecified;
+} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS;
+
 #endif  /* __INCLUDE_DDK_FSTYPES_H */

diff --git a/reactos/include/ntos/krnltypes.h b/reactos/include/ntos/krnltypes.h
index 4b9060a..fdd208b 100644 (file)
--- a/reactos/include/ntos/krnltypes.h
+++ b/reactos/include/ntos/krnltypes.h
@@ -14,50 +14,6 @@
 extern POBJECT_TYPE EXPORTED ExMutantObjectType;\r
 extern POBJECT_TYPE EXPORTED ExTimerType;\r
 \r
-typedef struct _SECTION_BASIC_INFORMATION\r
-{\r
-  PVOID BaseAddress;\r
-  ULONG Attributes;\r
-  LARGE_INTEGER Size;\r
-} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION;\r
-\r
-typedef struct _SECTION_IMAGE_INFORMATION \r
-{\r
-    ULONG     EntryPoint;\r
-    ULONG     Unknown1;\r
-    ULONG_PTR StackReserve;\r
-    ULONG_PTR StackCommit;\r
-    ULONG     Subsystem;\r
-    USHORT    MinorSubsystemVersion;\r
-    USHORT    MajorSubsystemVersion;\r
-    ULONG     Unknown2;\r
-    ULONG     Characteristics;\r
-    USHORT    ImageNumber;\r
-    BOOLEAN   Executable;\r
-    UCHAR     Unknown3;\r
-    ULONG     Unknown4[3];\r
-} SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION;\r
-\r
-typedef struct _MAILSLOT_CREATE_PARAMETERS \r
-{\r
-    ULONG           MailslotQuota;\r
-    ULONG           MaximumMessageSize;\r
-    LARGE_INTEGER   ReadTimeout;\r
-    BOOLEAN         TimeoutSpecified;\r
-} MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS;\r
-\r
-typedef struct _NAMED_PIPE_CREATE_PARAMETERS \r
-{\r
-    ULONG           NamedPipeType;\r
-    ULONG           ReadMode;\r
-    ULONG           CompletionMode;\r
-    ULONG           MaximumInstances;\r
-    ULONG           InboundQuota;\r
-    ULONG           OutboundQuota;\r
-    LARGE_INTEGER   DefaultTimeout;\r
-    BOOLEAN         TimeoutSpecified;\r
-} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS;\r
-\r
 /*\r
  * PURPOSE: Special timer associated with each device\r
  */\r

diff --git a/reactos/include/ntos/zwtypes.h b/reactos/include/ntos/zwtypes.h
index e675224..e166f72 100755 (executable)
--- a/reactos/include/ntos/zwtypes.h
+++ b/reactos/include/ntos/zwtypes.h
@@ -1120,13 +1120,6 @@ typedef struct _RETRIEVAL_POINTERS_BUFFER {
 } RETRIEVAL_POINTERS_BUFFER, *PRETRIEVAL_POINTERS_BUFFER;
 #include <poppack.h>
 
-typedef struct _SECTION_BASIC_INFORMATION
-{
-  PVOID BaseAddress;
-  ULONG Attributes;
-  LARGE_INTEGER Size;
-} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION;
-
 typedef enum _SECTION_INFORMATION_CLASS 
 {
   SectionBasicInformation,
@@ -1180,6 +1173,30 @@ extern IMPORTED ULONG NtBuildNumber;
 #endif
 #endif /* __GNUC__ */
 
+typedef struct _SECTION_BASIC_INFORMATION
+{
+  PVOID BaseAddress;
+  ULONG Attributes;
+  LARGE_INTEGER Size;
+} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION;
+
+typedef struct _SECTION_IMAGE_INFORMATION 
+{
+    ULONG     EntryPoint;
+    ULONG     Unknown1;
+    ULONG_PTR StackReserve;
+    ULONG_PTR StackCommit;
+    ULONG     Subsystem;
+    USHORT    MinorSubsystemVersion;
+    USHORT    MajorSubsystemVersion;
+    ULONG     Unknown2;
+    ULONG     Characteristics;
+    USHORT    ImageNumber;
+    BOOLEAN   Executable;
+    UCHAR     Unknown3;
+    ULONG     Unknown4[3];
+} SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION;
+
 
 // event access mask
 

diff --git a/reactos/lib/fslib/vfatlib/vfatlib.h b/reactos/lib/fslib/vfatlib/vfatlib.h
index fd88668..39138db 100755 (executable)
--- a/reactos/lib/fslib/vfatlib/vfatlib.h
+++ b/reactos/lib/fslib/vfatlib/vfatlib.h
@@ -8,6 +8,7 @@
 #define NTOS_MODE_USER
 #include <ntos.h>
 #include <fslib/vfatlib.h>
+#include <ddk/ntdddisk.h>
 
 #define SECTORSIZE 512
 

diff --git a/reactos/lib/fslib/vfatxlib/vfatxlib.h b/reactos/lib/fslib/vfatxlib/vfatxlib.h
index 3ac90c7..33eaa34 100644 (file)
--- a/reactos/lib/fslib/vfatxlib/vfatxlib.h
+++ b/reactos/lib/fslib/vfatxlib/vfatxlib.h
@@ -8,6 +8,7 @@
 #define NTOS_MODE_USER\r
 #include <ntos.h>\r
 #include <fslib/vfatlib.h>\r
+#include <ddk/ntdddisk.h>\r
 \r
 typedef struct _FATX_BOOT_SECTOR\r
 {\r

diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h
index ccd691e..1d79b32 100644 (file)
--- a/reactos/ntoskrnl/include/internal/i386/ke.h
+++ b/reactos/ntoskrnl/include/internal/i386/ke.h
@@ -201,6 +201,7 @@ Ke386InitThreadWithContext(PKTHREAD Thread,
                            PVOID StartContext,
                            PCONTEXT Context);
 
+#ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */
 VOID
 STDCALL
 KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine,
@@ -208,6 +209,7 @@ KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine,
                 PVOID StartContext,
                 BOOLEAN UserThread,
                 KTRAP_FRAME TrapFrame);
+#endif
 
 #ifdef CONFIG_SMP
 #define LOCK "lock ; "

diff --git a/reactos/subsys/system/usetup/bootsup.c b/reactos/subsys/system/usetup/bootsup.c
index b1216d0..93de053 100644 (file)
--- a/reactos/subsys/system/usetup/bootsup.c
+++ b/reactos/subsys/system/usetup/bootsup.c
@@ -26,6 +26,7 @@
 
 #include "precomp.h"
 #include <ntdll/rtl.h>
+#include <ddk/ntdddisk.h> /* FIXME: NDK */
 
 #include "usetup.h"
 #include "inicache.h"

diff --git a/reactos/subsys/system/usetup/partlist.c b/reactos/subsys/system/usetup/partlist.c
index df7df12..dc56b76 100644 (file)
--- a/reactos/subsys/system/usetup/partlist.c
+++ b/reactos/subsys/system/usetup/partlist.c
@@ -26,7 +26,8 @@
  */
 
 #include "precomp.h"
-#include <ddk/ntddscsi.h>
+#include <ddk/ntddscsi.h>  /* FIXME: NDK */
+#include <ddk/ntdddisk.h> /* FIXME: NDK */
 
 #include <ntdll/rtl.h>
 

diff --git a/reactos/subsys/system/usetup/usetup.c b/reactos/subsys/system/usetup/usetup.c
index f156952..a9c7f6e 100644 (file)
--- a/reactos/subsys/system/usetup/usetup.c
+++ b/reactos/subsys/system/usetup/usetup.c
@@ -28,6 +28,7 @@
 
 #include "precomp.h"
 #include <ntdll/rtl.h>
+#include <ddk/ntdddisk.h> /* FIXME: NDK */
 
 #include <ntos/minmax.h>
 #include <reactos/resource.h>