From d88b419c3a990953cf795eb0f7a66547ab51a3d8 Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Thu, 23 Aug 2007 19:20:28 +0000 Subject: [PATCH] - Small NDK headers update svn path=/trunk/; revision=28483 --- reactos/include/ddk/winddk.h | 16 ++++++++++++++++ reactos/include/ndk/cmfuncs.h | 16 ++++++++-------- reactos/include/ndk/halfuncs.h | 2 -- reactos/include/ndk/mmtypes.h | 26 ++++++++++++++++---------- reactos/include/reactos/arc/arc.h | 2 +- reactos/ntoskrnl/cm/ntfunc.c | 4 ++-- reactos/ntoskrnl/include/ntoskrnl.h | 1 + 7 files changed, 44 insertions(+), 23 deletions(-) diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h index e154e326f5e..7d10216dcee 100644 --- a/reactos/include/ddk/winddk.h +++ b/reactos/include/ddk/winddk.h @@ -1355,6 +1355,8 @@ typedef enum _TIMER_TYPE { #define IO_VIDEO_INCREMENT 1 #define SEMAPHORE_INCREMENT 1 +#define MM_MAXIMUM_DISK_IO_SIZE (0x10000) + typedef struct _IRP { CSHORT Type; USHORT Size; @@ -4740,6 +4742,11 @@ typedef enum _LOCK_OPERATION { IoModifyAccess } LOCK_OPERATION; +typedef ULONG PFN_COUNT; + +typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; + typedef enum _MM_SYSTEM_SIZE { MmSmallSystem, MmMediumSystem, @@ -5274,6 +5281,12 @@ typedef struct _KPCR { ULONG StallScaleFactor; /* 4C */ UCHAR SpareUnused; /* 50 */ UCHAR Number; /* 51 */ + UCHAR Spare0; + UCHAR SecondLevelCacheAssociativity; + ULONG VdmAlert; + ULONG KernelReserved[14]; // For use by the kernel + ULONG SecondLevelCacheSize; + ULONG HalReserved[16]; // For use by Hal } KPCR, *PKPCR; /* 54 */ typedef struct _KFLOATING_SAVE { @@ -5334,6 +5347,9 @@ extern NTKERNELAPI ULONG_PTR MmUserProbeAddress; #define MM_LOWEST_USER_ADDRESS (PVOID)0x10000 #define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xC0C00000 +#define MM_KSEG0_BASE MM_SYSTEM_RANGE_START +#define MM_SYSTEM_SPACE_END 0xFFFFFFFF + #define KI_USER_SHARED_DATA 0xffdf0000 #define SharedUserData ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA) diff --git a/reactos/include/ndk/cmfuncs.h b/reactos/include/ndk/cmfuncs.h index 0d2f33369e9..2232292f25f 100644 --- a/reactos/include/ndk/cmfuncs.h +++ b/reactos/include/ndk/cmfuncs.h @@ -113,7 +113,7 @@ NTSYSCALLAPI NTSTATUS NTAPI NtInitializeRegistry( - BOOLEAN SetUpBoot + USHORT Flag ); NTSYSCALLAPI @@ -417,13 +417,6 @@ ZwGetPlugPlayEvent( IN ULONG BufferSize ); -NTSYSAPI -NTSTATUS -NTAPI -ZwInitializeRegistry( - BOOLEAN SetUpBoot -); - NTSYSAPI NTSTATUS NTAPI @@ -568,6 +561,13 @@ ZwSetValueKey( ); #endif +NTSYSAPI +NTSTATUS +NTAPI +ZwInitializeRegistry( + USHORT Flag +); + NTSYSAPI NTSTATUS NTAPI diff --git a/reactos/include/ndk/halfuncs.h b/reactos/include/ndk/halfuncs.h index 1c7ffa1e442..23ff47e993a 100644 --- a/reactos/include/ndk/halfuncs.h +++ b/reactos/include/ndk/halfuncs.h @@ -55,8 +55,6 @@ Author: // The DDK steals these away from you. // #ifdef _MSC_VER -void _enable(void); -void _disable(void); #pragma intrinsic(_enable) #pragma intrinsic(_disable) #endif diff --git a/reactos/include/ndk/mmtypes.h b/reactos/include/ndk/mmtypes.h index 2ba0a5df6dd..a2695e2de98 100644 --- a/reactos/include/ndk/mmtypes.h +++ b/reactos/include/ndk/mmtypes.h @@ -244,7 +244,7 @@ typedef struct _MMPTE MMPTE_TRANSITION Trans; MMPTE_SUBSECTION Subsect; MMPTE_LIST List; - }; + } u; } MMPTE, *PMMPTE; // @@ -430,6 +430,7 @@ typedef struct _SUBSECTION MMSUBSECTION_FLAGS SubsectionFlags; } u; ULONG StartingSector; + ULONG NumberOfFullSectors; PMMPTE SubsectionBase; ULONG UnusedPtes; ULONG PtesInSubsection; @@ -578,8 +579,10 @@ typedef struct _MMSUPPORT_FLAGS // typedef struct _MMSUPPORT { -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_WS03) LIST_ENTRY WorkingSetExpansionLinks; +#endif +#if (NTDDI_VERSION >= NTDDI_LONGHORN) USHORT LastTrimpStamp; USHORT NextPageColor; #else @@ -591,12 +594,12 @@ typedef struct _MMSUPPORT #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG Spare0; #else - ULONG WorkingSetSize; + ULONG GrowthSinceLastEstimate; #endif ULONG MinimumWorkingSetSize; ULONG MaximumWorkingSetSize; - PMMWSL MmWorkingSetList; -#if (NTDDI_VERSION < NTDDI_LONGHORN) + PMMWSL VmWorkingSetList; +#if (NTDDI_VERSION < NTDDI_WS03) LIST_ENTRY WorkingSetExpansionLinks; #endif ULONG Claim; @@ -604,15 +607,18 @@ typedef struct _MMSUPPORT ULONG Spare; ULONG WorkingSetPrivateSize; ULONG WorkingSetSizeOverhead; - ULONG WorkingSetSize; - PKEVENT ExitEvent; - EX_PUSH_LOCK WorkingSetMutex; - PVOID AccessLog; #else ULONG NextEstimationSlot; ULONG NextAgingSlot; ULONG EstimatedAvailable; - ULONG GrowthSinceLastEstimate; +#endif + ULONG WorkingSetSize; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PKEVENT ExitEvent; +#endif + EX_PUSH_LOCK WorkingSetMutex; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID AccessLog; #endif } MMSUPPORT, *PMMSUPPORT; diff --git a/reactos/include/reactos/arc/arc.h b/reactos/include/reactos/arc/arc.h index 72a8afb3386..a6d81200b97 100644 --- a/reactos/include/reactos/arc/arc.h +++ b/reactos/include/reactos/arc/arc.h @@ -315,7 +315,7 @@ typedef struct _I386_LOADER_BLOCK { PVOID CommonDataArea; ULONG MachineType; - ULONG Reserved; + ULONG VirtualBias; } I386_LOADER_BLOCK, *PI386_LOADER_BLOCK; // diff --git a/reactos/ntoskrnl/cm/ntfunc.c b/reactos/ntoskrnl/cm/ntfunc.c index 1f4f08814fe..99fded25c7f 100644 --- a/reactos/ntoskrnl/cm/ntfunc.c +++ b/reactos/ntoskrnl/cm/ntfunc.c @@ -661,7 +661,7 @@ NtLoadKey2 (IN POBJECT_ATTRIBUTES KeyObjectAttributes, NTSTATUS NTAPI -NtInitializeRegistry (IN BOOLEAN SetUpBoot) +NtInitializeRegistry (IN USHORT Flag) { NTSTATUS Status; @@ -673,7 +673,7 @@ NtInitializeRegistry (IN BOOLEAN SetUpBoot) /* Save boot log file */ IopSaveBootLogToFile(); - Status = CmiInitHives (SetUpBoot); + Status = CmiInitHives (Flag); CmiRegistryInitialized = TRUE; diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h index 709ed1fda7c..775f99300eb 100644 --- a/reactos/ntoskrnl/include/ntoskrnl.h +++ b/reactos/ntoskrnl/include/ntoskrnl.h @@ -15,6 +15,7 @@ /* DDK/IFS/NDK Headers */ #ifdef _MSC_VER +#include #include #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT