mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
Fix building issues caused by previous patch
svn path=/trunk/; revision=16074
This commit is contained in:
parent
cbe3dc72cb
commit
a6c04adbb2
14 changed files with 57 additions and 54 deletions
|
@ -7,7 +7,6 @@
|
|||
*/
|
||||
|
||||
#include <freeldr.h>
|
||||
#include <internal/i386/ke.h>
|
||||
#include <reactos/rossym.h>
|
||||
|
||||
#include "registry.h"
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
/* INCLUDES ******************************************************************/
|
||||
|
||||
#include <ntifs.h>
|
||||
#include <ntos/fstypes.h> /* FIXME: NDK */
|
||||
/* FIXME: The headers are broken! */
|
||||
#undef CreateMailslot
|
||||
#include "msfs.h"
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
/* INCLUDES ******************************************************************/
|
||||
|
||||
#include <ntifs.h>
|
||||
#include <ntos/fstypes.h> /* FIXME: NDK */
|
||||
#include "npfs.h"
|
||||
|
||||
#define NDEBUG
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
/* INCLUDES *****************************************************************/
|
||||
|
||||
#include <ddk/ntddk.h>
|
||||
#include <ddk/ntdddisk.h>
|
||||
#include <hal.h>
|
||||
#include "halxbox.h"
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
#include <ddk/ntifs.h>
|
||||
#include <ntos/types.h>
|
||||
#include <ntos/zwtypes.h>
|
||||
#include <napi/teb.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#define NTOS_MODE_USER
|
||||
#include <ntos.h>
|
||||
#include <fslib/vfatlib.h>
|
||||
#include <ddk/ntdddisk.h>
|
||||
|
||||
#define SECTORSIZE 512
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#define NTOS_MODE_USER
|
||||
#include <ntos.h>
|
||||
#include <fslib/vfatlib.h>
|
||||
#include <ddk/ntdddisk.h>
|
||||
|
||||
typedef struct _FATX_BOOT_SECTOR
|
||||
{
|
||||
|
|
|
@ -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 ; "
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include "precomp.h"
|
||||
#include <ntdll/rtl.h>
|
||||
#include <ddk/ntdddisk.h> /* FIXME: NDK */
|
||||
|
||||
#include "usetup.h"
|
||||
#include "inicache.h"
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue