[ros-diffs] [tkreuzer] 44257: PFN_TYPE -> PFN_NUMBER

Author: tkreuzer
Date: Sat Nov 21 16:43:26 2009
New Revision: 44257

URL: http://svn.reactos.org/svn/reactos?rev=44257&view=rev
Log:
PFN_TYPE -> PFN_NUMBER

Modified:
    branches/ros-amd64-bringup/reactos/ntoskrnl/cc/copy.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/cc/view.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/arm/stubs.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/i386/page.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/i386/pagepae.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmfault.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/powerpc/page.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/cc/copy.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Nov 21 16:43:26
2009
@@ -15,7 +15,7 @@
 
 /* GLOBALS *******************************************************************/
 
-static PFN_TYPE CcZeroPage = 0;
+static PFN_NUMBER CcZeroPage = 0;
 
 #define MAX_ZERO_LENGTH	(256 * 1024)
 #define MAX_RW_LENGTH	(256 * 1024)
@@ -98,7 +98,7 @@
 	  PCACHE_SEGMENT current2;
 	  ULONG current_size;
 	  ULONG i;
-	  PPFN_TYPE MdlPages;
+	  PPFN_NUMBER MdlPages;
 
 	  /*
 	   * Count the maximum number of bytes we could read starting
@@ -119,7 +119,7 @@
 	  Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ);
 	  current2 = current;
 	  current_size = 0;
-	  MdlPages = (PPFN_TYPE)(Mdl + 1);
+	  MdlPages = (PPFN_NUMBER)(Mdl + 1);
 	  while (current2 != NULL && !current2->Valid && current_size <
MAX_RW_LENGTH)
 	    {
 	      PVOID address = current2->BaseAddress;
@@ -619,7 +619,7 @@
 	  Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ);
 	  for (i = 0; i < ((Mdl->Size - sizeof(MDL)) / sizeof(ULONG)); i++)
 	    {
-	      ((PPFN_TYPE)(Mdl + 1))[i] = CcZeroPage;
+	      ((PPFN_NUMBER)(Mdl + 1))[i] = CcZeroPage;
 	    }
           KeInitializeEvent(&Event, NotificationEvent, FALSE);
 	  Status = IoSynchronousPageWrite(FileObject, Mdl, &WriteOffset, &Event,
&Iosb);

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/cc/view.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Nov 21 16:43:26
2009
@@ -330,8 +330,8 @@
             KeReleaseGuardedMutex(&ViewLock);
             for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++)
             {
-                PFN_TYPE Page;
-                Page = (PFN_TYPE)(MmGetPhysicalAddress((char*)current->BaseAddress + i
* PAGE_SIZE).QuadPart >> PAGE_SHIFT);
+                PFN_NUMBER Page;
+                Page = (PFN_NUMBER)(MmGetPhysicalAddress((char*)current->BaseAddress +
i * PAGE_SIZE).QuadPart >> PAGE_SHIFT);
                 Status = MmPageOutPhysicalAddress(Page);
             }
             KeAcquireGuardedMutex(&ViewLock);
@@ -842,7 +842,7 @@
 #else
 static VOID
 CcFreeCachePage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
-		PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty)
+		PFN_NUMBER Page, SWAPENTRY SwapEntry, BOOLEAN Dirty)
 {
   ASSERT(SwapEntry == 0);
   if (Page != 0)
@@ -861,7 +861,7 @@
   ULONG i;
   ULONG RegionSize;
   ULONG Base;
-  PFN_TYPE Page;
+  PFN_NUMBER Page;
   KIRQL oldIrql;
 #endif
   DPRINT("Freeing cache segment 0x%p\n", CacheSeg);

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Nov
21 16:43:26 2009
@@ -54,7 +54,6 @@
 struct _MM_RMAP_ENTRY;
 struct _MM_PAGEOP;
 typedef ULONG SWAPENTRY;
-typedef ULONG PFN_TYPE, *PPFN_TYPE;
 
 //
 // MmDbgCopyMemory Flags
@@ -499,7 +498,7 @@
     PVOID Context,
     PMEMORY_AREA MemoryArea,
     PVOID Address,
-    PFN_TYPE Page,
+    PFN_NUMBER Page,
     SWAPENTRY SwapEntry,
     BOOLEAN Dirty
 );
@@ -721,7 +720,7 @@
 NTAPI
 MmBuildMdlFromPages(
     PMDL Mdl,
-    PULONG Pages
+    PPFN_NUMBER Pages
 );
 
 /* mminit.c ******************************************************************/
@@ -771,7 +770,7 @@
 NTAPI
 MmReadFromSwapPage(
     SWAPENTRY SwapEntry,
-    PFN_TYPE Page
+    PFN_NUMBER Page
 );
 
 BOOLEAN
@@ -782,7 +781,7 @@
 NTAPI
 MmWriteToSwapPage(
     SWAPENTRY SwapEntry,
-    PFN_TYPE Page
+    PFN_NUMBER Page
 );
 
 NTSTATUS
@@ -950,18 +949,18 @@
 
 PVOID
 NTAPI
-ExAllocatePageWithPhysPage(PFN_TYPE Page);
+ExAllocatePageWithPhysPage(PFN_NUMBER Page);
 
 NTSTATUS
 NTAPI
 MiCopyFromUserPage(
-    PFN_TYPE Page,
+    PFN_NUMBER Page,
     PVOID SourceAddress
 );
 
 NTSTATUS
 NTAPI
