[ros-diffs] [fireball] 28483: - Small NDK headers update

Author: fireball
Date: Thu Aug 23 23:20:28 2007
New Revision: 28483

URL: http://svn.reactos.org/svn/reactos?rev=28483&view=rev
Log:
- Small NDK headers update

Modified:
    trunk/reactos/include/ddk/winddk.h
    trunk/reactos/include/ndk/cmfuncs.h
    trunk/reactos/include/ndk/halfuncs.h
    trunk/reactos/include/ndk/mmtypes.h
    trunk/reactos/include/reactos/arc/arc.h
    trunk/reactos/ntoskrnl/cm/ntfunc.c
    trunk/reactos/ntoskrnl/include/ntoskrnl.h

Modified: trunk/reactos/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2…
==============================================================================
--- trunk/reactos/include/ddk/winddk.h (original)
+++ trunk/reactos/include/ddk/winddk.h Thu Aug 23 23:20:28 2007
@@ -1354,6 +1354,8 @@
 #define IO_SOUND_INCREMENT                8
 #define IO_VIDEO_INCREMENT                1
 #define SEMAPHORE_INCREMENT               1
+
+#define MM_MAXIMUM_DISK_IO_SIZE          (0x10000)
 
 typedef struct _IRP {
   CSHORT  Type;
@@ -4740,6 +4742,11 @@
   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 @@
   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 {
@@ -5333,6 +5346,9 @@
 #define MM_USER_PROBE_ADDRESS             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)

Modified: trunk/reactos/include/ndk/cmfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmfuncs.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/cmfuncs.h (original)
+++ trunk/reactos/include/ndk/cmfuncs.h Thu Aug 23 23:20:28 2007
@@ -113,7 +113,7 @@
 NTSTATUS
 NTAPI
 NtInitializeRegistry(
-    BOOLEAN SetUpBoot
+    USHORT Flag
 );
 
 NTSYSCALLAPI
@@ -420,13 +420,6 @@
 NTSYSAPI
 NTSTATUS
 NTAPI
-ZwInitializeRegistry(
-    BOOLEAN SetUpBoot
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
 ZwLoadKey(
     IN POBJECT_ATTRIBUTES KeyObjectAttributes,
     IN POBJECT_ATTRIBUTES FileObjectAttributes
@@ -571,6 +564,13 @@
 NTSYSAPI
 NTSTATUS
 NTAPI
+ZwInitializeRegistry(
+    USHORT Flag
+);
+
+NTSYSAPI
+NTSTATUS
+NTAPI
 ZwUnloadKey(
     IN POBJECT_ATTRIBUTES KeyObjectAttributes
 );

Modified: trunk/reactos/include/ndk/halfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/halfuncs.h (original)
+++ trunk/reactos/include/ndk/halfuncs.h Thu Aug 23 23:20:28 2007
@@ -55,8 +55,6 @@
 // The DDK steals these away from you.
 //
 #ifdef _MSC_VER
-void _enable(void);
-void _disable(void);
 #pragma intrinsic(_enable)
 #pragma intrinsic(_disable)
 #endif

Modified: trunk/reactos/include/ndk/mmtypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/mmtypes.h (original)
+++ trunk/reactos/include/ndk/mmtypes.h Thu Aug 23 23:20:28 2007
@@ -244,7 +244,7 @@
         MMPTE_TRANSITION Trans;
         MMPTE_SUBSECTION Subsect;
         MMPTE_LIST List;
-    };
+    } u;
 } MMPTE, *PMMPTE;
 
 //
@@ -430,6 +430,7 @@
         MMSUBSECTION_FLAGS SubsectionFlags;
     } u;
     ULONG StartingSector;
+    ULONG NumberOfFullSectors;
     PMMPTE SubsectionBase;
     ULONG UnusedPtes;
     ULONG PtesInSubsection;
@@ -578,8 +579,10 @@
 //
 typedef struct _MMSUPPORT
 {
+#if (NTDDI_VERSION >= NTDDI_WS03)
+    LIST_ENTRY WorkingSetExpansionLinks;
+#endif
 #if (NTDDI_VERSION >= NTDDI_LONGHORN)
-    LIST_ENTRY WorkingSetExpansionLinks;
     USHORT LastTrimpStamp;
     USHORT NextPageColor;
 #else
@@ -591,12 +594,12 @@
 #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 @@
     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;
 

Modified: trunk/reactos/include/reactos/arc/arc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?…
==============================================================================
--- trunk/reactos/include/reactos/arc/arc.h (original)
+++ trunk/reactos/include/reactos/arc/arc.h Thu Aug 23 23:20:28 2007
@@ -315,7 +315,7 @@
 {
     PVOID CommonDataArea;
     ULONG MachineType;
-    ULONG Reserved;
+    ULONG VirtualBias;
 } I386_LOADER_BLOCK, *PI386_LOADER_BLOCK;
 
 //

Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2…
==============================================================================
--- trunk/reactos/ntoskrnl/cm/ntfunc.c (original)
+++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu Aug 23 23:20:28 2007
@@ -661,7 +661,7 @@
 
 NTSTATUS
 NTAPI
-NtInitializeRegistry (IN BOOLEAN SetUpBoot)
+NtInitializeRegistry (IN USHORT Flag)
 {
     NTSTATUS Status;
 
@@ -673,7 +673,7 @@
     /* Save boot log file */
     IopSaveBootLogToFile();
 
-    Status = CmiInitHives (SetUpBoot);
+    Status = CmiInitHives (Flag);
 
     CmiRegistryInitialized = TRUE;
 

Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.…
==============================================================================
--- trunk/reactos/ntoskrnl/include/ntoskrnl.h (original)
+++ trunk/reactos/ntoskrnl/include/ntoskrnl.h Thu Aug 23 23:20:28 2007
@@ -15,6 +15,7 @@
 
 /* DDK/IFS/NDK Headers */
 #ifdef _MSC_VER
+#include <excpt.h>
 #include <ntdef.h>
 #undef DECLSPEC_IMPORT
 #define DECLSPEC_IMPORT