Fix some wrong Mm definitions and sync up with proper ones.

svn path=/trunk/; revision=12714

reactos/include/ddk/defines.h

@@ -17,20 +17,6 @@
  */
 #define NR_PRIORITY_LEVELS (32)
 
-/*
- * Types of memory to allocate
- */
-enum
-{
-   NonPagedPool,
-   PagedPool,
-   NonPagedPoolMustSucceed,
-   NonPagedPoolCacheAligned = 4,
-   PagedPoolCacheAligned,
-   NonPagedPoolCacheAlignedMustS,
-};
-
-
 /*
  * PURPOSE: Object attributes
  */

reactos/include/ddk/extypes.h

@@ -5,6 +5,24 @@
 
 typedef ULONG INTERLOCKED_RESULT;
 
+typedef enum _POOL_TYPE {
+    NonPagedPool,
+    PagedPool,
+    NonPagedPoolMustSucceed,
+    DontUseThisType,
+    NonPagedPoolCacheAligned,
+    PagedPoolCacheAligned,
+    NonPagedPoolCacheAlignedMustS,
+    MaxPoolType,
+    NonPagedPoolSession = 32,
+    PagedPoolSession,
+    NonPagedPoolMustSucceedSession,
+    DontUseThisTypeSession,
+    NonPagedPoolCacheAlignedSession,
+    PagedPoolCacheAlignedSession,
+    NonPagedPoolCacheAlignedMustSSession
+} POOL_TYPE;
+
 typedef enum _WORK_QUEUE_TYPE {
     CriticalWorkQueue,
     DelayedWorkQueue,

reactos/include/ddk/mmfuncs.h

@@ -1,14 +1,14 @@
 #ifndef _INCLUDE_DDK_MMFUNCS_H
 #define _INCLUDE_DDK_MMFUNCS_H
-/* $Id: mmfuncs.h,v 1.24 2004/10/22 20:51:44 ekohl Exp $ */
+/* $Id$ */
 /* MEMORY MANAGMENT ******************************************************/
 
 
 #ifdef __NTOSKRNL__
-extern PVOID EXPORTED MmUserProbeAddress;
+extern ULONG EXPORTED MmUserProbeAddress;
 extern PVOID EXPORTED MmHighestUserAddress;
 #else
-extern PVOID IMPORTED MmUserProbeAddress;
+extern ULONG IMPORTED MmUserProbeAddress;
 extern PVOID IMPORTED MmHighestUserAddress;
 #endif
 
@@ -632,8 +632,8 @@ MmSecureVirtualMemory (
 BOOLEAN
 STDCALL
 MmSetAddressRangeModified (
-	DWORD	Unknown0,
-	DWORD	Unknown1
+    IN PVOID    Address,
+    IN ULONG    Length
 	);
 NTSTATUS
 STDCALL

reactos/include/ddk/mmtypes.h

@@ -1,4 +1,4 @@
-/* $Id: mmtypes.h,v 1.21 2004/12/22 05:06:59 royce Exp $ */
+/* $Id$ */
 
 #ifndef _INCLUDE_DDK_MMTYPES_H
 #define _INCLUDE_DDK_MMTYPES_H
@@ -48,6 +48,11 @@
 #define   MDL_ALLOCATED_MUST_SUCCEED   (0x4000)
 #define   MDL_64_BIT_VA                (0x8000)
 
+typedef enum _MM_PAGE_PRIORITY {
+  LowPagePriority,
+  NormalPagePriority = 16,
+  HighPagePriority = 32
+} MM_PAGE_PRIORITY;
 
 typedef struct _MDL
 /*

reactos/include/ddk/ntddk.h

@@ -1,4 +1,4 @@
-/* $Id: ntddk.h,v 1.38 2003/12/30 17:39:38 fireball Exp $
+/* $Id$
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -62,8 +62,8 @@ extern "C" {
 #include <ddk/mmtypes.h>
 #include <ddk/potypes.h>
 #include <ddk/pnptypes.h>
-#include <ddk/iotypes.h>
 #include <ddk/extypes.h>
+#include <ddk/iotypes.h>
 #include <ddk/pstypes.h>
 #include <ntos/ldrtypes.h>
 #include <ntos/zwtypes.h>

reactos/include/ddk/types.h

@@ -12,7 +12,6 @@ typedef CCHAR KPROCESSOR_MODE;
 typedef UCHAR KIRQL;
 typedef KIRQL* PKIRQL;
 typedef ULONG IO_ALLOCATION_ACTION;
-typedef ULONG POOL_TYPE;
 typedef ULONG TIMER_TYPE;
 typedef ULONG MM_SYSTEM_SIZE;
 typedef ULONG LOCK_OPERATION;