-MiZeroPage(PFN_TYPE Page);
+MiZeroPage(PFN_NUMBER Page);
 
 /* memsafe.s *****************************************************************/
 
@@ -1032,7 +1031,7 @@
 NTAPI
 MmReleasePageMemoryConsumer(
     ULONG Consumer,
-    PFN_TYPE Page
+    PFN_NUMBER Page
 );
 
 NTSTATUS
@@ -1040,7 +1039,7 @@
 MmRequestPageMemoryConsumer(
     ULONG Consumer,
     BOOLEAN MyWait,
-    PPFN_TYPE AllocatedPage
+    PPFN_NUMBER AllocatedPage
 );
 
 VOID
@@ -1056,18 +1055,18 @@
 VOID
 NTAPI
 MmSetRmapListHeadPage(
-    PFN_TYPE Page,
+    PFN_NUMBER Page,
     struct _MM_RMAP_ENTRY* ListHead
 );
 
 struct _MM_RMAP_ENTRY*
 NTAPI
-MmGetRmapListHeadPage(PFN_TYPE Page);
+MmGetRmapListHeadPage(PFN_NUMBER Page);
 
 VOID
 NTAPI
 MmInsertRmap(
-    PFN_TYPE Page,
+    PFN_NUMBER Page,
     struct _EPROCESS *Process,
     PVOID Address
 );
@@ -1075,7 +1074,7 @@
 VOID
 NTAPI
 MmDeleteAllRmaps(
-    PFN_TYPE Page,
+    PFN_NUMBER Page,
     PVOID Context,
     VOID (*DeleteMapping)(PVOID Context, struct _EPROCESS *Process, PVOID Address)
 );
@@ -1083,7 +1082,7 @@
 VOID
 NTAPI
 MmDeleteRmap(
-    PFN_TYPE Page,
+    PFN_NUMBER Page,
     struct _EPROCESS *Process,
     PVOID Address
 );
@@ -1094,23 +1093,23 @@
 
 VOID
 NTAPI
-MmSetCleanAllRmaps(PFN_TYPE Page);
-
-VOID
-NTAPI
-MmSetDirtyAllRmaps(PFN_TYPE Page);
+MmSetCleanAllRmaps(PFN_NUMBER Page);
+
+VOID
+NTAPI
+MmSetDirtyAllRmaps(PFN_NUMBER Page);
 
 BOOLEAN
 NTAPI
-MmIsDirtyPageRmap(PFN_TYPE Page);
-
-NTSTATUS
-NTAPI
-MmWritePagePhysicalAddress(PFN_TYPE Page);
-
-NTSTATUS
-NTAPI
-MmPageOutPhysicalAddress(PFN_TYPE Page);
+MmIsDirtyPageRmap(PFN_NUMBER Page);
+
+NTSTATUS
+NTAPI
+MmWritePagePhysicalAddress(PFN_NUMBER Page);
+
+NTSTATUS
+NTAPI
+MmPageOutPhysicalAddress(PFN_NUMBER Page);
 
 /* freelist.c **********************************************************/
 
@@ -1118,7 +1117,7 @@
 
 FORCEINLINE
 PMMPFN
-MiGetPfnEntry(IN PFN_TYPE Pfn)
+MiGetPfnEntry(IN PFN_NUMBER Pfn)
 {
     PMMPFN Page;
     extern RTL_BITMAP MiPfnBitMap;
@@ -1149,33 +1148,33 @@
     return Pfn1 - MmPfnDatabase;
 }
 
-PFN_TYPE
-NTAPI
-MmGetLRUNextUserPage(PFN_TYPE PreviousPage);
-
-PFN_TYPE
+PFN_NUMBER
+NTAPI
+MmGetLRUNextUserPage(PFN_NUMBER PreviousPage);
+
+PFN_NUMBER
 NTAPI
 MmGetLRUFirstUserPage(VOID);
 
 VOID
 NTAPI
-MmInsertLRULastUserPage(PFN_TYPE Page);
-
-VOID
-NTAPI
-MmRemoveLRUUserPage(PFN_TYPE Page);
-
-VOID
-NTAPI
-MmLockPage(PFN_TYPE Page);
-
-VOID
-NTAPI
-MmUnlockPage(PFN_TYPE Page);
+MmInsertLRULastUserPage(PFN_NUMBER Page);
+
+VOID
+NTAPI
+MmRemoveLRUUserPage(PFN_NUMBER Page);
+
+VOID
+NTAPI
+MmLockPage(PFN_NUMBER Page);
+
+VOID
+NTAPI
+MmUnlockPage(PFN_NUMBER Page);
 
 ULONG
 NTAPI
-MmGetLockCountPage(PFN_TYPE Page);
+MmGetLockCountPage(PFN_NUMBER Page);
 
 VOID
 NTAPI
@@ -1189,7 +1188,7 @@
    VOID
 );
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmGetContinuousPages(
     ULONG NumberOfBytes,
@@ -1260,7 +1259,7 @@
 MmCreateVirtualMappingForKernel(
     PVOID Address,
     ULONG flProtect,
-    PPFN_TYPE Pages,
+    PPFN_NUMBER Pages,
     ULONG PageCount
 );
 
@@ -1277,7 +1276,7 @@
     struct _EPROCESS* Process,
     PVOID Address,
     ULONG flProtect,
-    PPFN_TYPE Pages,
+    PPFN_NUMBER Pages,
     ULONG PageCount
 );
 
