- Small NDK headers update

svn path=/trunk/; revision=28483

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)
 

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

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

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;
 

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;
 
 //

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;
 

reactos/ntoskrnl/include/ntoskrnl.h

@@ -15,6 +15,7 @@
 
 /* DDK/IFS/NDK Headers */
 #ifdef _MSC_VER
+#include <excpt.h>
 #include <ntdef.h>
 #undef DECLSPEC_IMPORT
 #define DECLSPEC_IMPORT