[ros-diffs] [ion] 16074: Fix building issues caused by previous patch

Fix building issues caused by previous patch
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
Modified: trunk/reactos/drivers/fs/ms/create.c
Modified: trunk/reactos/drivers/fs/np/create.c
Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c
Modified: trunk/reactos/include/ntdll/rtl.h
Modified: trunk/reactos/include/ntos/fstypes.h
Modified: trunk/reactos/include/ntos/krnltypes.h
Modified: trunk/reactos/include/ntos/zwtypes.h
Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h
Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h
Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h
Modified: trunk/reactos/subsys/system/usetup/bootsup.c
Modified: trunk/reactos/subsys/system/usetup/partlist.c
Modified: trunk/reactos/subsys/system/usetup/usetup.c
  _____

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
--- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
2005-06-19 03:55:48 UTC (rev 16073)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
2005-06-19 04:49:14 UTC (rev 16074)
@@ -7,7 +7,6 @@

*/

#include <freeldr.h>
-#include <internal/i386/ke.h>
 #include <reactos/rossym.h>

#include "registry.h"
  _____

Modified: trunk/reactos/drivers/fs/ms/create.c
--- trunk/reactos/drivers/fs/ms/create.c	2005-06-19 03:55:48 UTC
(rev 16073)
+++ trunk/reactos/drivers/fs/ms/create.c	2005-06-19 04:49:14 UTC
(rev 16074)
@@ -10,6 +10,7 @@

/* INCLUDES
******************************************************************/

#include <ntifs.h>
+#include <ntos/fstypes.h> /* FIXME: NDK */
 /* FIXME: The headers are broken! */
 #undef CreateMailslot
 #include "msfs.h"
  _____

Modified: trunk/reactos/drivers/fs/np/create.c
--- trunk/reactos/drivers/fs/np/create.c	2005-06-19 03:55:48 UTC
(rev 16073)
+++ trunk/reactos/drivers/fs/np/create.c	2005-06-19 04:49:14 UTC
(rev 16074)
@@ -10,6 +10,7 @@

/* INCLUDES
******************************************************************/

#include <ntifs.h>
+#include <ntos/fstypes.h> /* FIXME: NDK */
 #include "npfs.h"

#define NDEBUG
  _____

Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c
--- trunk/reactos/hal/halx86/xbox/part_xbox.c	2005-06-19 03:55:48 UTC
(rev 16073)
+++ trunk/reactos/hal/halx86/xbox/part_xbox.c	2005-06-19 04:49:14 UTC
(rev 16074)
@@ -11,7 +11,7 @@

/* INCLUDES
*****************************************************************/

-#include <ddk/ntddk.h>
+#include <ddk/ntdddisk.h>
 #include <hal.h>
 #include "halxbox.h"

_____

Modified: trunk/reactos/include/ntdll/rtl.h
--- trunk/reactos/include/ntdll/rtl.h	2005-06-19 03:55:48 UTC (rev
16073)
+++ trunk/reactos/include/ntdll/rtl.h	2005-06-19 04:49:14 UTC (rev
16074)
@@ -7,6 +7,7 @@

#include <ddk/ntifs.h>
 #include <ntos/types.h>
+#include <ntos/zwtypes.h>
 #include <napi/teb.h>

#ifdef __cplusplus
  _____

Modified: trunk/reactos/include/ntos/fstypes.h
--- trunk/reactos/include/ntos/fstypes.h	2005-06-19 03:55:48 UTC
(rev 16073)
+++ trunk/reactos/include/ntos/fstypes.h	2005-06-19 04:49:14 UTC
(rev 16074)
@@ -24,4 +24,25 @@

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 */
  _____

Modified: trunk/reactos/include/ntos/krnltypes.h
--- trunk/reactos/include/ntos/krnltypes.h	2005-06-19 03:55:48 UTC
(rev 16073)
+++ trunk/reactos/include/ntos/krnltypes.h	2005-06-19 04:49:14 UTC
(rev 16074)
@@ -14,50 +14,6 @@

extern POBJECT_TYPE EXPORTED ExMutantObjectType;
 extern POBJECT_TYPE EXPORTED ExTimerType;

-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;
-
-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;
-
 /*
  * PURPOSE: Special timer associated with each device
  */
  _____

Modified: trunk/reactos/include/ntos/zwtypes.h
--- trunk/reactos/include/ntos/zwtypes.h	2005-06-19 03:55:48 UTC
(rev 16073)
+++ trunk/reactos/include/ntos/zwtypes.h	2005-06-19 04:49:14 UTC
(rev 16074)
@@ -1120,13 +1120,6 @@

} 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,7 +1173,31 @@
 #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

#define EVENT_READ_ACCESS			1
  _____

Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h
--- trunk/reactos/lib/fslib/vfatlib/vfatlib.h	2005-06-19 03:55:48 UTC
(rev 16073)
+++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h	2005-06-19 04:49:14 UTC
(rev 16074)
@@ -8,6 +8,7 @@

#define NTOS_MODE_USER
 #include <ntos.h>
 #include <fslib/vfatlib.h>
+#include <ddk/ntdddisk.h>

#define SECTORSIZE 512

_____

Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h
--- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h	2005-06-19 03:55:48 UTC
(rev 16073)
+++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h	2005-06-19 04:49:14 UTC
(rev 16074)
@@ -8,6 +8,7 @@

#define NTOS_MODE_USER
 #include <ntos.h>
 #include <fslib/vfatlib.h>
+#include <ddk/ntdddisk.h>

typedef struct _FATX_BOOT_SECTOR
 {
  _____

Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h
--- trunk/reactos/ntoskrnl/include/internal/i386/ke.h	2005-06-19
03:55:48 UTC (rev 16073)
+++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h	2005-06-19
04:49:14 UTC (rev 16074)
@@ -201,6 +201,7 @@

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 @@
                 PVOID StartContext,
                 BOOLEAN UserThread,
                 KTRAP_FRAME TrapFrame);
+#endif

#ifdef CONFIG_SMP
 #define LOCK "lock ; "
  _____

Modified: trunk/reactos/subsys/system/usetup/bootsup.c
--- trunk/reactos/subsys/system/usetup/bootsup.c	2005-06-19
03:55:48 UTC (rev 16073)
+++ trunk/reactos/subsys/system/usetup/bootsup.c	2005-06-19
04:49:14 UTC (rev 16074)
@@ -26,6 +26,7 @@

#include "precomp.h"
 #include <ntdll/rtl.h>
+#include <ddk/ntdddisk.h> /* FIXME: NDK */

#include "usetup.h"
 #include "inicache.h"
  _____

Modified: trunk/reactos/subsys/system/usetup/partlist.c
--- trunk/reactos/subsys/system/usetup/partlist.c	2005-06-19
03:55:48 UTC (rev 16073)
+++ trunk/reactos/subsys/system/usetup/partlist.c	2005-06-19
04:49:14 UTC (rev 16074)
@@ -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>

_____

Modified: trunk/reactos/subsys/system/usetup/usetup.c
--- trunk/reactos/subsys/system/usetup/usetup.c	2005-06-19 03:55:48 UTC
(rev 16073)
+++ trunk/reactos/subsys/system/usetup/usetup.c	2005-06-19 04:49:14 UTC
(rev 16074)
@@ -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>