@@ -1287,7 +1286,7 @@
     struct _EPROCESS* Process,
     PVOID Address,
     ULONG flProtect,
-    PPFN_TYPE Pages,
+    PPFN_NUMBER Pages,
     ULONG PageCount
 );
 
@@ -1322,7 +1321,7 @@
     struct _EPROCESS *Process,
     PVOID Address,
     BOOLEAN* WasDirty,
-    PPFN_TYPE Page
+    PPFN_NUMBER Page
 );
 
 VOID
@@ -1362,7 +1361,7 @@
 VOID
 NTAPI
 MmTransferOwnershipPage(
-    PFN_TYPE Page,
+    PFN_NUMBER Page,
     ULONG NewConsumer
 );
 
@@ -1373,7 +1372,7 @@
     PVOID Address
 );
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmAllocPage(
     ULONG Consumer,
@@ -1387,34 +1386,34 @@
     PHYSICAL_ADDRESS LowestAddress,
     PHYSICAL_ADDRESS HighestAddress,
     ULONG NumberOfPages,
-    PPFN_TYPE Pages
-);
-
-VOID
-NTAPI
-MmDereferencePage(PFN_TYPE Page);
-
-VOID
-NTAPI
-MmReferencePage(PFN_TYPE Page);
+    PPFN_NUMBER Pages
+);
+
+VOID
+NTAPI
+MmDereferencePage(PFN_NUMBER Page);
+
+VOID
+NTAPI
+MmReferencePage(PFN_NUMBER Page);
 
 ULONG
 NTAPI
-MmGetReferenceCountPage(PFN_TYPE Page);
+MmGetReferenceCountPage(PFN_NUMBER Page);
 
 BOOLEAN
 NTAPI
-MmIsPageInUse(PFN_TYPE Page);
+MmIsPageInUse(PFN_NUMBER Page);
 
 VOID
 NTAPI
 MmSetSavedSwapEntryPage(
-    PFN_TYPE Page,
+    PFN_NUMBER Page,
     SWAPENTRY SavedSwapEntry);
 
 SWAPENTRY
 NTAPI
-MmGetSavedSwapEntryPage(PFN_TYPE Page);
+MmGetSavedSwapEntryPage(PFN_NUMBER Page);
 
 VOID
 NTAPI
@@ -1434,7 +1433,7 @@
     PVOID Address
 );
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmGetPfnForProcess(
     struct _EPROCESS *Process,
@@ -1478,7 +1477,7 @@
     PVOID Address,
     BOOLEAN FreePage,
     BOOLEAN* WasDirty,
-    PPFN_TYPE Page
+    PPFN_NUMBER Page
 );
 
 BOOLEAN
@@ -1490,11 +1489,11 @@
 
 VOID
 NTAPI
-MmMarkPageMapped(PFN_TYPE Page);
-
-VOID
-NTAPI
-MmMarkPageUnmapped(PFN_TYPE Page);
+MmMarkPageMapped(PFN_NUMBER Page);
+
+VOID
+NTAPI
+MmMarkPageUnmapped(PFN_NUMBER Page);
 
 VOID
 NTAPI

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -50,7 +50,7 @@
              IN MEMORY_CACHING_TYPE CacheType)
 {
     
-    PFN_TYPE Pfn, PageCount;
+    PFN_NUMBER Pfn, PageCount;
     PMMPTE PointerPte;
     PVOID BaseAddress;
     MMPTE TempPte;

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -131,7 +131,7 @@
 
 /* FUNCTIONS ***************************************************************/
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmGetPfnForProcess(PEPROCESS Process,
                    PVOID Address)
@@ -321,7 +321,7 @@
 
 VOID
 NTAPI
-MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE
Page)
+MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER
Page)
 {
     UNIMPLEMENTED;
 }
@@ -340,7 +340,7 @@
     PVOID Address,
     BOOLEAN FreePage,
     BOOLEAN* WasDirty,
