From b8a53161844c84e494adbe1533606da029fe0bc4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Wed, 30 Jul 2014 13:11:55 +0000 Subject: [PATCH 1/1] [NDK] - Make the MMWSLE structure multi-arch aware svn path=/trunk/; revision=63784 --- reactos/include/ndk/amd64/mmtypes.h | 1 + reactos/include/ndk/arm/mmtypes.h | 1 + reactos/include/ndk/i386/mmtypes.h | 1 + reactos/include/ndk/mmtypes.h | 18 +++++++++--------- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/reactos/include/ndk/amd64/mmtypes.h b/reactos/include/ndk/amd64/mmtypes.h index 3efe0a375d7..eb28217910a 100644 --- 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 MM_PAGE_FRAME_NUMBER_SIZE 52 // // Address of the shared user page diff --git a/reactos/include/ndk/arm/mmtypes.h b/reactos/include/ndk/arm/mmtypes.h index 7cc90094696..56fac23c556 100644 --- 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 MM_PAGE_FRAME_NUMBER_SIZE 20 // // Sanity checks for Paging Macros diff --git a/reactos/include/ndk/i386/mmtypes.h b/reactos/include/ndk/i386/mmtypes.h index 4ce7c4e9a74..cd8185c1cd8 100644 --- 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 MM_PAGE_FRAME_NUMBER_SIZE 20 // // Address of the shared user page diff --git a/reactos/include/ndk/mmtypes.h b/reactos/include/ndk/mmtypes.h index 4c27911eda7..25dfabccdd8 100644 --- a/reactos/include/ndk/mmtypes.h +++ b/reactos/include/ndk/mmtypes.h @@ -842,14 +842,14 @@ typedef struct _SECTION // 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 @@ -857,7 +857,7 @@ typedef struct _MMWSLE union { PVOID VirtualAddress; - ULONG Long; + ULONG_PTR Long; MMWSLENTRY e1; } u1; } MMWSLE, *PMMWSLE; -- 2.17.1