[NDK]

 - Make the MMWSLE structure multi-arch aware

svn path=/trunk/; revision=63784

diff --git a/reactos/include/ndk/amd64/mmtypes.h b/reactos/include/ndk/amd64/mmtypes.h
index 3efe0a3..eb28217 100644 (file)
--- a/reactos/include/ndk/amd64/mmtypes.h
+++ b/reactos/include/ndk/amd64/mmtypes.h
@@ -35,6 +35,7 @@ extern "C" {
 #define PAGE_SHIFT                        12L
 #define MM_ALLOCATION_GRANULARITY         0x10000
 #define MM_ALLOCATION_GRANULARITY_SHIFT   16L
 #define PAGE_SHIFT                        12L
 #define MM_ALLOCATION_GRANULARITY         0x10000
 #define MM_ALLOCATION_GRANULARITY_SHIFT   16L

+#define MM_PAGE_FRAME_NUMBER_SIZE         52

 
 //
 // Address of the shared user page
 
 //
 // Address of the shared user page

diff --git a/reactos/include/ndk/arm/mmtypes.h b/reactos/include/ndk/arm/mmtypes.h
index 7cc9009..56fac23 100644 (file)
--- a/reactos/include/ndk/arm/mmtypes.h
+++ b/reactos/include/ndk/arm/mmtypes.h
@@ -36,6 +36,7 @@ extern "C" {
 #define PAGE_SHIFT                        12L
 #define MM_ALLOCATION_GRANULARITY         0x10000
 #define MM_ALLOCATION_GRANULARITY_SHIFT   16L
 #define PAGE_SHIFT                        12L
 #define MM_ALLOCATION_GRANULARITY         0x10000
 #define MM_ALLOCATION_GRANULARITY_SHIFT   16L

+#define MM_PAGE_FRAME_NUMBER_SIZE         20

 
 //
 // Sanity checks for Paging Macros
 
 //
 // Sanity checks for Paging Macros

diff --git a/reactos/include/ndk/i386/mmtypes.h b/reactos/include/ndk/i386/mmtypes.h
index 4ce7c4e..cd8185c 100644 (file)
--- a/reactos/include/ndk/i386/mmtypes.h
+++ b/reactos/include/ndk/i386/mmtypes.h
@@ -34,6 +34,7 @@ extern "C" {
 #define PAGE_SHIFT                        12L
 #define MM_ALLOCATION_GRANULARITY         0x10000
 #define MM_ALLOCATION_GRANULARITY_SHIFT   16L
 #define PAGE_SHIFT                        12L
 #define MM_ALLOCATION_GRANULARITY         0x10000
 #define MM_ALLOCATION_GRANULARITY_SHIFT   16L

+#define MM_PAGE_FRAME_NUMBER_SIZE         20

 
 //
 // Address of the shared user page
 
 //
 // Address of the shared user page

diff --git a/reactos/include/ndk/mmtypes.h b/reactos/include/ndk/mmtypes.h
index 4c27911..25dfabc 100644 (file)
--- a/reactos/include/ndk/mmtypes.h
+++ b/reactos/include/ndk/mmtypes.h
@@ -842,14 +842,14 @@ typedef struct _SECTION
 //
 typedef struct _MMWSLENTRY
 {
 //
 typedef struct _MMWSLENTRY
 {

-    ULONG Valid:1;
-    ULONG LockedInWs:1;
-    ULONG LockedInMemory:1;
-    ULONG Protection:5;
-    ULONG Hashed:1;
-    ULONG Direct:1;
-    ULONG Age:2;
-    ULONG VirtualPageNumber:20;
+    ULONG_PTR Valid:1;
+    ULONG_PTR LockedInWs:1;
+    ULONG_PTR LockedInMemory:1;
+    ULONG_PTR Protection:5;
+    ULONG_PTR Hashed:1;
+    ULONG_PTR Direct:1;
+    ULONG_PTR Age:2;
+    ULONG_PTR VirtualPageNumber: MM_PAGE_FRAME_NUMBER_SIZE;

 } MMWSLENTRY, *PMMWSLENTRY;
 
 typedef struct _MMWSLE
 } MMWSLENTRY, *PMMWSLENTRY;
 
 typedef struct _MMWSLE


@@ -857,7 +857,7 @@ typedef struct _MMWSLE
     union
     {
         PVOID VirtualAddress;
     union
     {
         PVOID VirtualAddress;

-        ULONG Long;
+        ULONG_PTR Long;

         MMWSLENTRY e1;
     } u1;
 } MMWSLE, *PMMWSLE;
         MMWSLENTRY e1;
     } u1;
 } MMWSLE, *PMMWSLE;