-    PPFN_TYPE Page)
+    PPFN_NUMBER Page)
 {
     PFN_NUMBER Pfn;
     PMMPTE Pte;
@@ -412,7 +412,7 @@
 MmCreateVirtualMappingUnsafe(PEPROCESS Process,
                              PVOID Address,
                              ULONG flProtect,
-                             PPFN_TYPE Pages,
+                             PPFN_NUMBER Pages,
                              ULONG PageCount)
 {
     UNIMPLEMENTED;
@@ -424,7 +424,7 @@
 MmCreateVirtualMapping(PEPROCESS Process,
                        PVOID Address,
                        ULONG flProtect,
-                       PPFN_TYPE Pages,
+                       PPFN_NUMBER Pages,
                        ULONG PageCount)
 {
     UNIMPLEMENTED;

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -53,7 +53,7 @@
                          PMM_PAGEOP PageOp)
 {
    SWAPENTRY SwapEntry;
-   PFN_TYPE Page;
+   PFN_NUMBER Page;
    NTSTATUS Status;
    PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace);
 
@@ -135,7 +135,7 @@
                        PVOID Address,
                        PMM_PAGEOP PageOp)
 {
-   PFN_TYPE Page;
+   PFN_NUMBER Page;
    BOOLEAN WasDirty;
    SWAPENTRY SwapEntry;
    NTSTATUS Status;
@@ -253,7 +253,7 @@
  * NOTES: This function is called with the address space lock held.
  */
 {
-   PFN_TYPE Page;
+   PFN_NUMBER Page;
    NTSTATUS Status;
    PMM_REGION Region;
    PMM_PAGEOP PageOp;
@@ -476,7 +476,7 @@
 
       for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++)
       {
-         PFN_TYPE Page;
+         PFN_NUMBER Page;
 
          if (MmIsPageSwapEntry(Process,
                                (char*)BaseAddress + (i * PAGE_SIZE)))
@@ -872,7 +872,7 @@
 MmFreeVirtualMemoryPage(PVOID Context,
                         MEMORY_AREA* MemoryArea,
                         PVOID Address,
-                        PFN_TYPE Page,
+                        PFN_NUMBER Page,
                         SWAPENTRY SwapEntry,
                         BOOLEAN Dirty)
 {

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/arm/stubs.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -430,7 +430,7 @@
 MmDisableVirtualMapping(IN PEPROCESS Process,
                         IN PVOID Address,
                         OUT PBOOLEAN WasDirty,
-                        OUT PPFN_TYPE Page)
+                        OUT PPFN_NUMBER Page)
 {
     //
     // TODO
@@ -557,7 +557,7 @@
 MmCreateVirtualMappingUnsafe(IN PEPROCESS Process,
                              IN PVOID Address,
                              IN ULONG Protection,
-                             IN PPFN_TYPE Pages,
+                             IN PPFN_NUMBER Pages,
                              IN ULONG PageCount)
 {
     //
@@ -588,7 +588,7 @@
 MmCreateVirtualMapping(IN PEPROCESS Process,
                        IN PVOID Address,
                        IN ULONG Protection,
-                       IN PPFN_TYPE Pages,
+                       IN PPFN_NUMBER Pages,
                        IN ULONG PageCount)
 {
     ULONG i;
@@ -644,7 +644,7 @@
                        IN PVOID Address,
                        IN BOOLEAN FreePage,
                        OUT PBOOLEAN WasDirty,
-                       OUT PPFN_TYPE Page)
+                       OUT PPFN_NUMBER Page)
 {
     PMMPTE PointerPte;
     MMPTE Pte;
@@ -712,7 +712,7 @@
     return 0;
 }
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmGetPfnForProcess(IN PEPROCESS Process,
                    IN PVOID Address)

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -23,7 +23,7 @@
 /* TYPES ********************************************************************/
 typedef struct _MM_ALLOCATION_REQUEST
 {
-   PFN_TYPE Page;
+   PFN_NUMBER Page;
    LIST_ENTRY ListEntry;
    KEVENT Event;
 }
@@ -101,7 +101,7 @@
 
 NTSTATUS
 NTAPI
-MmReleasePageMemoryConsumer(ULONG Consumer, PFN_TYPE Page)
+MmReleasePageMemoryConsumer(ULONG Consumer, PFN_NUMBER Page)
 {
    PMM_ALLOCATION_REQUEST Request;
    PLIST_ENTRY Entry;
@@ -170,8 +170,8 @@
 NTSTATUS
 MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages)
 {
-    PFN_TYPE CurrentPage;
-    PFN_TYPE NextPage;
+    PFN_NUMBER CurrentPage;
+    PFN_NUMBER NextPage;
     NTSTATUS Status;
     
     (*NrFreedPages) = 0;
@@ -235,10 +235,10 @@
 NTSTATUS
 NTAPI
 MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait,
-                            PPFN_TYPE AllocatedPage)
+                            PPFN_NUMBER AllocatedPage)
 {
    ULONG OldUsed;
-   PFN_TYPE Page;
+   PFN_NUMBER Page;
    KIRQL OldIrql;
 
    /*

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -105,7 +105,7 @@
 
 /* FUNCTIONS *************************************************************/
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmGetLRUFirstUserPage(VOID)
 {
@@ -128,7 +128,7 @@
 
 VOID
 NTAPI
-MmInsertLRULastUserPage(PFN_TYPE Pfn)
+MmInsertLRULastUserPage(PFN_NUMBER Pfn)
 {
    KIRQL oldIrql;
    PPHYSICAL_PAGE Page;
@@ -142,9 +142,9 @@
    KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql);
 }
 
-PFN_TYPE
-NTAPI
-MmGetLRUNextUserPage(PFN_TYPE PreviousPfn)
+PFN_NUMBER
+NTAPI
+MmGetLRUNextUserPage(PFN_NUMBER PreviousPfn)
 {
    PLIST_ENTRY NextListEntry;
    PHYSICAL_PAGE* PageDescriptor;
@@ -169,7 +169,7 @@
 
 VOID
 NTAPI
-MmRemoveLRUUserPage(PFN_TYPE Page)
+MmRemoveLRUUserPage(PFN_NUMBER Page)
 {
    RemoveEntryList(&MiGetPfnEntry(Page)->ListEntry);
 }
@@ -815,7 +815,7 @@
 
 VOID
 NTAPI
-MmSetRmapListHeadPage(PFN_TYPE Pfn, struct _MM_RMAP_ENTRY* ListHead)
+MmSetRmapListHeadPage(PFN_NUMBER Pfn, struct _MM_RMAP_ENTRY* ListHead)
 {
    KIRQL oldIrql;
     
@@ -826,7 +826,7 @@
 
 struct _MM_RMAP_ENTRY*
 NTAPI
-MmGetRmapListHeadPage(PFN_TYPE Pfn)
+MmGetRmapListHeadPage(PFN_NUMBER Pfn)
 {
    KIRQL oldIrql;
    struct _MM_RMAP_ENTRY* ListHead;
@@ -840,7 +840,7 @@
 
 VOID
 NTAPI
-MmSetSavedSwapEntryPage(PFN_TYPE Pfn,  SWAPENTRY SwapEntry)
+MmSetSavedSwapEntryPage(PFN_NUMBER Pfn,  SWAPENTRY SwapEntry)
 {
    KIRQL oldIrql;
 
@@ -851,7 +851,7 @@
 
 SWAPENTRY
 NTAPI
-MmGetSavedSwapEntryPage(PFN_TYPE Pfn)
+MmGetSavedSwapEntryPage(PFN_NUMBER Pfn)
 {
    SWAPENTRY SwapEntry;
    KIRQL oldIrql;
@@ -865,7 +865,7 @@
 
 VOID
 NTAPI
-MmReferencePage(PFN_TYPE Pfn)
+MmReferencePage(PFN_NUMBER Pfn)
 {
    PPHYSICAL_PAGE Page;
 
@@ -889,7 +889,7 @@
 
 ULONG
 NTAPI
-MmGetReferenceCountPage(PFN_TYPE Pfn)
+MmGetReferenceCountPage(PFN_NUMBER Pfn)
 {
    KIRQL oldIrql;
    ULONG RCount;
@@ -914,7 +914,7 @@
 
 BOOLEAN
 NTAPI
-MmIsPageInUse(PFN_TYPE Pfn)
+MmIsPageInUse(PFN_NUMBER Pfn)
 {
 
    DPRINT("MmIsPageInUse(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT);
@@ -924,7 +924,7 @@
 
 VOID
 NTAPI
-MmDereferencePage(PFN_TYPE Pfn)
+MmDereferencePage(PFN_NUMBER Pfn)
 {
    PPHYSICAL_PAGE Page;
 
@@ -984,7 +984,7 @@
 
 ULONG
 NTAPI
-MmGetLockCountPage(PFN_TYPE Pfn)
+MmGetLockCountPage(PFN_NUMBER Pfn)
 {
    KIRQL oldIrql;
    ULONG CurrentLockCount;
@@ -1010,7 +1010,7 @@
 
 VOID
 NTAPI
-MmLockPage(PFN_TYPE Pfn)
+MmLockPage(PFN_NUMBER Pfn)
 {
    PPHYSICAL_PAGE Page;
 
@@ -1029,7 +1029,7 @@
 
 VOID
 NTAPI
-MmUnlockPage(PFN_TYPE Pfn)
+MmUnlockPage(PFN_NUMBER Pfn)
 {
    PPHYSICAL_PAGE Page;
 
@@ -1046,11 +1046,11 @@
    Page->LockCount--;
 }
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmAllocPage(ULONG Consumer, SWAPENTRY SwapEntry)
 {
-   PFN_TYPE PfnOffset;
+   PFN_NUMBER PfnOffset;
    PLIST_ENTRY ListEntry;
    PPHYSICAL_PAGE PageDescriptor;
    BOOLEAN NeedClear = FALSE;
@@ -1112,7 +1112,7 @@
 
 NTSTATUS
 NTAPI
-MiZeroPage(PFN_TYPE Page)
+MiZeroPage(PFN_NUMBER Page)
 {
     KIRQL Irql;
     PVOID TempAddress;
@@ -1137,7 +1137,7 @@
    KIRQL oldIrql;
    PLIST_ENTRY ListEntry;
    PPHYSICAL_PAGE PageDescriptor;
-   PFN_TYPE Pfn;
+   PFN_NUMBER Pfn;
    ULONG Count;
 
    /* Free initial kernel memory */

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/i386/page.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -183,7 +183,7 @@
 {
     NTSTATUS Status;
     ULONG i, j;
-    PFN_TYPE Pfn[2];
+    PFN_NUMBER Pfn[2];
     PULONG_PTR PageDirectory;
     
     DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", MinWs, Process);
@@ -225,7 +225,7 @@
 {
     ULONG PdeOffset = ADDR_TO_PDE_OFFSET(Address);
     NTSTATUS Status;
-    PFN_TYPE Pfn;
+    PFN_NUMBER Pfn;
     ULONG Entry;
     PULONG Pt, PageDir;
     
@@ -348,7 +348,7 @@
     return 0;
 }
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmGetPfnForProcess(PEPROCESS Process,
                    PVOID Address)
@@ -364,7 +364,7 @@
 
 VOID
 NTAPI
-MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE
Page)
+MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER
Page)
 /*
  * FUNCTION: Delete a virtual mapping
  */
@@ -426,13 +426,13 @@
 VOID
 NTAPI
 MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage,
-                       BOOLEAN* WasDirty, PPFN_TYPE Page)
+                       BOOLEAN* WasDirty, PPFN_NUMBER Page)
 /*
  * FUNCTION: Delete a virtual mapping
  */
 {
     BOOLEAN WasValid = FALSE;
-    PFN_TYPE Pfn;
+    PFN_NUMBER Pfn;
     ULONG Pte;
     PULONG Pt;
     
@@ -705,7 +705,7 @@
 MmCreateVirtualMappingUnsafe(PEPROCESS Process,
                              PVOID Address,
                              ULONG flProtect,
-                             PPFN_TYPE Pages,
+                             PPFN_NUMBER Pages,
                              ULONG PageCount)
 {
     ULONG Attributes;
@@ -824,7 +824,7 @@
 MmCreateVirtualMapping(PEPROCESS Process,
                        PVOID Address,
                        ULONG flProtect,
-                       PPFN_TYPE Pages,
+                       PPFN_NUMBER Pages,
                        ULONG PageCount)
 {
     ULONG i;

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/i386/pagepae.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -348,7 +348,7 @@
 {
    NTSTATUS Status;
    ULONG i, j;
-   PFN_TYPE Pfn[7];
+   PFN_NUMBER Pfn[7];
    ULONG Count;
 
    DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", MinWs, Process);
@@ -459,7 +459,7 @@
 {
    PEPROCESS CurrentProcess = PsGetCurrentProcess();
    ULONG i;
-   PFN_TYPE Pfn;
+   PFN_NUMBER Pfn;
 
    DPRINT("ProcessId %d, Address %x\n", Process->UniqueProcessId, Address);
    if (Process != NULL && Process != CurrentProcess)
@@ -521,7 +521,7 @@
 MmGetPageTableForProcessForPAE(PEPROCESS Process, PVOID Address, BOOLEAN Create)
 {
    NTSTATUS Status;
-   PFN_TYPE Pfn;
+   PFN_NUMBER Pfn;
    ULONGLONG Entry;
    ULONGLONG ZeroEntry = 0LL;
    PULONGLONG Pt;
@@ -636,7 +636,7 @@
 {
    ULONG PdeOffset = ADDR_TO_PDE_OFFSET(Address);
    NTSTATUS Status;
-   PFN_TYPE Pfn;
+   PFN_NUMBER Pfn;
    ULONG Entry;
    PULONG Pt, PageDir;
 
@@ -780,7 +780,7 @@
    return 0;
 }
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmGetPfnForProcess(PEPROCESS Process,
                    PVOID Address)
@@ -810,7 +810,7 @@
 
 VOID
 NTAPI
-MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE
Page)
+MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER
Page)
 /*
  * FUNCTION: Delete a virtual mapping
  */
@@ -931,13 +931,13 @@
 VOID
 NTAPI
 MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage,
-                       BOOLEAN* WasDirty, PPFN_TYPE Page)
+                       BOOLEAN* WasDirty, PPFN_NUMBER Page)
 /*
  * FUNCTION: Delete a virtual mapping
  */
 {
    BOOLEAN WasValid = FALSE;
-   PFN_TYPE Pfn;
+   PFN_NUMBER Pfn;
 
    DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n",
           Process, Address, FreePage, WasDirty, Page);
@@ -1510,7 +1510,7 @@
 NTAPI
 MmCreateVirtualMappingForKernel(PVOID Address,
                                 ULONG flProtect,
-                                PPFN_TYPE Pages,
+                                PPFN_NUMBER Pages,
 				ULONG PageCount)
 {
    ULONG Attributes;
@@ -1727,7 +1727,7 @@
 MmCreateVirtualMappingUnsafe(PEPROCESS Process,
                              PVOID Address,
                              ULONG flProtect,
-                             PPFN_TYPE Pages,
+                             PPFN_NUMBER Pages,
                              ULONG PageCount)
 {
    ULONG Attributes;
@@ -1933,7 +1933,7 @@
 MmCreateVirtualMapping(PEPROCESS Process,
                        PVOID Address,
                        ULONG flProtect,
-                       PPFN_TYPE Pages,
+                       PPFN_NUMBER Pages,
                        ULONG PageCount)
 {
    ULONG i;
@@ -2114,7 +2114,7 @@
 
 PVOID
 NTAPI
-MmCreateHyperspaceMapping(PFN_TYPE Page)
+MmCreateHyperspaceMapping(PFN_NUMBER Page)
 {
    PVOID Address;
    ULONG i;
@@ -2241,11 +2241,11 @@
    return Address;
 }
 
-PFN_TYPE
-NTAPI
-MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage)
-{
-   PFN_TYPE Pfn;
+PFN_NUMBER
+NTAPI
+MmChangeHyperspaceMapping(PVOID Address, PFN_NUMBER NewPage)
+{
+   PFN_NUMBER Pfn;
    ASSERT (IS_HYPERSPACE(Address));
    if (Ke386Pae)
    {
@@ -2263,11 +2263,11 @@
    return Pfn;
 }
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmDeleteHyperspaceMapping(PVOID Address)
 {
-   PFN_TYPE Pfn;
+   PFN_NUMBER Pfn;
    ASSERT (IS_HYPERSPACE(Address));
    if (Ke386Pae)
    {

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -754,7 +754,7 @@
       {
          BOOLEAN Dirty = FALSE;
          SWAPENTRY SwapEntry = 0;
-         PFN_TYPE Page = 0;
+         PFN_NUMBER Page = 0;
 
          if (MmIsPageSwapEntry(Process, (PVOID)Address))
          {
@@ -1044,7 +1044,7 @@
 
    for (i = 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++)
    {
-      PFN_TYPE Page;
+      PFN_NUMBER Page;
 
       Status = MmRequestPageMemoryConsumer(Consumer, TRUE, &Page);
       if (!NT_SUCCESS(Status))

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmfault.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -304,7 +304,7 @@
 MmCommitPagedPoolAddress(PVOID Address, BOOLEAN Locked)
 {
    NTSTATUS Status;
-   PFN_TYPE AllocatedPage;
+   PFN_NUMBER AllocatedPage;
    KIRQL OldIrql;
 
    Status = MmRequestPageMemoryConsumer(MC_PPOOL, FALSE, &AllocatedPage);

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] Sat Nov 21 16:43:26
2009
@@ -26,8 +26,8 @@
 NTSTATUS NTAPI
 MmWriteDirtyPages(ULONG Target, PULONG Actual)
 {
-   PFN_TYPE Page;
-   PFN_TYPE NextPage;
+   PFN_NUMBER Page;
+   PFN_NUMBER NextPage;
    NTSTATUS Status;
 
    Page = MmGetLRUFirstUserPage();

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -119,9 +119,9 @@
 
 VOID
 NTAPI
-MmBuildMdlFromPages(PMDL Mdl, PPFN_TYPE Pages)
-{
-    memcpy(Mdl + 1, Pages, sizeof(PFN_TYPE) *
(PAGE_ROUND_UP(Mdl->ByteOffset+Mdl->ByteCount)/PAGE_SIZE));
+MmBuildMdlFromPages(PMDL Mdl, PPFN_NUMBER Pages)
+{
+    memcpy(Mdl + 1, Pages, sizeof(PFN_NUMBER) *
(PAGE_ROUND_UP(Mdl->ByteOffset+Mdl->ByteCount)/PAGE_SIZE));
     
     /* FIXME: this flag should be set by the caller perhaps? */
     Mdl->MdlFlags |= MDL_IO_PAGE_READ;
@@ -215,7 +215,7 @@
 
 NTSTATUS
 NTAPI
-MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page)
+MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page)
 {
    ULONG i, offset;
    LARGE_INTEGER file_offset;
@@ -276,7 +276,7 @@
 
 NTSTATUS
 NTAPI
-MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page)
+MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page)
 {
    ULONG i, offset;
    LARGE_INTEGER file_offset;

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/powerpc/page.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -191,17 +191,17 @@
     return Addr;
 }
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmGetPfnForProcess(PEPROCESS Process,
                    PVOID Address)
 {
-    return((PFN_TYPE)MmGetPhysicalAddressProcess(Process, Address) >> PAGE_SHIFT);
-}
-
-VOID
-NTAPI
-MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE
Page)
+    return((PFN_NUMBER)MmGetPhysicalAddressProcess(Process, Address) >>
PAGE_SHIFT);
+}
+
+VOID
+NTAPI
+MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER
Page)
 /*
  * FUNCTION: Delete a virtual mapping
  */
@@ -221,7 +221,7 @@
 VOID
 NTAPI
 MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage,
-                       BOOLEAN* WasDirty, PPFN_TYPE Page)
+                       BOOLEAN* WasDirty, PPFN_NUMBER Page)
 /*
  * FUNCTION: Delete a virtual mapping
  */
@@ -358,7 +358,7 @@
 NTAPI
 MmCreateVirtualMappingForKernel(PVOID Address,
                                 ULONG flProtect,
-                                PPFN_TYPE Pages,
+                                PPFN_NUMBER Pages,
 				ULONG PageCount)
 {
     ULONG i;
@@ -424,7 +424,7 @@
 MmCreateVirtualMappingUnsafe(PEPROCESS Process,
                              PVOID Address,
                              ULONG flProtect,
-                             PPFN_TYPE Pages,
+                             PPFN_NUMBER Pages,
                              ULONG PageCount)
 {
     ULONG Attributes;
@@ -498,7 +498,7 @@
 MmCreateVirtualMapping(PEPROCESS Process,
                        PVOID Address,
                        ULONG flProtect,
-                       PPFN_TYPE Pages,
+                       PPFN_NUMBER Pages,
                        ULONG PageCount)
 {
    ULONG i;
@@ -573,7 +573,7 @@
 
 PVOID
 NTAPI
-MmCreateHyperspaceMapping(PFN_TYPE Page)
+MmCreateHyperspaceMapping(PFN_NUMBER Page)
 {
     PVOID Address;
     ppc_map_info_t info = { 0 };
@@ -587,11 +587,11 @@
     return Address;
 }
 
-PFN_TYPE
-NTAPI
-MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage)
-{
-    PFN_TYPE OldPage;
+PFN_NUMBER
+NTAPI
+MmChangeHyperspaceMapping(PVOID Address, PFN_NUMBER NewPage)
+{
+    PFN_NUMBER OldPage;
     ppc_map_info_t info = { 0 };
 
     info.proc = 0;
@@ -604,7 +604,7 @@
     return NewPage;
 }
 
-PFN_TYPE
+PFN_NUMBER
 NTAPI
 MmDeleteHyperspaceMapping(PVOID Address)
 {
@@ -616,7 +616,7 @@
 
     MmuUnmapPage(&info, 1);
 
-    return (PFN_TYPE)info.phys;
+    return (PFN_NUMBER)info.phys;
 }
 
 VOID
@@ -658,7 +658,7 @@
 }
 
 /* Use our primitive allocator */
-PFN_TYPE MmPPCPrimitiveAllocPage()
+PFN_NUMBER MmPPCPrimitiveAllocPage()
 {
     paddr_t Result = MmuGetPage();
     DbgPrint("Got Page %x\n", Result);

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Sat Nov 21 16:43:26
2009
@@ -54,7 +54,7 @@
 
 NTSTATUS
 NTAPI
-MmWritePagePhysicalAddress(PFN_TYPE Page)
+MmWritePagePhysicalAddress(PFN_NUMBER Page)
 {
    PMM_RMAP_ENTRY entry;
    PMEMORY_AREA MemoryArea;
@@ -188,7 +188,7 @@
 
 NTSTATUS
 NTAPI
-MmPageOutPhysicalAddress(PFN_TYPE Page)
+MmPageOutPhysicalAddress(PFN_NUMBER Page)
 {
    PMM_RMAP_ENTRY entry;
    PMEMORY_AREA MemoryArea;
@@ -312,7 +312,7 @@
 
 VOID
 NTAPI
-MmSetCleanAllRmaps(PFN_TYPE Page)
+MmSetCleanAllRmaps(PFN_NUMBER Page)
 {
    PMM_RMAP_ENTRY current_entry;
 
@@ -333,7 +333,7 @@
 
 VOID
 NTAPI
-MmSetDirtyAllRmaps(PFN_TYPE Page)
+MmSetDirtyAllRmaps(PFN_NUMBER Page)
 {
    PMM_RMAP_ENTRY current_entry;
 
@@ -354,7 +354,7 @@
 
 BOOLEAN
 NTAPI
-MmIsDirtyPageRmap(PFN_TYPE Page)
+MmIsDirtyPageRmap(PFN_NUMBER Page)
 {
    PMM_RMAP_ENTRY current_entry;
 
@@ -380,7 +380,7 @@
 
 VOID
 NTAPI
-MmInsertRmap(PFN_TYPE Page, PEPROCESS Process,
+MmInsertRmap(PFN_NUMBER Page, PEPROCESS Process,
              PVOID Address)
 {
    PMM_RMAP_ENTRY current_entry;
@@ -450,7 +450,7 @@
 
 VOID
 NTAPI
-MmDeleteAllRmaps(PFN_TYPE Page, PVOID Context,
+MmDeleteAllRmaps(PFN_NUMBER Page, PVOID Context,
                  VOID (*DeleteMapping)(PVOID Context, PEPROCESS Process,
                                        PVOID Address))
 {
@@ -491,7 +491,7 @@
 
 VOID
 NTAPI
-MmDeleteRmap(PFN_TYPE Page, PEPROCESS Process,
+MmDeleteRmap(PFN_NUMBER Page, PEPROCESS Process,
              PVOID Address)
 {
    PMM_RMAP_ENTRY current_entry, previous_entry;

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Nov 21
16:43:26 2009
@@ -463,7 +463,7 @@
       PFILE_OBJECT FileObject;
       PBCB Bcb;
       SWAPENTRY SavedSwapEntry;
-      PFN_TYPE Page;
+      PFN_NUMBER Page;
       BOOLEAN IsImageSection;
       ULONG FileOffset;
 
@@ -578,7 +578,7 @@
 
 NTSTATUS
 NTAPI
-MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress)
+MiCopyFromUserPage(PFN_NUMBER DestPage, PVOID SourceAddress)
 {
     PEPROCESS Process;
     KIRQL Irql;
@@ -599,7 +599,7 @@
 NTAPI
 MiReadPage(PMEMORY_AREA MemoryArea,
            ULONG SegOffset,
-           PPFN_TYPE Page)
+           PPFN_NUMBER Page)
 /*
  * FUNCTION: Read a page for a section backed memory area.
  * PARAMETERS:
@@ -780,7 +780,7 @@
                              BOOLEAN Locked)
 {
    ULONG Offset;
-   PFN_TYPE Page;
+   PFN_NUMBER Page;
    NTSTATUS Status;
    PVOID PAddress;
    PROS_SECTION_OBJECT Section;
@@ -1318,8 +1318,8 @@
 {
    PMM_SECTION_SEGMENT Segment;
    PROS_SECTION_OBJECT Section;
-   PFN_TYPE OldPage;
-   PFN_TYPE NewPage;
+   PFN_NUMBER OldPage;
+   PFN_NUMBER NewPage;
    NTSTATUS Status;
    PVOID PAddress;
    ULONG Offset;
@@ -1494,7 +1494,7 @@
 {
    MM_SECTION_PAGEOUT_CONTEXT* PageOutContext;
    BOOLEAN WasDirty;
-   PFN_TYPE Page;
+   PFN_NUMBER Page;
 
    PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context;
    if (Process)
@@ -1541,7 +1541,7 @@
                      PVOID Address,
                      PMM_PAGEOP PageOp)
 {
-   PFN_TYPE Page;
+   PFN_NUMBER Page;
    MM_SECTION_PAGEOUT_CONTEXT Context;
    SWAPENTRY SwapEntry;
    ULONG Entry;
@@ -1901,7 +1901,7 @@
    ULONG Offset;
    PROS_SECTION_OBJECT Section;
    PMM_SECTION_SEGMENT Segment;
-   PFN_TYPE Page;
+   PFN_NUMBER Page;
    SWAPENTRY SwapEntry;
    ULONG Entry;
    BOOLEAN Private;
@@ -2078,7 +2078,7 @@
          {
             ULONG Offset;
             ULONG Entry;
-            PFN_TYPE Page;
+            PFN_NUMBER Page;
 
             Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress
                      + MemoryArea->Data.SectionData.ViewOffset;
@@ -2187,7 +2187,7 @@
    ULONG Offset;
    ULONG Entry;
    ULONG SavedSwapEntry;
-   PFN_TYPE Page;
+   PFN_NUMBER Page;
 
    Page = 0;
 
@@ -3936,7 +3936,7 @@
 
 static VOID
 MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
-                  PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty)
+                  PFN_NUMBER Page, SWAPENTRY SwapEntry, BOOLEAN Dirty)
 {
    ULONG Entry;
    PFILE_OBJECT FileObject;