From a6c04adbb25e617479f4440d1c2acbccc2d59edb Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Sun, 19 Jun 2005 04:49:14 +0000 Subject: [PATCH] Fix building issues caused by previous patch svn path=/trunk/; revision=16074 --- .../boot/freeldr/freeldr/reactos/reactos.c | 1 - reactos/drivers/fs/ms/create.c | 1 + reactos/drivers/fs/np/create.c | 1 + reactos/hal/halx86/xbox/part_xbox.c | 2 +- reactos/include/ntdll/rtl.h | 1 + reactos/include/ntos/fstypes.h | 21 +++++++++ reactos/include/ntos/krnltypes.h | 44 ------------------- reactos/include/ntos/zwtypes.h | 31 ++++++++++--- reactos/lib/fslib/vfatlib/vfatlib.h | 1 + reactos/lib/fslib/vfatxlib/vfatxlib.h | 1 + reactos/ntoskrnl/include/internal/i386/ke.h | 2 + reactos/subsys/system/usetup/bootsup.c | 1 + reactos/subsys/system/usetup/partlist.c | 3 +- reactos/subsys/system/usetup/usetup.c | 1 + 14 files changed, 57 insertions(+), 54 deletions(-) diff --git a/reactos/boot/freeldr/freeldr/reactos/reactos.c b/reactos/boot/freeldr/freeldr/reactos/reactos.c index 7180945b8ea..a3512e4d949 100644 --- a/reactos/boot/freeldr/freeldr/reactos/reactos.c +++ b/reactos/boot/freeldr/freeldr/reactos/reactos.c @@ -7,7 +7,6 @@ */ #include -#include #include #include "registry.h" diff --git a/reactos/drivers/fs/ms/create.c b/reactos/drivers/fs/ms/create.c index 85bf9d5bdc7..c35aeacc579 100644 --- a/reactos/drivers/fs/ms/create.c +++ b/reactos/drivers/fs/ms/create.c @@ -10,6 +10,7 @@ /* INCLUDES ******************************************************************/ #include +#include /* 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 68f711ee807..5a2b7b5306a 100644 --- a/reactos/drivers/fs/np/create.c +++ b/reactos/drivers/fs/np/create.c @@ -10,6 +10,7 @@ /* INCLUDES ******************************************************************/ #include +#include /* 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 cb34d825ede..a1b6ad1f860 100644 --- a/reactos/hal/halx86/xbox/part_xbox.c +++ b/reactos/hal/halx86/xbox/part_xbox.c @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ -#include +#include #include #include "halxbox.h" diff --git a/reactos/include/ntdll/rtl.h b/reactos/include/ntdll/rtl.h index 775e3d1c10f..3e5c34784cd 100644 --- a/reactos/include/ntdll/rtl.h +++ b/reactos/include/ntdll/rtl.h @@ -7,6 +7,7 @@ #include #include +#include #include #ifdef __cplusplus diff --git a/reactos/include/ntos/fstypes.h b/reactos/include/ntos/fstypes.h index 4bf6a45fb53..d468befec6d 100644 --- 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 4b9060a8782..fdd208b679e 100644 --- a/reactos/include/ntos/krnltypes.h +++ b/reactos/include/ntos/krnltypes.h @@ -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 */ diff --git a/reactos/include/ntos/zwtypes.h b/reactos/include/ntos/zwtypes.h index e675224f8ff..e166f72b46c 100755 --- 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 -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 fd886684907..39138dba1fc 100755 --- a/reactos/lib/fslib/vfatlib/vfatlib.h +++ b/reactos/lib/fslib/vfatlib/vfatlib.h @@ -8,6 +8,7 @@ #define NTOS_MODE_USER #include #include +#include #define SECTORSIZE 512 diff --git a/reactos/lib/fslib/vfatxlib/vfatxlib.h b/reactos/lib/fslib/vfatxlib/vfatxlib.h index 3ac90c7c800..33eaa343b75 100644 --- a/reactos/lib/fslib/vfatxlib/vfatxlib.h +++ b/reactos/lib/fslib/vfatxlib/vfatxlib.h @@ -8,6 +8,7 @@ #define NTOS_MODE_USER #include #include +#include typedef struct _FATX_BOOT_SECTOR { diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h index ccd691e107e..1d79b32dd42 100644 --- 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 b1216d06c9d..93de053060f 100644 --- a/reactos/subsys/system/usetup/bootsup.c +++ b/reactos/subsys/system/usetup/bootsup.c @@ -26,6 +26,7 @@ #include "precomp.h" #include +#include /* 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 df7df12ab5b..dc56b76d24b 100644 --- a/reactos/subsys/system/usetup/partlist.c +++ b/reactos/subsys/system/usetup/partlist.c @@ -26,7 +26,8 @@ */ #include "precomp.h" -#include +#include /* FIXME: NDK */ +#include /* FIXME: NDK */ #include diff --git a/reactos/subsys/system/usetup/usetup.c b/reactos/subsys/system/usetup/usetup.c index f1569521d13..a9c7f6ead14 100644 --- a/reactos/subsys/system/usetup/usetup.c +++ b/reactos/subsys/system/usetup/usetup.c @@ -28,6 +28,7 @@ #include "precomp.h" #include +#include /* FIXME: NDK */ #include #include