[ros-diffs] [tkreuzer] 48070: Merge 44257 from amd64 branch: PFN_TYPE -> PFN_NUMBER
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Thu Jul 15 22:50:13 UTC 2010
Author: tkreuzer
Date: Thu Jul 15 22:50:12 2010
New Revision: 48070
URL: http://svn.reactos.org/svn/reactos?rev=48070&view=rev
Log:
Merge 44257 from amd64 branch:
PFN_TYPE -> PFN_NUMBER
Modified:
trunk/reactos/ (props changed)
trunk/reactos/ntoskrnl/cc/copy.c
trunk/reactos/ntoskrnl/cc/view.c
trunk/reactos/ntoskrnl/include/internal/mm.h
trunk/reactos/ntoskrnl/mm/ARM3/iosup.c
trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c
trunk/reactos/ntoskrnl/mm/anonmem.c
trunk/reactos/ntoskrnl/mm/arm/page.c
trunk/reactos/ntoskrnl/mm/arm/stubs.c
trunk/reactos/ntoskrnl/mm/balance.c
trunk/reactos/ntoskrnl/mm/freelist.c
trunk/reactos/ntoskrnl/mm/i386/page.c
trunk/reactos/ntoskrnl/mm/i386/pagepae.c
trunk/reactos/ntoskrnl/mm/marea.c
trunk/reactos/ntoskrnl/mm/mmfault.c
trunk/reactos/ntoskrnl/mm/pagefile.c
trunk/reactos/ntoskrnl/mm/powerpc/page.c
trunk/reactos/ntoskrnl/mm/rmap.c
trunk/reactos/ntoskrnl/mm/section.c
Propchange: trunk/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 15 22:50:12 2010
@@ -1,4 +1,4 @@
/branches/header-work:45691-47721
/branches/reactos-yarotows:46372,46848,46966,47800,48026,48064
/branches/ros-amd64-bringup:36852
-/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882
+/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44257,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882
Modified: trunk/reactos/ntoskrnl/cc/copy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -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: trunk/reactos/ntoskrnl/cc/view.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -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: trunk/reactos/ntoskrnl/include/internal/mm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/mm.h?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -53,7 +53,6 @@
struct _MM_RMAP_ENTRY;
struct _MM_PAGEOP;
typedef ULONG SWAPENTRY;
-typedef ULONG PFN_TYPE, *PPFN_TYPE;
//
// MmDbgCopyMemory Flags
@@ -466,7 +465,7 @@
PVOID Context,
PMEMORY_AREA MemoryArea,
PVOID Address,
- PFN_TYPE Page,
+ PFN_NUMBER Page,
SWAPENTRY SwapEntry,
BOOLEAN Dirty
);
@@ -688,7 +687,7 @@
NTAPI
MmBuildMdlFromPages(
PMDL Mdl,
- PULONG Pages
+ PPFN_NUMBER Pages
);
/* mminit.c ******************************************************************/
@@ -738,7 +737,7 @@
NTAPI
MmReadFromSwapPage(
SWAPENTRY SwapEntry,
- PFN_TYPE Page
+ PFN_NUMBER Page
);
BOOLEAN
@@ -749,7 +748,7 @@
NTAPI
MmWriteToSwapPage(
SWAPENTRY SwapEntry,
- PFN_TYPE Page
+ PFN_NUMBER Page
);
NTSTATUS
@@ -917,18 +916,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 *****************************************************************/
@@ -999,7 +998,7 @@
NTAPI
MmReleasePageMemoryConsumer(
ULONG Consumer,
- PFN_TYPE Page
+ PFN_NUMBER Page
);
NTSTATUS
@@ -1007,7 +1006,7 @@
MmRequestPageMemoryConsumer(
ULONG Consumer,
BOOLEAN MyWait,
- PPFN_TYPE AllocatedPage
+ PPFN_NUMBER AllocatedPage
);
VOID
@@ -1023,18 +1022,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
);
@@ -1042,7 +1041,7 @@
VOID
NTAPI
MmDeleteAllRmaps(
- PFN_TYPE Page,
+ PFN_NUMBER Page,
PVOID Context,
VOID (*DeleteMapping)(PVOID Context, struct _EPROCESS *Process, PVOID Address)
);
@@ -1050,7 +1049,7 @@
VOID
NTAPI
MmDeleteRmap(
- PFN_TYPE Page,
+ PFN_NUMBER Page,
struct _EPROCESS *Process,
PVOID Address
);
@@ -1061,29 +1060,29 @@
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 **********************************************************/
FORCEINLINE
PMMPFN
-MiGetPfnEntry(IN PFN_TYPE Pfn)
+MiGetPfnEntry(IN PFN_NUMBER Pfn)
{
PMMPFN Page;
extern RTL_BITMAP MiPfnBitMap;
@@ -1111,33 +1110,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
@@ -1151,7 +1150,7 @@
VOID
);
-PFN_TYPE
+PFN_NUMBER
NTAPI
MmGetContinuousPages(
ULONG NumberOfBytes,
@@ -1222,7 +1221,7 @@
MmCreateVirtualMappingForKernel(
PVOID Address,
ULONG flProtect,
- PPFN_TYPE Pages,
+ PPFN_NUMBER Pages,
ULONG PageCount
);
@@ -1239,7 +1238,7 @@
struct _EPROCESS* Process,
PVOID Address,
ULONG flProtect,
- PPFN_TYPE Pages,
+ PPFN_NUMBER Pages,
ULONG PageCount
);
@@ -1249,7 +1248,7 @@
struct _EPROCESS* Process,
PVOID Address,
ULONG flProtect,
- PPFN_TYPE Pages,
+ PPFN_NUMBER Pages,
ULONG PageCount
);
@@ -1284,7 +1283,7 @@
struct _EPROCESS *Process,
PVOID Address,
BOOLEAN* WasDirty,
- PPFN_TYPE Page
+ PPFN_NUMBER Page
);
VOID
@@ -1324,7 +1323,7 @@
VOID
NTAPI
MmTransferOwnershipPage(
- PFN_TYPE Page,
+ PFN_NUMBER Page,
ULONG NewConsumer
);
@@ -1335,7 +1334,7 @@
PVOID Address
);
-PFN_TYPE
+PFN_NUMBER
NTAPI
MmAllocPage(
ULONG Consumer
@@ -1348,34 +1347,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
@@ -1395,7 +1394,7 @@
PVOID Address
);
-PFN_TYPE
+PFN_NUMBER
NTAPI
MmGetPfnForProcess(
struct _EPROCESS *Process,
@@ -1439,7 +1438,7 @@
PVOID Address,
BOOLEAN FreePage,
BOOLEAN* WasDirty,
- PPFN_TYPE Page
+ PPFN_NUMBER Page
);
BOOLEAN
@@ -1451,11 +1450,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: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/iosup.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -50,7 +50,7 @@
IN MEMORY_CACHING_TYPE CacheType)
{
- PFN_TYPE Pfn, PageCount;
+ PFN_NUMBER Pfn, PageCount;
PMMPTE PointerPte;
PVOID BaseAddress;
MMPTE TempPte;
Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -573,7 +573,7 @@
IN KPROCESSOR_MODE AccessMode,
IN LOCK_OPERATION Operation)
{
- PPFN_TYPE MdlPages;
+ PPFN_NUMBER MdlPages;
PVOID Base, Address, LastAddress, StartAddress;
ULONG LockPages, TotalPages;
NTSTATUS Status = STATUS_SUCCESS;
Modified: trunk/reactos/ntoskrnl/mm/anonmem.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -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;
@@ -457,7 +457,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)))
@@ -853,7 +853,7 @@
MmFreeVirtualMemoryPage(PVOID Context,
MEMORY_AREA* MemoryArea,
PVOID Address,
- PFN_TYPE Page,
+ PFN_NUMBER Page,
SWAPENTRY SwapEntry,
BOOLEAN Dirty)
{
Modified: trunk/reactos/ntoskrnl/mm/arm/page.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -81,7 +81,7 @@
MmDisableVirtualMapping(IN PEPROCESS Process,
IN PVOID Address,
OUT PBOOLEAN WasDirty,
- OUT PPFN_TYPE Page)
+ OUT PPFN_NUMBER Page)
{
UNIMPLEMENTED;
while (TRUE);
@@ -101,7 +101,7 @@
MmCreateVirtualMappingUnsafe(IN PEPROCESS Process,
IN PVOID Address,
IN ULONG Protection,
- IN PPFN_TYPE Pages,
+ IN PPFN_NUMBER Pages,
IN ULONG PageCount)
{
UNIMPLEMENTED;
@@ -114,7 +114,7 @@
MmCreateVirtualMapping(IN PEPROCESS Process,
IN PVOID Address,
IN ULONG Protection,
- IN PPFN_TYPE Pages,
+ IN PPFN_NUMBER Pages,
IN ULONG PageCount)
{
UNIMPLEMENTED;
@@ -136,7 +136,7 @@
IN PVOID Address,
IN BOOLEAN FreePage,
OUT PBOOLEAN WasDirty,
- OUT PPFN_TYPE Page)
+ OUT PPFN_NUMBER Page)
{
UNIMPLEMENTED;
while (TRUE);
@@ -163,7 +163,7 @@
return 0;
}
-PFN_TYPE
+PFN_NUMBER
NTAPI
MmGetPfnForProcess(IN PEPROCESS Process,
IN PVOID Address)
Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -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: trunk/reactos/ntoskrnl/mm/balance.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -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;
@@ -171,8 +171,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;
@@ -228,15 +228,15 @@
PsGetCurrentThread() == MiBalancerThreadId.UniqueThread;
}
-VOID NTAPI MiSetConsumer(IN PFN_TYPE Pfn, IN ULONG Consumer);
+VOID NTAPI MiSetConsumer(IN PFN_NUMBER Pfn, IN ULONG Consumer);
NTSTATUS
NTAPI
MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait,
- PPFN_TYPE AllocatedPage)
+ PPFN_NUMBER AllocatedPage)
{
ULONG OldUsed;
- PFN_TYPE Page;
+ PFN_NUMBER Page;
KIRQL OldIrql;
/*
Modified: trunk/reactos/ntoskrnl/mm/freelist.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -73,7 +73,7 @@
RtlClearAllBits(&MiUserPfnBitMap);
}
-PFN_TYPE
+PFN_NUMBER
NTAPI
MmGetLRUFirstUserPage(VOID)
{
@@ -92,7 +92,7 @@
VOID
NTAPI
-MmInsertLRULastUserPage(PFN_TYPE Pfn)
+MmInsertLRULastUserPage(PFN_NUMBER Pfn)
{
KIRQL OldIrql;
@@ -102,9 +102,9 @@
KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql);
}
-PFN_TYPE
-NTAPI
-MmGetLRUNextUserPage(PFN_TYPE PreviousPfn)
+PFN_NUMBER
+NTAPI
+MmGetLRUNextUserPage(PFN_NUMBER PreviousPfn)
{
ULONG Position;
KIRQL OldIrql;
@@ -121,7 +121,7 @@
VOID
NTAPI
-MmRemoveLRUUserPage(PFN_TYPE Page)
+MmRemoveLRUUserPage(PFN_NUMBER Page)
{
/* Unset the page as a user page */
RtlClearBit(&MiUserPfnBitMap, Page);
@@ -448,7 +448,7 @@
VOID
NTAPI
-MmSetRmapListHeadPage(PFN_TYPE Pfn, struct _MM_RMAP_ENTRY* ListHead)
+MmSetRmapListHeadPage(PFN_NUMBER Pfn, struct _MM_RMAP_ENTRY* ListHead)
{
KIRQL oldIrql;
@@ -459,7 +459,7 @@
struct _MM_RMAP_ENTRY*
NTAPI
-MmGetRmapListHeadPage(PFN_TYPE Pfn)
+MmGetRmapListHeadPage(PFN_NUMBER Pfn)
{
KIRQL oldIrql;
struct _MM_RMAP_ENTRY* ListHead;
@@ -473,7 +473,7 @@
VOID
NTAPI
-MmSetSavedSwapEntryPage(PFN_TYPE Pfn, SWAPENTRY SwapEntry)
+MmSetSavedSwapEntryPage(PFN_NUMBER Pfn, SWAPENTRY SwapEntry)
{
KIRQL oldIrql;
@@ -484,7 +484,7 @@
SWAPENTRY
NTAPI
-MmGetSavedSwapEntryPage(PFN_TYPE Pfn)
+MmGetSavedSwapEntryPage(PFN_NUMBER Pfn)
{
SWAPENTRY SwapEntry;
KIRQL oldIrql;
@@ -498,7 +498,7 @@
VOID
NTAPI
-MmReferencePage(PFN_TYPE Pfn)
+MmReferencePage(PFN_NUMBER Pfn)
{
PPHYSICAL_PAGE Page;
@@ -517,7 +517,7 @@
ULONG
NTAPI
-MmGetReferenceCountPage(PFN_TYPE Pfn)
+MmGetReferenceCountPage(PFN_NUMBER Pfn)
{
KIRQL oldIrql;
ULONG RCount;
@@ -537,14 +537,14 @@
BOOLEAN
NTAPI
-MmIsPageInUse(PFN_TYPE Pfn)
+MmIsPageInUse(PFN_NUMBER Pfn)
{
return MiIsPfnInUse(MiGetPfnEntry(Pfn));
}
VOID
NTAPI
-MiSetConsumer(IN PFN_TYPE Pfn,
+MiSetConsumer(IN PFN_NUMBER Pfn,
IN ULONG Type)
{
MiGetPfnEntry(Pfn)->u3.e1.PageLocation = ActiveAndValid;
@@ -552,7 +552,7 @@
VOID
NTAPI
-MmDereferencePage(PFN_TYPE Pfn)
+MmDereferencePage(PFN_NUMBER Pfn)
{
PPHYSICAL_PAGE Page;
@@ -574,11 +574,11 @@
}
}
-PFN_TYPE
+PFN_NUMBER
NTAPI
MmAllocPage(ULONG Type)
{
- PFN_TYPE PfnOffset;
+ PFN_NUMBER PfnOffset;
PPHYSICAL_PAGE PageDescriptor;
BOOLEAN NeedClear = FALSE;
@@ -622,7 +622,7 @@
NTSTATUS
NTAPI
-MiZeroPage(PFN_TYPE Page)
+MiZeroPage(PFN_NUMBER Page)
{
KIRQL Irql;
PVOID TempAddress;
@@ -646,7 +646,7 @@
NTSTATUS Status;
KIRQL oldIrql;
PPHYSICAL_PAGE PageDescriptor;
- PFN_TYPE Pfn;
+ PFN_NUMBER Pfn;
ULONG Count;
/* Free initial kernel memory */
Modified: trunk/reactos/ntoskrnl/mm/i386/page.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -183,7 +183,7 @@
{
NTSTATUS Status;
ULONG i, j;
- PFN_TYPE Pfn[2];
+ PFN_NUMBER Pfn[2];
PULONG 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;
@@ -344,7 +344,7 @@
return 0;
}
-PFN_TYPE
+PFN_NUMBER
NTAPI
MmGetPfnForProcess(PEPROCESS Process,
PVOID Address)
@@ -360,7 +360,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
*/
@@ -422,13 +422,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;
@@ -701,7 +701,7 @@
MmCreateVirtualMappingUnsafe(PEPROCESS Process,
PVOID Address,
ULONG flProtect,
- PPFN_TYPE Pages,
+ PPFN_NUMBER Pages,
ULONG PageCount)
{
ULONG Attributes;
@@ -816,7 +816,7 @@
MmCreateVirtualMapping(PEPROCESS Process,
PVOID Address,
ULONG flProtect,
- PPFN_TYPE Pages,
+ PPFN_NUMBER Pages,
ULONG PageCount)
{
ULONG i;
Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -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: trunk/reactos/ntoskrnl/mm/marea.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -754,7 +754,7 @@
{
BOOLEAN Dirty = FALSE;
SWAPENTRY SwapEntry = 0;
- PFN_TYPE Page = 0;
+ PFN_NUMBER Page = 0;
if (MmIsPageSwapEntry(Process, (PVOID)Address))
{
@@ -1039,7 +1039,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: trunk/reactos/ntoskrnl/mm/mmfault.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -312,7 +312,7 @@
MmCommitPagedPoolAddress(PVOID Address, BOOLEAN Locked)
{
NTSTATUS Status;
- PFN_TYPE AllocatedPage;
+ PFN_NUMBER AllocatedPage;
Status = MmRequestPageMemoryConsumer(MC_PPOOL, FALSE, &AllocatedPage);
if (!NT_SUCCESS(Status))
Modified: trunk/reactos/ntoskrnl/mm/pagefile.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -121,9 +121,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;
@@ -217,7 +217,7 @@
NTSTATUS
NTAPI
-MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page)
+MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page)
{
ULONG i, offset;
LARGE_INTEGER file_offset;
@@ -278,7 +278,7 @@
NTSTATUS
NTAPI
-MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page)
+MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page)
{
ULONG i, offset;
LARGE_INTEGER file_offset;
Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -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: trunk/reactos/ntoskrnl/mm/rmap.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -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: trunk/reactos/ntoskrnl/mm/section.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=48070&r1=48069&r2=48070&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Jul 15 22:50:12 2010
@@ -465,7 +465,7 @@
PFILE_OBJECT FileObject;
PBCB Bcb;
SWAPENTRY SavedSwapEntry;
- PFN_TYPE Page;
+ PFN_NUMBER Page;
BOOLEAN IsImageSection;
ULONG FileOffset;
@@ -580,7 +580,7 @@
NTSTATUS
NTAPI
-MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress)
+MiCopyFromUserPage(PFN_NUMBER DestPage, PVOID SourceAddress)
{
PEPROCESS Process;
KIRQL Irql;
@@ -601,7 +601,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:
@@ -782,7 +782,7 @@
BOOLEAN Locked)
{
ULONG Offset;
- PFN_TYPE Page;
+ PFN_NUMBER Page;
NTSTATUS Status;
PVOID PAddress;
PROS_SECTION_OBJECT Section;
@@ -1267,8 +1267,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;
@@ -1435,7 +1435,7 @@
{
MM_SECTION_PAGEOUT_CONTEXT* PageOutContext;
BOOLEAN WasDirty;
- PFN_TYPE Page;
+ PFN_NUMBER Page;
PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context;
if (Process)
@@ -1482,7 +1482,7 @@
PVOID Address,
PMM_PAGEOP PageOp)
{
- PFN_TYPE Page;
+ PFN_NUMBER Page;
MM_SECTION_PAGEOUT_CONTEXT Context;
SWAPENTRY SwapEntry;
ULONG Entry;
@@ -1842,7 +1842,7 @@
ULONG Offset;
PROS_SECTION_OBJECT Section;
PMM_SECTION_SEGMENT Segment;
- PFN_TYPE Page;
+ PFN_NUMBER Page;
SWAPENTRY SwapEntry;
ULONG Entry;
BOOLEAN Private;
@@ -2019,7 +2019,7 @@
{
ULONG Offset;
ULONG Entry;
- PFN_TYPE Page;
+ PFN_NUMBER Page;
Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress
+ MemoryArea->Data.SectionData.ViewOffset;
@@ -2128,7 +2128,7 @@
ULONG Offset;
ULONG Entry;
ULONG SavedSwapEntry;
- PFN_TYPE Page;
+ PFN_NUMBER Page;
Page = 0;
@@ -3877,7 +3877,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;
More information about the Ros-diffs
mailing list