Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[cwittich] 41711: get rid of obsolete SHLocalAlloc/Free functions and export the correct v6 functions instead patch by <jerome dot gardou at laposte dot net>
by cwittich＠svn.reactos.org 30 Jun '09

30 Jun '09

Author: cwittich Date: Tue Jun 30 14:48:41 2009 New Revision: 41711 URL: http://svn.reactos.org/svn/reactos?rev=41711&view=rev Log: get rid of obsolete SHLocalAlloc/Free functions and export the correct v6 functions instead patch by <jerome dot gardou at laposte dot net> Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/stubs.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Tue Jun 30 14:48:41 2009 @@ -197,9 +197,9 @@ 197 stdcall -noname SHGlobalDefect(long) 198 stdcall -noname SHAbortInvokeCommand() 199 stdcall ExtractAssociatedIconA(long str ptr) -200 stdcall -noname SHLocalAlloc(long long) -201 stdcall -noname SHLocalFree(ptr) -202 stdcall -noname SHLocalReAlloc(ptr long long) +200 stdcall -noname SHCreateDesktop(ptr) +201 stdcall -noname SHDesktopMessageLoop(ptr) +202 stub -noname DDEHandleViewFolderNotify 203 stdcall -noname AddCommasW(long wstr) 204 stdcall -noname ShortSizeFormatW(double) 205 stdcall Printer_LoadIconsW(wstr ptr ptr) Modified: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] Tue Jun 30 14:48:41 2009 @@ -13,41 +13,6 @@ #include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); - -/* - * Unimplemented - */ -HLOCAL -WINAPI -SHLocalAlloc(UINT uFlags, SIZE_T uBytes) -{ - FIXME("SHLocalAlloc() stub\n"); - return NULL; -} - -/* - * Unimplemented - */ -HLOCAL -WINAPI -SHLocalFree(HLOCAL hMem) -{ - FIXME("SHLocalFree() stub\n"); - return NULL; -} - -/* - * Unimplemented - */ -HLOCAL -WINAPI -SHLocalReAlloc(HLOCAL hMem, - SIZE_T uBytes, - UINT uFlags) -{ - FIXME("SHLocalReAlloc() stub\n"); - return NULL; -} /* * Unimplemented

1 0

[ros-arm-bringup] 41710: - Move MmIsThisAnNtSystem and MmQueryMemorySize to mmsup.c instead of randomly in mminit.c. - Cleanup some externs that were never referenced in mminit.c. - Remove MiShutdownMemoryManager since it was dead code. - There is no need to define the MiKseg0Start/End variables and loop through the memory descriptors to find the last kernel image. We already have this information through LoaderPagesSpanned saved in MmBootImageSize. - Removed these variables, code that depended
by ros-arm-bringup＠svn.reactos.org 30 Jun '09

30 Jun '09

Author: ros-arm-bringup Date: Tue Jun 30 14:45:36 2009 New Revision: 41710 URL: http://svn.reactos.org/svn/reactos?rev=41710&view=rev Log: - Move MmIsThisAnNtSystem and MmQueryMemorySize to mmsup.c instead of randomly in mminit.c. - Cleanup some externs that were never referenced in mminit.c. - Remove MiShutdownMemoryManager since it was dead code. - There is no need to define the MiKseg0Start/End variables and loop through the memory descriptors to find the last kernel image. We already have this information through LoaderPagesSpanned saved in MmBootImageSize. - Removed these variables, code that depended on them, and MiGetLastKernelAddress, and switch to just using MmBootImageSize, which simplifies things a lot. - Also simplify the way that the initial memory latout is setup. Now the PFN database will always start after MmBootImageSize + KSEG0_BASE, instead of relying on the fact FreeLDR, on certain machines, may have had leftover space in the 6MB allocation that it makes (And worse, assuming FreeLDR on all architectures will allocate 6MB). - This standardizes the PFN database address and makes the code portable. - Same for the nonpaged pool address. - Should not call MmInitializeHandBuiltProcess for the idle process -- this will be called for the system process in PsCreateProcess. - The only thing we need, as the comment says, is the kernel MADDRESS_SPACE, so just initialize the lock for it. - Do not zero MmStats since the load-linker takes care of that for us since it's a global. Modified: trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/mmsup.c Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Tue Jun 30 14:45:36 2009 @@ -160,7 +160,6 @@ PspShutdownProcessManager(); CmShutdownSystem(); - MiShutdownMemoryManager(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jun 30 14:45:36 2009 @@ -45,13 +45,10 @@ "LoaderXIPRom " }; -BOOLEAN IsThisAnNtAsSystem = FALSE; -MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; ULONG MmBootImageSize; ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; -ULONG_PTR MiKSeg0Start, MiKSeg0End; ULONG_PTR MmPfnDatabaseEnd; PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; @@ -63,9 +60,6 @@ MM_STATS MmStats; PMMSUPPORT MmKernelAddressSpace; extern KMUTANT MmSystemLoadLock; -extern HANDLE MpwThreadHandle; -extern BOOLEAN MpwThreadShouldTerminate; -extern KEVENT MpwThreadEvent; BOOLEAN MiDbgEnableMdDump = #ifdef _ARM_ TRUE; @@ -74,41 +68,6 @@ #endif /* PRIVATE FUNCTIONS *********************************************************/ - -VOID -NTAPI -MiShutdownMemoryManager(VOID) -{ -#if 0 - ULONG PagesWritten; - PETHREAD Thread; - - /* Ask MPW thread to shutdown */ - MpwThreadShouldTerminate = TRUE; - KeSetEvent(&MpwThreadEvent, IO_NO_INCREMENT, FALSE); - - /* Wait for it */ - ObReferenceObjectByHandle(MpwThreadHandle, - THREAD_ALL_ACCESS, - PsThreadType, - KernelMode, - (PVOID*)&Thread, - NULL); - - KeWaitForSingleObject(Thread, - Executive, - KernelMode, - FALSE, - NULL); - - ObDereferenceObject(Thread); - - /* Check if there are any dirty pages, and flush them. - There will be no other chance to do this later, since filesystems - are going to be shut down. */ - CcRosFlushDirtyPages(128, &PagesWritten); -#endif -} VOID INIT_FUNCTION @@ -223,18 +182,11 @@ { DPRINT1("%8s%12s\t\t%s\n", "Start", "End", "Type"); DPRINT1("0x%p - 0x%p\t%s\n", - KSEG0_BASE, MiKSeg0Start, - "Undefined region"); - DPRINT1("0x%p - 0x%p\t%s\n", - MiKSeg0Start, MiKSeg0End, - "FreeLDR Kernel mapping region"); + MmSystemRangeStart, (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, + "Boot Image Mapping Region"); DPRINT1("0x%p - 0x%p\t%s\n", MmPfnDatabase, MmPfnDatabaseEnd, "PFN Database region"); - if (MmPfnDatabaseEnd != (ULONG_PTR)MiNonPagedPoolStart) - DPRINT1("0x%p - 0x%p\t%s\n", - MmPfnDatabaseEnd, MiNonPagedPoolStart, - "Remaining FreeLDR mapping"); DPRINT1("0x%p - 0x%p\t%s\n", MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength, "Non paged pool region"); @@ -264,38 +216,6 @@ DPRINT1("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); } -ULONG_PTR -NTAPI -MiGetLastKernelAddress(VOID) -{ - PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR Md; - ULONG_PTR LastKrnlPhysAddr = 0; - - for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; - NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; - NextEntry = NextEntry->Flink) - { - Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - - if (Md->MemoryType != LoaderFree && - Md->MemoryType != LoaderFirmwareTemporary && - Md->MemoryType != LoaderSpecialMemory) - { - if (Md->BasePage+Md->PageCount > LastKrnlPhysAddr) - LastKrnlPhysAddr = Md->BasePage+Md->PageCount; - } - } - - /* Convert to a physical address */ - return LastKrnlPhysAddr << PAGE_SHIFT; -} - - -VOID -NTAPI -MiInitHyperSpace(VOID); - NTSTATUS NTAPI MmArmInitSystem(IN ULONG Phase, @@ -305,10 +225,7 @@ INIT_FUNCTION NTAPI MmInit1(VOID) -{ - PLDR_DATA_TABLE_ENTRY LdrEntry; - ULONG Dummy[2]; - +{ /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); @@ -323,47 +240,23 @@ DPRINT("MmSystemRangeStart: %08x\n", MmSystemRangeStart); DPRINT("MmUserProbeAddress: %08x\n", MmUserProbeAddress); DPRINT("MmHighestUserAddress:%08x\n", MmHighestUserAddress); - - /* Initialize memory managment statistics */ - RtlZeroMemory(&MmStats, sizeof(MmStats)); /* Count RAM */ MiCountFreePagesInLoaderBlock(KeLoaderBlock); DbgPrint("Used memory %dKb\n", (MmNumberOfPhysicalPages * PAGE_SIZE) / 1024); /* Initialize the kernel address space */ - MmInitializeHandBuiltProcess(PsGetCurrentProcess(), Dummy); + KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); MmKernelAddressSpace = MmGetCurrentAddressSpace(); MmInitGlobalKernelPageDirectory(); - - /* Get kernel address boundaries */ - LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - MiKSeg0Start = (ULONG_PTR)LdrEntry->DllBase | KSEG0_BASE; - MiKSeg0End = PAGE_ROUND_UP(MiGetLastKernelAddress() | KSEG0_BASE); /* We'll put the PFN array right after the loaded modules */ - MmPfnDatabase = (PVOID)MiKSeg0End; + MmPfnDatabase = (PVOID)((ULONG_PTR)MmSystemRangeStart + MmBootImageSize); MmPfnDatabaseEnd = (ULONG_PTR)MmPfnDatabase + (MmHighestPhysicalPage * sizeof(MMPFN)); MmPfnDatabaseEnd = PAGE_ROUND_UP(MmPfnDatabaseEnd); - /* - * FreeLDR maps 6MB starting at the kernel base address, followed by the - * PFN database. If the PFN database doesn't go over the FreeLDR allocation - * then choose the end of the FreeLDR block. If it does go past the FreeLDR - * allocation, then choose the next PAGE_SIZE boundary. - */ - if ((ULONG_PTR)MmPfnDatabaseEnd < (MiKSeg0Start + 0x600000)) - { - /* Use the first memory following FreeLDR's 6MB mapping */ - MiNonPagedPoolStart = (PVOID)((ULONG_PTR)MiKSeg0Start + 0x600000); - } - else - { - /* Use the next free available page */ - MiNonPagedPoolStart = (PVOID)MmPfnDatabaseEnd; - } + /* Put nonpaged pool after the PFN database */ + MiNonPagedPoolStart = (PVOID)MmPfnDatabaseEnd; /* Length of non-paged pool */ MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE; @@ -461,25 +354,3 @@ return TRUE; } - -/* PUBLIC FUNCTIONS **********************************************************/ - -/* - * @implemented - */ -BOOLEAN -NTAPI -MmIsThisAnNtAsSystem(VOID) -{ - return IsThisAnNtAsSystem; -} - -/* - * @implemented - */ -MM_SYSTEMSIZE -NTAPI -MmQuerySystemSize(VOID) -{ - return MmSystemSize; -} Modified: trunk/reactos/ntoskrnl/mm/mmsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmsup.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmsup.c [iso-8859-1] Tue Jun 30 14:45:36 2009 @@ -11,6 +11,11 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +/* GLOBALS ********************************************************************/ + +BOOLEAN IsThisAnNtAsSystem = FALSE; +MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; /* PRIVATE FUNCTIONS **********************************************************/ @@ -117,4 +122,24 @@ return MmIsAddressValid(VirtualAddress); } +/* + * @implemented + */ +BOOLEAN +NTAPI +MmIsThisAnNtAsSystem(VOID) +{ + return IsThisAnNtAsSystem; +} + +/* + * @implemented + */ +MM_SYSTEMSIZE +NTAPI +MmQuerySystemSize(VOID) +{ + return MmSystemSize; +} + /* EOF */

1 0

[ros-arm-bringup] 41709: - Cleanup some debug-only debug prints. - Make the VA-range-printing debug prints match the same format as those in ReactOS Mm (MiDbgKernelLayout). - Add the appropriate number of spaces so that the layout appears continuous, even though it's coming from two source files. - This makes it easy to see the VA mappings at boot (but not all of them).
by ros-arm-bringup＠svn.reactos.org 30 Jun '09

30 Jun '09

Author: ros-arm-bringup Date: Tue Jun 30 14:38:51 2009 New Revision: 41709 URL: http://svn.reactos.org/svn/reactos?rev=41709&view=rev Log: - Cleanup some debug-only debug prints. - Make the VA-range-printing debug prints match the same format as those in ReactOS Mm (MiDbgKernelLayout). - Add the appropriate number of spaces so that the layout appears continuous, even though it's coming from two source files. - This makes it easy to see the VA mappings at boot (but not all of them). Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Tue Jun 30 14:38:51 2009 @@ -338,8 +338,8 @@ } } - DPRINT1("System PTE count has been tuned to %d (%d bytes)\n", - MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); + DPRINT("System PTE count has been tuned to %d (%d bytes)\n", + MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); // // Check if this is a machine with less than 256MB of RAM, and no overide @@ -443,8 +443,8 @@ MmSizeOfNonPagedPoolInBytes); MmNonPagedPoolStart = (PVOID)PAGE_ALIGN(MmNonPagedPoolStart); NonPagedPoolExpansionVa = MmNonPagedPoolStart; - DPRINT1("NP Pool has been tuned to: %d bytes and %d bytes\n", - MmSizeOfNonPagedPoolInBytes, MmMaximumNonPagedPoolInBytes); + DPRINT("NP Pool has been tuned to: %d bytes and %d bytes\n", + MmSizeOfNonPagedPoolInBytes, MmMaximumNonPagedPoolInBytes); // // Now calculate the nonpaged system VA region, which includes the @@ -488,9 +488,6 @@ // // Non paged pool comes after the PFN database // - DPRINT1("System PTE VA starts at: %p\n", MmNonPagedSystemStart); - DPRINT1("NP Expansion VA begins at: %p and ends at: %p\n", - MmNonPagedPoolStart, MmNonPagedPoolEnd); MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmArmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT)); @@ -505,14 +502,16 @@ BoundaryAddressMultiple, FALSE); ASSERT(PageFrameIndex != 0); - DPRINT1("PFN DB VA begins at: %p and ends at: %p\n", + DPRINT1(" 0x%p - 0x%p\t%s\n", MmArmPfnDatabase, - (ULONG_PTR)MmArmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT)); - DPRINT1("PFN DB PA PFN begins at: %lx\n", PageFrameIndex); - DPRINT1("NP VA begins at: %p and ends at: %p\n", + (ULONG_PTR)MmArmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), + "Shadow PFN Database"); + DPRINT("PFN DB PA PFN begins at: %lx\n", PageFrameIndex); + DPRINT1(" 0x%p - 0x%p\t%s\n", MmNonPagedPoolStart, - (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes); - DPRINT1("NP PA PFN begins at: %lx\n", PageFrameIndex + MxPfnAllocation); + (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, + "ARM Non Paged Pool"); + DPRINT("NP PA PFN begins at: %lx\n", PageFrameIndex + MxPfnAllocation); // // Now we need some pages to create the page tables for the NP system VA @@ -582,6 +581,12 @@ // Now remember where the expansion starts // MmNonPagedPoolExpansionStart = NonPagedPoolExpansionVa; + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, + "System PTE Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, + "Non Paged Pool Expansion PTE Space"); // // Last step is to actually map the nonpaged pool @@ -650,8 +655,8 @@ MmNumberOfSystemPtes = MiAddressToPte(MmNonPagedPoolExpansionStart) - PointerPte; MmNumberOfSystemPtes--; - DPRINT1("Final System PTE count: %d (%d bytes)\n", - MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); + DPRINT("Final System PTE count: %d (%d bytes)\n", + MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); // // Create the system PTE space @@ -691,7 +696,6 @@ // MiFirstReservedZeroingPte = MiReserveSystemPtes(MI_ZERO_PTES, SystemPteSpace); - DPRINT1("ZERO PTEs are at: %p\n", MiFirstReservedZeroingPte); RtlZeroMemory(MiFirstReservedZeroingPte, MI_ZERO_PTES * sizeof(MMPTE)); // @@ -731,9 +735,9 @@ // PPHYSICAL_MEMORY_RUN Run; Run = &MmPhysicalMemoryBlock->Run[i]; - DPRINT1("PHYSICAL RAM [0x%08p to 0x%08p]\n", - Run->BasePage << PAGE_SHIFT, - (Run->BasePage + Run->PageCount) << PAGE_SHIFT); + DPRINT("PHYSICAL RAM [0x%08p to 0x%08p]\n", + Run->BasePage << PAGE_SHIFT, + (Run->BasePage + Run->PageCount) << PAGE_SHIFT); } } Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Tue Jun 30 14:38:51 2009 @@ -339,8 +339,8 @@ MmSystemPteBase = (PVOID)PAGETABLE_MAP; MmSystemPtesStart[PoolType] = StartingPte; MmSystemPtesEnd[PoolType] = StartingPte + NumberOfPtes - 1; - DPRINT1("System PTE space for %d starting at: %p and ending at: %p\n", - PoolType, MmSystemPtesStart[PoolType], MmSystemPtesEnd[PoolType]); + DPRINT("System PTE space for %d starting at: %p and ending at: %p\n", + PoolType, MmSystemPtesStart[PoolType], MmSystemPtesEnd[PoolType]); // // Clear all the PTEs to start with

1 0

[ros-arm-bringup] 41708: - Rewrite MmAllocateNonCachedMemory and MmFreeNonCachedMemory to use the new functionality present in ARM3. - These functions now use the MDL routines to allocate their physical memory, since the constraints and requirements are identical as for a non-cached MDL mapping. - As for the virtual address space, it is guaranteed once again by System PTEs! - If it's not getting old already, optimizations to the System PTE code will, yet again, yield improvements here as well. -
by ros-arm-bringup＠svn.reactos.org 30 Jun '09

30 Jun '09

Author: ros-arm-bringup Date: Tue Jun 30 12:55:18 2009 New Revision: 41708 URL: http://svn.reactos.org/svn/reactos?rev=41708&view=rev Log: - Rewrite MmAllocateNonCachedMemory and MmFreeNonCachedMemory to use the new functionality present in ARM3. - These functions now use the MDL routines to allocate their physical memory, since the constraints and requirements are identical as for a non-cached MDL mapping. - As for the virtual address space, it is guaranteed once again by System PTEs! - If it's not getting old already, optimizations to the System PTE code will, yet again, yield improvements here as well. - This is the last large kernel-facing memory allocator that needed updating to use System PTEs instead. - Only the pool allocator remains (which, for nonpaged pool, also uses System PTEs, present in the nonpaged pool expansion VA). - That effort will take significantly longer. Added: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c - copied, changed from r41647, trunk/reactos/ntoskrnl/mm/ncache.c Removed: trunk/reactos/ntoskrnl/mm/ncache.c Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Copied: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c (from r41647, trunk/reactos/ntoskrnl/mm/ncache.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/ncache.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Tue Jun 30 12:55:18 2009 @@ -1,128 +1,214 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/ncache.c - * PURPOSE: Manages non-cached memory - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/ncache.c + * PURPOSE: ARM Memory Manager Noncached Memory Allocator + * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> -/* FUNCTIONS *****************************************************************/ - - -/********************************************************************** - * NAME EXPORTED - * MmAllocateNonCachedMemory@4 - * - * DESCRIPTION - * Allocates a virtual address range of noncached and cache - * aligned memory. - * - * ARGUMENTS - * NumberOfBytes - * Size of region to allocate. - * - * RETURN VALUE - * The base address of the range on success; - * NULL on failure. - * - * NOTE - * Description taken from include/ddk/mmfuncs.h. - * Code taken from ntoskrnl/mm/special.c. - * - * REVISIONS - * +#line 15 "ARMÂ³::NCACHE" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +/* * @implemented */ -PVOID NTAPI +PVOID +NTAPI MmAllocateNonCachedMemory(IN ULONG NumberOfBytes) { - PVOID Result; - MEMORY_AREA* marea; - NTSTATUS Status; - ULONG Protect = PAGE_READWRITE|PAGE_SYSTEM|PAGE_NOCACHE|PAGE_WRITETHROUGH; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - - BoundaryAddressMultiple.QuadPart = 0; - MmLockAddressSpace(MmGetKernelAddressSpace()); - Result = NULL; - Status = MmCreateMemoryArea (MmGetKernelAddressSpace(), - MEMORY_AREA_NO_CACHE, - &Result, + PFN_NUMBER PageCount, MdlPageCount, PageFrameIndex; + PHYSICAL_ADDRESS LowAddress, HighAddress, SkipBytes; + MI_PFN_CACHE_ATTRIBUTE CacheAttribute; + PMDL Mdl; + PVOID BaseAddress; + PPFN_NUMBER MdlPages; + PMMPTE PointerPte; + MMPTE TempPte; + + // + // Get the page count + // + ASSERT(NumberOfBytes != 0); + PageCount = BYTES_TO_PAGES(NumberOfBytes); + + // + // Use the MDL allocator for simplicity, so setup the parameters + // + LowAddress.QuadPart = 0; + HighAddress.QuadPart = -1; + SkipBytes.QuadPart = 0; + CacheAttribute = MiPlatformCacheAttributes[0][MmNonCached]; + + // + // Now call the MDL allocator + // + Mdl = MiAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, NumberOfBytes, - Protect, - &marea, - FALSE, - 0, - BoundaryAddressMultiple); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Allocating marea for noncached mem failed with Status " - "0x%08X\n", Status); - return (NULL); - } - - /* Create a virtual mapping for this memory area */ - MmMapMemoryArea(Result, NumberOfBytes, MC_NPPOOL, Protect); - - return ((PVOID)Result); + CacheAttribute, + 0); + if (!Mdl) return NULL; + + // + // Get the MDL VA and check how many pages we got (could be partial) + // + BaseAddress = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); + MdlPageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(BaseAddress, Mdl->ByteCount); + if (PageCount != MdlPageCount) + { + // + // Unlike MDLs, partial isn't okay for a noncached allocation, so fail + // + ASSERT(PageCount > MdlPageCount); + MmFreePagesFromMdl(Mdl); + ExFreePool(Mdl); + return NULL; + } + + // + // Allocate system PTEs for the base address + // We use an extra page to store the actual MDL pointer for the free later + // + PointerPte = MiReserveSystemPtes(PageCount + 1, SystemPteSpace); + if (!PointerPte) + { + // + // Out of memory... + // + MmFreePagesFromMdl(Mdl); + ExFreePool(Mdl); + return NULL; + } + + // + // Store the MDL pointer + // + *(PMDL*)PointerPte++ = Mdl; + + // + // Okay, now see what range we got + // + BaseAddress = MiPteToAddress(PointerPte); + + // + // This is our array of pages + // + MdlPages = (PPFN_NUMBER)(Mdl + 1); + + // + // Setup the template PTE + // + TempPte = HyperTemplatePte; + + // + // Now check what kind of caching we should use + // + switch (CacheAttribute) + { + case MiNonCached: + + // + // Disable caching + // + TempPte.u.Hard.CacheDisable = 1; + TempPte.u.Hard.WriteThrough = 1; + break; + + case MiWriteCombined: + + // + // Enable write combining + // + TempPte.u.Hard.CacheDisable = 1; + TempPte.u.Hard.WriteThrough = 0; + break; + + default: + // + // Nothing to do + // + break; + } + + // + // Now loop the MDL pages + // + do + { + // + // Get the PFN + // + PageFrameIndex = *MdlPages++; + + // + // Set the PFN in the page and write it + // + TempPte.u.Hard.PageFrameNumber = PageFrameIndex; + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPte++ = TempPte; + } while (--PageCount); + + // + // Return the base address + // + return BaseAddress; + } -static VOID -MmFreeNonCachedPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, - PFN_TYPE Page, SWAPENTRY SwapEntry, - BOOLEAN Dirty) -{ - ASSERT(SwapEntry == 0); - if (Page != 0) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Page); - } -} - -/********************************************************************** - * NAME EXPORTED - * MmFreeNonCachedMemory@8 - * - * DESCRIPTION - * Releases a range of noncached memory allocated with - * MmAllocateNonCachedMemory. - * - * ARGUMENTS - * BaseAddress - * Virtual address to be freed; - * - * NumberOfBytes - * Size of the region to be freed. - * - * RETURN VALUE - * None. - * - * NOTE - * Description taken from include/ddk/mmfuncs.h. - * Code taken from ntoskrnl/mm/special.c. - * - * REVISIONS - * +/* * @implemented */ -VOID NTAPI MmFreeNonCachedMemory (IN PVOID BaseAddress, - IN ULONG NumberOfBytes) +VOID +NTAPI +MmFreeNonCachedMemory(IN PVOID BaseAddress, + IN ULONG NumberOfBytes) { - MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), - BaseAddress, - MmFreeNonCachedPage, - NULL); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + PMDL Mdl; + PMMPTE PointerPte; + PFN_NUMBER PageCount; + + // + // Sanity checks + // + ASSERT(NumberOfBytes != 0); + ASSERT(PAGE_ALIGN(BaseAddress) == BaseAddress); + + // + // Get the page count + // + PageCount = BYTES_TO_PAGES(NumberOfBytes); + + // + // Get the first PTE + // + PointerPte = MiAddressToPte(BaseAddress); + + // + // Remember this is where we store the shadow MDL pointer + // + Mdl = *(PMDL*)(--PointerPte); + + // + // Kill the MDL (and underlying pages) + // + MmFreePagesFromMdl(Mdl); + ExFreePool(Mdl); + + // + // Now free the system PTEs for the underlying VA + // + MiReleaseSystemPtes(PointerPte, PageCount + 1, SystemPteSpace); } /* EOF */ Removed: trunk/reactos/ntoskrnl/mm/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ncache.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ncache.c (removed) @@ -1,128 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/ncache.c - * PURPOSE: Manages non-cached memory - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - - -/********************************************************************** - * NAME EXPORTED - * MmAllocateNonCachedMemory@4 - * - * DESCRIPTION - * Allocates a virtual address range of noncached and cache - * aligned memory. - * - * ARGUMENTS - * NumberOfBytes - * Size of region to allocate. - * - * RETURN VALUE - * The base address of the range on success; - * NULL on failure. - * - * NOTE - * Description taken from include/ddk/mmfuncs.h. - * Code taken from ntoskrnl/mm/special.c. - * - * REVISIONS - * - * @implemented - */ -PVOID NTAPI -MmAllocateNonCachedMemory(IN ULONG NumberOfBytes) -{ - PVOID Result; - MEMORY_AREA* marea; - NTSTATUS Status; - ULONG Protect = PAGE_READWRITE|PAGE_SYSTEM|PAGE_NOCACHE|PAGE_WRITETHROUGH; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - - BoundaryAddressMultiple.QuadPart = 0; - MmLockAddressSpace(MmGetKernelAddressSpace()); - Result = NULL; - Status = MmCreateMemoryArea (MmGetKernelAddressSpace(), - MEMORY_AREA_NO_CACHE, - &Result, - NumberOfBytes, - Protect, - &marea, - FALSE, - 0, - BoundaryAddressMultiple); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Allocating marea for noncached mem failed with Status " - "0x%08X\n", Status); - return (NULL); - } - - /* Create a virtual mapping for this memory area */ - MmMapMemoryArea(Result, NumberOfBytes, MC_NPPOOL, Protect); - - return ((PVOID)Result); -} - -static VOID -MmFreeNonCachedPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, - PFN_TYPE Page, SWAPENTRY SwapEntry, - BOOLEAN Dirty) -{ - ASSERT(SwapEntry == 0); - if (Page != 0) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Page); - } -} - -/********************************************************************** - * NAME EXPORTED - * MmFreeNonCachedMemory@8 - * - * DESCRIPTION - * Releases a range of noncached memory allocated with - * MmAllocateNonCachedMemory. - * - * ARGUMENTS - * BaseAddress - * Virtual address to be freed; - * - * NumberOfBytes - * Size of the region to be freed. - * - * RETURN VALUE - * None. - * - * NOTE - * Description taken from include/ddk/mmfuncs.h. - * Code taken from ntoskrnl/mm/special.c. - * - * REVISIONS - * - * @implemented - */ -VOID NTAPI MmFreeNonCachedMemory (IN PVOID BaseAddress, - IN ULONG NumberOfBytes) -{ - MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), - BaseAddress, - MmFreeNonCachedPage, - NULL); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Jun 30 12:55:18 2009 @@ -367,6 +367,7 @@ <file>init.c</file> <file>iosup.c</file> <file>mdlsup.c</file> + <file>ncache.c</file> <file>pool.c</file> <file>procsup.c</file> <file>syspte.c</file> @@ -380,7 +381,6 @@ <file>mmsup.c</file> <file>mminit.c</file> <file>mpw.c</file> - <file>ncache.c</file> <file>npool.c</file> <file>pagefile.c</file> <file>pageop.c</file>

1 0

[ros-arm-bringup] 41707: - Major rewrite of Memory Descriptor List (MDL) implementation (moving it towards using System PTEs). - MmCreateMdl, MmSizeOfMdl: No Change. - MmBuildMdlForNonPagedPool: Do not use MmGetPfnForProcess, just normal PMMPTE manipulation. - This seems to cause issues in certain scenarios, because in ReactOS, nonpaged pool, a resident and guaranteed resources, does not always have its PDEs mapped! - By calling MmGetPfnForProcess, this wound up in the annals of ReactOS mm code,
by ros-arm-bringup＠svn.reactos.org 30 Jun '09

30 Jun '09

Author: ros-arm-bringup Date: Tue Jun 30 12:29:22 2009 New Revision: 41707 URL: http://svn.reactos.org/svn/reactos?rev=41707&view=rev Log: - Major rewrite of Memory Descriptor List (MDL) implementation (moving it towards using System PTEs). - MmCreateMdl, MmSizeOfMdl: No Change. - MmBuildMdlForNonPagedPool: Do not use MmGetPfnForProcess, just normal PMMPTE manipulation. - This seems to cause issues in certain scenarios, because in ReactOS, nonpaged pool, a resident and guaranteed resources, does not always have its PDEs mapped! - By calling MmGetPfnForProcess, this wound up in the annals of ReactOS mm code, which lazy-remapped the PDE. We detected this issue specifically in the cache manager, and fixed it there. It should not appear anywhere else. - MmAllocatePagesForMdl, MmAllocatePagesForMdlEx, MmFreePagesFromMdl: - The *Ex function is now implemented. - Allocating pages now uses MiAllocatePagesForMdl, which is based on the older MmAllocPagesSpecifyRange. - The code is cleaner, better commented, and better handles partial MDLs. - Cache flags are still ignored (so the Ex functionality isn't really there). - MmMapLockedPages, MmMapLockedPagesSpecifyCache, MmUnmapLockedPages: - These functions now use System PTEs for the mappings, instead of the hacked-up "MDL Mapping Space". - This frees up 256MB of Kernel Virtual Address Space. - Takes advantage of all System PTE functionality. - Once again, optimizations in the System PTE code will be felt here. - For user-space mappings however, the old code is still kept and used. - MiMapLockedPagesInUserSpace and MiUnMapLockedPagesInUserSpace are now in virtual.c and provide this. - MmProbeAndLockPages, MmUnlockPages: - The pages are actually probed now, in SEH. This did not seem to happen before (did someone misread the function's name?) - Probe for write is only done for write access to user pages (as documented). - We do not probe/check for write access for kernel requests (force Operation to be IoReadAccess). - Proper locking is used now: Address Space lock for user mappings, PFN lock for kernel mappings. - Faulting in pages (to make them available before locking) is now done outside the address space/PFN lock. - You don't want to be holding a spinlock/mutex while doing disk I/O! - For write/modify access, if the PTE is not writable, fail the request since the PTE protection overrides. - However, if the PTE is writable but also copy on write, then we'll fault the page in for write access, which is a legitimate operation for certain user-mode scenarios. - The old version always provided the CopyOnWrite behavior, even for non-CopyOnWrite pages! - Reference and lock every valid page that has a PFN entry (non-I/O Pages). - The older code did not seem to lock pages that had to be faulted in (weren't already valid). - Cleanup the cleanup code (no pun intended). Because we now mark the pages as locked early-on, and because of changes in MmUnlockPages, we can simply use MmUnlockPages in case of error, since it will be able to fully back-out and references/locks that we did. - Previous code attempted to do this on its own, in a pretty inconsistent manner, which would leave page leaks (both in references and lock count). - In MmUnlockPages, not as many changes, but we now: - Still make sure that an I/O Mapping MDL doesn't have valid PFN database pages (non-I/O). - An MDL can cover pages that are both I/O mapped and RAM mapped, so we have to unlock/dereference the latter instead of skipping them as the old code did. - Use the PFN lock when checking pages and unlocking/dereferencing them. - Overall, non-complete MDLs are now marked by having a -1 PFN, and the MDL code has been updated to early-break out of page-scanning loops and/or ignore such pages, which can happen in a sparse MDL. - Implementation has been tested on VMWare and QEMU for a variety of tasks and was found to be reliable and stable. Added: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c - copied, changed from r41188, trunk/reactos/ntoskrnl/mm/mdlsup.c Removed: trunk/reactos/ntoskrnl/mm/mdlsup.c Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=417… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Jun 30 12:29:22 2009 @@ -246,6 +246,17 @@ if (Size > CacheSeg->Bcb->CacheSegmentSize) { Size = CacheSeg->Bcb->CacheSegmentSize; + } + // + // Nonpaged pool PDEs in ReactOS must actually be synchronized between the + // MmGlobalPageDirectory and the real system PDE directory. What a mess... + // + { + int i = 0; + do + { + MmGetPfnForProcess(NULL, (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i << PAGE_SHIFT))); + } while (++i < (Size >> PAGE_SHIFT)); } Mdl = alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); Copied: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c (from r41188, trunk/reactos/ntoskrnl/mm/mdlsup.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Tue Jun 30 12:29:22 2009 @@ -1,78 +1,22 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/mdl.c - * PURPOSE: Manipulates MDLs - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES ****************************************************************/ + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/mdlsup.c + * PURPOSE: ARM Memory Manager Memory Descriptor List (MDL) Management + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitializeMdlImplementation) -#endif - -/* GLOBALS *******************************************************************/ - -#define TAG_MDL TAG('M', 'D', 'L', ' ') -#define MI_MDL_MAPPING_REGION_SIZE (256*1024*1024) - -PVOID MiMdlMappingRegionBase = NULL; -RTL_BITMAP MiMdlMappingRegionAllocMap; -ULONG MiMdlMappingRegionHint; -KSPIN_LOCK MiMdlMappingRegionLock; -extern ULONG MmPageArraySize; - -/* PRIVATE FUNCTIONS **********************************************************/ - -VOID -INIT_FUNCTION -NTAPI -MmInitializeMdlImplementation(VOID) -{ - MEMORY_AREA* Result; - NTSTATUS Status; - PVOID Buffer; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - - BoundaryAddressMultiple.QuadPart = 0; - MiMdlMappingRegionHint = 0; - MiMdlMappingRegionBase = NULL; - - MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_MDL_MAPPING, - &MiMdlMappingRegionBase, - MI_MDL_MAPPING_REGION_SIZE, - PAGE_READWRITE, - &Result, - FALSE, - 0, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - KeBugCheck(MEMORY_MANAGEMENT); - } - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - Buffer = ExAllocatePoolWithTag(NonPagedPool, - MI_MDL_MAPPING_REGION_SIZE / (PAGE_SIZE * 8), - TAG_MDL); - - RtlInitializeBitMap(&MiMdlMappingRegionAllocMap, Buffer, MI_MDL_MAPPING_REGION_SIZE / PAGE_SIZE); - RtlClearAllBits(&MiMdlMappingRegionAllocMap); - - KeInitializeSpinLock(&MiMdlMappingRegionLock); -} +#line 15 "ARMÂ³::MDLSUP" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" /* PUBLIC FUNCTIONS ***********************************************************/ - /* * @implemented @@ -85,19 +29,23 @@ { ULONG Size; - /* Check if we don't have an MDL built */ + // + // Check if we don't have an MDL built + // if (!Mdl) { - /* Calcualte the size we'll need and allocate the MDL */ + // + // Calculate the size we'll need and allocate the MDL + // Size = MmSizeOfMdl(Base, Length); Mdl = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_MDL); if (!Mdl) return NULL; } - /* Initialize it */ + // + // Initialize it + // MmInitializeMdl(Mdl, Base, Length); - DPRINT("Creating MDL: %p\n", Mdl); - DPRINT("Base: %p. Length: %lx\n", Base, Length); return Mdl; } @@ -109,8 +57,11 @@ MmSizeOfMdl(IN PVOID Base, IN ULONG Length) { - /* Return the MDL size */ - return sizeof(MDL) + (ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Length) * sizeof(PFN_NUMBER)); + // + // Return the MDL size + // + return sizeof(MDL) + + (ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Length) * sizeof(PFN_NUMBER)); } /* @@ -120,41 +71,137 @@ NTAPI MmBuildMdlForNonPagedPool(IN PMDL Mdl) { - ULONG i; - ULONG PageCount; - PPFN_NUMBER MdlPages; + PPFN_NUMBER MdlPages, EndPage; + PFN_NUMBER Pfn, PageCount; PVOID Base; - DPRINT("Building MDL: %p\n", Mdl); - - /* Sanity checks */ + PMMPTE PointerPte; + + // + // Sanity checks + // ASSERT(Mdl->ByteCount != 0); ASSERT((Mdl->MdlFlags & (MDL_PAGES_LOCKED | MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL | - MDL_PARTIAL)) == 0); - - /* We know the MDL isn't associated to a process now */ + MDL_PARTIAL)) == 0); + + // + // We know the MDL isn't associated to a process now + // Mdl->Process = NULL; - /* Get page and VA information */ + // + // Get page and VA information + // MdlPages = (PPFN_NUMBER)(Mdl + 1); Base = Mdl->StartVa; - /* Set the system address and now get the page count */ + // + // Set the system address and now get the page count + // Mdl->MappedSystemVa = (PVOID)((ULONG_PTR)Base + Mdl->ByteOffset); - PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Mdl->MappedSystemVa, Mdl->ByteCount); + PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Mdl->MappedSystemVa, + Mdl->ByteCount); ASSERT(PageCount != 0); - - /* Go through each page */ - for (i = 0; i < PageCount; i++) - { - /* Map it */ - *MdlPages++ = MmGetPfnForProcess(NULL, - (PVOID)((ULONG_PTR)Base + (i * PAGE_SIZE))); - } - - /* Set the final flag */ + EndPage = MdlPages + PageCount; + + // + // Loop the PTEs + // + PointerPte = MiAddressToPte(Base); + do + { + // + // Write the PFN + // + Pfn = PFN_FROM_PTE(PointerPte++); + *MdlPages++ = Pfn; + } while (MdlPages < EndPage); + + // + // Set the nonpaged pool flag + // Mdl->MdlFlags |= MDL_SOURCE_IS_NONPAGED_POOL; + + // + // Check if this is an I/O mapping + // + if (Pfn > MmHighestPhysicalPage) Mdl->MdlFlags |= MDL_IO_SPACE; +} + +/* + * @implemented + */ +PMDL +NTAPI +MmAllocatePagesForMdl(IN PHYSICAL_ADDRESS LowAddress, + IN PHYSICAL_ADDRESS HighAddress, + IN PHYSICAL_ADDRESS SkipBytes, + IN SIZE_T TotalBytes) +{ + // + // Call the internal routine + // + return MiAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + TotalBytes, + MiNotMapped, + 0); +} + +/* + * @implemented + */ +PMDL +NTAPI +MmAllocatePagesForMdlEx(IN PHYSICAL_ADDRESS LowAddress, + IN PHYSICAL_ADDRESS HighAddress, + IN PHYSICAL_ADDRESS SkipBytes, + IN SIZE_T TotalBytes, + IN MEMORY_CACHING_TYPE CacheType, + IN ULONG Flags) +{ + MI_PFN_CACHE_ATTRIBUTE CacheAttribute; + + // + // Check for invalid cache type + // + if (CacheType > MmWriteCombined) + { + // + // Normalize to default + // + CacheAttribute = MiNotMapped; + } + else + { + // + // Conver to internal caching attribute + // + CacheAttribute = MiPlatformCacheAttributes[FALSE][CacheType]; + } + + // + // Only these flags are allowed + // + if (Flags & ~(MM_DONT_ZERO_ALLOCATION | MM_ALLOCATE_FROM_LOCAL_NODE_ONLY)) + { + // + // Silently fail + // + return NULL; + } + + // + // Call the internal routine + // + return MiAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + TotalBytes, + CacheAttribute, + Flags); } /* @@ -167,27 +214,227 @@ PVOID Base; PPFN_NUMBER Pages; LONG NumberOfPages; + PMMPFN Pfn1; DPRINT("Freeing MDL: %p\n", Mdl); - /* Sanity checks */ + // + // Sanity checks + // ASSERT(KeGetCurrentIrql() <= APC_LEVEL); ASSERT((Mdl->MdlFlags & MDL_IO_SPACE) == 0); ASSERT(((ULONG_PTR)Mdl->StartVa & (PAGE_SIZE - 1)) == 0); - /* Get address and page information */ + // + // Get address and page information + // Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); NumberOfPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); - /* Loop all the MDL pages */ + // + // Loop all the MDL pages + // Pages = (PPFN_NUMBER)(Mdl + 1); - while (--NumberOfPages >= 0) - { - /* Dereference each one of them */ - MmDereferencePage(Pages[NumberOfPages]); - } - - /* Remove the pages locked flag */ + do + { + // + // Reached the last page + // + if (*Pages == -1) break; + + // + // Sanity check + // + ASSERT(*Pages <= MmHighestPhysicalPage); + + // + // Get the page entry + // + Pfn1 = MiGetPfnEntry(*Pages); + ASSERT(Pfn1->u3.ReferenceCount == 1); + + // + // Clear it + // + Pfn1->u3.e1.StartOfAllocation = 0; + Pfn1->u3.e1.EndOfAllocation = 0; + + // + // Dereference it + // + MmDereferencePage(*Pages); + + // + // Clear this page and move on + // + *Pages++ = -1; + } while (--NumberOfPages != 0); + + // + // Remove the pages locked flag + // Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; +} + +/* + * @implemented + */ +PVOID +NTAPI +MmMapLockedPagesSpecifyCache(IN PMDL Mdl, + IN KPROCESSOR_MODE AccessMode, + IN MEMORY_CACHING_TYPE CacheType, + IN PVOID BaseAddress, + IN ULONG BugCheckOnFailure, + IN MM_PAGE_PRIORITY Priority) +{ + PVOID Base; + PPFN_NUMBER MdlPages, LastPage; + PFN_NUMBER PageCount; + BOOLEAN IsIoMapping; + MI_PFN_CACHE_ATTRIBUTE CacheAttribute; + PMMPTE PointerPte; + MMPTE TempPte; + + // + // Sanity check + // + ASSERT(Mdl->ByteCount != 0); + + // + // Get the base + // + Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); + + // + // Handle kernel case first + // + if (AccessMode == KernelMode) + { + // + // Get the list of pages and count + // + MdlPages = (PPFN_NUMBER)(Mdl + 1); + PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); + LastPage = MdlPages + PageCount; + + // + // Sanity checks + // + ASSERT((Mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | + MDL_SOURCE_IS_NONPAGED_POOL | + MDL_PARTIAL_HAS_BEEN_MAPPED)) == 0); + ASSERT((Mdl->MdlFlags & (MDL_PAGES_LOCKED | MDL_PARTIAL)) != 0); + + // + // Get the correct cache type + // + IsIoMapping = Mdl->MdlFlags & MDL_IO_SPACE; + CacheAttribute = MiPlatformCacheAttributes[IsIoMapping][CacheType]; + + // + // Reserve the PTEs + // + PointerPte = MiReserveSystemPtes(PageCount, SystemPteSpace); + if (!PointerPte) + { + // + // If it can fail, return NULL + // + if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) return NULL; + + // + // Should we bugcheck? + // + if (!BugCheckOnFailure) return NULL; + + // + // Yes, crash the system + // + KeBugCheckEx(NO_MORE_SYSTEM_PTES, 0, PageCount, 0, 0); + } + + // + // Get the mapped address + // + Base = (PVOID)((ULONG_PTR)MiPteToAddress(PointerPte) + Mdl->ByteOffset); + + // + // Get the template + // + TempPte = HyperTemplatePte; + switch (CacheAttribute) + { + case MiNonCached: + + // + // Disable caching + // + TempPte.u.Hard.CacheDisable = 1; + TempPte.u.Hard.WriteThrough = 1; + break; + + case MiWriteCombined: + + // + // Enable write combining + // + TempPte.u.Hard.CacheDisable = 1; + TempPte.u.Hard.WriteThrough = 0; + break; + + default: + // + // Nothing to do + // + break; + } + + // + // Loop all PTEs + // + do + { + // + // We're done here + // + if (*MdlPages == -1) break; + + // + // Write the PTE + // + ASSERT(PointerPte->u.Hard.Valid == 0); + TempPte.u.Hard.PageFrameNumber = *MdlPages; + *PointerPte++ = TempPte; + } while (++MdlPages < LastPage); + + // + // Mark it as mapped + // + ASSERT((Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) == 0); + Mdl->MappedSystemVa = Base; + Mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA; + + // + // Check if it was partial + // + if (Mdl->MdlFlags & MDL_PARTIAL) + { + // + // Write the appropriate flag here too + // + Mdl->MdlFlags |= MDL_PARTIAL_HAS_BEEN_MAPPED; + } + + // + // Return the mapped address + // + return Base; + } + + // + // In user-mode, let ReactOS do it + // + return MiMapLockedPagesInUserSpace(Mdl, Base, CacheType, BaseAddress); } /* @@ -198,7 +445,9 @@ MmMapLockedPages(IN PMDL Mdl, IN KPROCESSOR_MODE AccessMode) { - /* Call the extended version */ + // + // Call the extended version + // return MmMapLockedPagesSpecifyCache(Mdl, AccessMode, MmCached, @@ -212,169 +461,88 @@ */ VOID NTAPI -MmUnlockPages(IN PMDL Mdl) -{ - ULONG i; - PPFN_NUMBER MdlPages; - PFN_NUMBER Page; - PEPROCESS Process; - PVOID Base; - ULONG Flags, PageCount; - DPRINT("Unlocking MDL: %p\n", Mdl); - - /* Sanity checks */ - ASSERT((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0); - ASSERT((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0); - ASSERT((Mdl->MdlFlags & MDL_PARTIAL) == 0); - ASSERT(Mdl->ByteCount != 0); - - /* Get the process associated and capture the flags which are volatile */ - Process = Mdl->Process; - Flags = Mdl->MdlFlags; - - /* Automagically undo any calls to MmGetSystemAddressForMdl's for this mdl */ - if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) - { - /* Unmap the pages from system spage */ - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - - /* Get the page count */ - MdlPages = (PPFN_NUMBER)(Mdl + 1); - Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); - PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); - ASSERT(PageCount != 0); - - /* We don't support AWE */ - if (Flags & MDL_DESCRIBES_AWE) ASSERT(FALSE); - - /* Check if the buffer is mapped I/O space */ - if (Flags & MDL_IO_SPACE) - { - /* Check if this was a wirte */ - if (Flags & MDL_WRITE_OPERATION) - { - /* Windows keeps track of the modified bit */ - } - - /* Check if we have a process */ - if (Process) - { - /* Handle the accounting of locked pages */ - ASSERT(Process->NumberOfLockedPages > 0); - InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages, - -PageCount); - } - - /* We're done */ - Mdl->MdlFlags &= ~MDL_IO_SPACE; - Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; - return; - } - - /* Check if we have a process */ - if (Process) - { - /* Handle the accounting of locked pages */ - ASSERT(Process->NumberOfLockedPages > 0); - InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages, - -PageCount); - } - - /* Scan each page */ - for (i = 0; i < PageCount; i++) - { - /* Get the page entry */ - - /* Unlock and dereference it */ - Page = MdlPages[i]; - MmUnlockPage(Page); - MmDereferencePage(Page); - } - - /* We're done */ - Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; -} - -/* - * @implemented - */ -VOID -NTAPI MmUnmapLockedPages(IN PVOID BaseAddress, IN PMDL Mdl) { - KIRQL oldIrql; - ULONG i, PageCount; - ULONG Base; - MEMORY_AREA *MemoryArea; - DPRINT("Unmapping MDL: %p\n", Mdl); - DPRINT("Base: %p\n", BaseAddress); - - /* Sanity check */ + PVOID Base; + PFN_NUMBER PageCount; + PPFN_NUMBER MdlPages; + PMMPTE PointerPte; + + // + // Sanity check + // ASSERT(Mdl->ByteCount != 0); - /* Check if this is a kernel request */ + // + // Check if this is a kernel request + // if (BaseAddress > MM_HIGHEST_USER_ADDRESS) { - /* Get base and count information */ - Base = (ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset; + // + // Get base and count information + // + Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); - - /* Sanity checks */ + + // + // Sanity checks + // ASSERT((Mdl->MdlFlags & MDL_PARENT_MAPPED_SYSTEM_VA) == 0); ASSERT(PageCount != 0); ASSERT(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA); - /* ReactOS does not support this flag */ - if (Mdl->MdlFlags & MDL_FREE_EXTRA_PTES) ASSERT(FALSE); - - /* Remove flags */ + // + // Get the PTE + // + PointerPte = MiAddressToPte(BaseAddress); + ASSERT(PointerPte >= MmSystemPtesStart[SystemPteSpace]); + ASSERT(PointerPte <= MmSystemPtesEnd[SystemPteSpace]); + + // + // Check if the caller wants us to free advanced pages + // + if (Mdl->MdlFlags & MDL_FREE_EXTRA_PTES) + { + // + // Get the MDL page array + // + MdlPages = (PPFN_NUMBER)(Mdl + 1); + MdlPages += PageCount; + + // + // Do the math + // + PageCount += *MdlPages; + PointerPte -= *MdlPages; + ASSERT(PointerPte >= MmSystemPtesStart[SystemPteSpace]); + ASSERT(PointerPte <= MmSystemPtesEnd[SystemPteSpace]); + + // + // Get the new base address + // + BaseAddress = (PVOID)((ULONG_PTR)BaseAddress - + ((*MdlPages) << PAGE_SHIFT)); + } + + // + // Remove flags + // Mdl->MdlFlags &= ~(MDL_MAPPED_TO_SYSTEM_VA | MDL_PARTIAL_HAS_BEEN_MAPPED | MDL_FREE_EXTRA_PTES); - /* If we came from non-paged pool, on ReactOS, we can leave */ - if (Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) return; - - /* Loop each page */ - BaseAddress = PAGE_ALIGN(BaseAddress); - for (i = 0; i < PageCount; i++) - { - /* Delete it */ - MmDeleteVirtualMapping(NULL, - (PVOID)((ULONG_PTR)BaseAddress + (i * PAGE_SIZE)), - FALSE, - NULL, - NULL); - } - - /* Lock the mapping region */ - KeAcquireSpinLock(&MiMdlMappingRegionLock, &oldIrql); - - /* Deallocate all the pages used. */ - Base = ((ULONG_PTR)BaseAddress - (ULONG_PTR)MiMdlMappingRegionBase) / PAGE_SIZE; - RtlClearBits(&MiMdlMappingRegionAllocMap, Base, PageCount); - MiMdlMappingRegionHint = min(MiMdlMappingRegionHint, Base); - - /* Release the lock */ - KeReleaseSpinLock(&MiMdlMappingRegionLock, oldIrql); + // + // Release the system PTEs + // + MiReleaseSystemPtes(PointerPte, PageCount, SystemPteSpace); } else { - /* Sanity check */ - ASSERT(Mdl->Process == PsGetCurrentProcess()); - - /* Find the memory area */ - MemoryArea = MmLocateMemoryAreaByAddress(&Mdl->Process->Vm, - BaseAddress); - ASSERT(MemoryArea); - - /* Free it */ - MmFreeMemoryArea(&Mdl->Process->Vm, - MemoryArea, - NULL, - NULL); + // + // Let ReactOS handle it + // + MiUnmapLockedPagesInUserSpace(BaseAddress, Mdl); } } @@ -388,18 +556,23 @@ IN LOCK_OPERATION Operation) { PPFN_TYPE MdlPages; - PVOID Base, Address; - ULONG i, j; - ULONG NrPages; + PVOID Base, Address, LastAddress, StartAddress; + ULONG LockPages, TotalPages; NTSTATUS Status = STATUS_SUCCESS; - PFN_TYPE Page; PEPROCESS CurrentProcess; PETHREAD Thread; PMMSUPPORT AddressSpace; - KIRQL OldIrql = KeGetCurrentIrql(); + NTSTATUS ProbeStatus; + PMMPTE PointerPte, PointerPde, LastPte; + PFN_NUMBER PageFrameIndex; + PMMPFN Pfn1; + BOOLEAN UsePfnLock; + KIRQL OldIrql; DPRINT("Probing MDL: %p\n", Mdl); - /* Sanity checks */ + // + // Sanity checks + // ASSERT(Mdl->ByteCount != 0); ASSERT(((ULONG)Mdl->ByteOffset & ~(PAGE_SIZE - 1)) == 0); ASSERT(((ULONG_PTR)Mdl->StartVa & (PAGE_SIZE - 1)) == 0); @@ -409,411 +582,638 @@ MDL_PARTIAL | MDL_IO_SPACE)) == 0); - /* Get page and base information */ + // + // Get page and base information + // MdlPages = (PPFN_NUMBER)(Mdl + 1); Base = (PVOID)Mdl->StartVa; + + // + // Get the addresses and how many pages we span (and need to lock) + // Address = (PVOID)((ULONG_PTR)Base + Mdl->ByteOffset); - NrPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Address, Mdl->ByteCount); - ASSERT(NrPages != 0); - - /* Check if this is an MDL in I/O Space */ - if (Mdl->StartVa >= MmSystemRangeStart && - MmGetPfnForProcess(NULL, Mdl->StartVa) >= MmPageArraySize) - { - /* Just loop each page */ - for (i = 0; i < NrPages; i++) - { - /* And map it */ - MdlPages[i] = MmGetPfnForProcess(NULL, - (PVOID)((ULONG_PTR)Mdl->StartVa + (i * PAGE_SIZE))); - } - - /* Set the flags and exit */ - Mdl->MdlFlags |= MDL_PAGES_LOCKED|MDL_IO_SPACE; - return; - } - - /* Get the thread and process */ + LastAddress = (PVOID)((ULONG_PTR)Address + Mdl->ByteCount); + LockPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Address, Mdl->ByteCount); + ASSERT(LockPages != 0); + + // + // Get the thread and process + // Thread = PsGetCurrentThread(); if (Address <= MM_HIGHEST_USER_ADDRESS) { - /* Get the process */ + // + // Get the process + // CurrentProcess = PsGetCurrentProcess(); } else { - /* No process */ + // + // No process + // CurrentProcess = NULL; } - - /* Check what kind of operaiton this is */ + + // + // Save the number of pages we'll have to lock, and the start address + // + TotalPages = LockPages; + StartAddress = Address; + + // + // Now probe them + // + ProbeStatus = STATUS_SUCCESS; + _SEH2_TRY + { + // + // Enter probe loop + // + do + { + // + // Assume failure + // + *MdlPages = -1; + + // + // Read + // + *(volatile CHAR*)Address; + + // + // Check if this is write access (only probe for user-mode) + // + if ((Operation != IoReadAccess) && + (Address <= MM_HIGHEST_USER_ADDRESS)) + { + // + // Probe for write too + // + ProbeForWriteChar(Address); + } + + // + // Next address... + // + Address = (PVOID)((ULONG_PTR)Address + PAGE_SIZE); + Address = PAGE_ALIGN(Address); + + // + // Next page... + // + LockPages--; + MdlPages++; + } while (Address < LastAddress); + + // + // Reset back to the original page + // + ASSERT(LockPages == 0); + MdlPages = (PPFN_NUMBER)(Mdl + 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Oops :( + // + ProbeStatus = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + // + // So how did that go? + // + if (ProbeStatus != STATUS_SUCCESS) + { + // + // Fail + // + DPRINT1("MDL PROBE FAILED!\n"); + Mdl->Process = NULL; + ExRaiseStatus(ProbeStatus); + } + + // + // Get the PTE and PDE + // + PointerPte = MiAddressToPte(StartAddress); + PointerPde = MiAddressToPde(StartAddress); + + // + // Sanity check + // + ASSERT(MdlPages = (PPFN_NUMBER)(Mdl + 1)); + + // + // Check what kind of operation this is + // if (Operation != IoReadAccess) { - /* Set the write flag */ + // + // Set the write flag + // Mdl->MdlFlags |= MDL_WRITE_OPERATION; } else { - /* Remove the write flag */ + // + // Remove the write flag + // Mdl->MdlFlags &= ~(MDL_WRITE_OPERATION); } - /* Check if this came from kernel mode */ + // + // Mark the MDL as locked *now* + // + Mdl->MdlFlags |= MDL_PAGES_LOCKED; + + // + // Check if this came from kernel mode + // if (Base >= MM_HIGHEST_USER_ADDRESS) { - /* We should not have a process */ + // + // We should not have a process + // ASSERT(CurrentProcess == NULL); Mdl->Process = NULL; - AddressSpace = MmGetKernelAddressSpace(); + + // + // In kernel mode, we don't need to check for write access + // + Operation = IoReadAccess; + + // + // Use the PFN lock + // + UsePfnLock = TRUE; + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + AddressSpace = NULL; // Keep compiler happy } else { - /* Sanity checks */ - ASSERT(NrPages != 0); + // + // Sanity checks + // + ASSERT(TotalPages != 0); ASSERT(CurrentProcess == PsGetCurrentProcess()); - /* Track locked pages */ + // + // Track locked pages + // InterlockedExchangeAddSizeT(&CurrentProcess->NumberOfLockedPages, - NrPages); - - /* Save the process */ + TotalPages); + + // + // Save the process + // Mdl->Process = CurrentProcess; - /* Use the process lock */ + // + // Use the process lock + // + UsePfnLock = FALSE; AddressSpace = &CurrentProcess->Vm; - } - - - /* - * Lock the pages - */ - if (OldIrql < DISPATCH_LEVEL) - MmLockAddressSpace(AddressSpace); - else - MmAcquirePageListLock(&OldIrql); - - for (i = 0; i < NrPages; i++) - { - PVOID Address; - - Address = (char*)Mdl->StartVa + (i*PAGE_SIZE); - - if (!MmIsPagePresent(NULL, Address)) + MmLockAddressSpace(AddressSpace); + OldIrql = DISPATCH_LEVEL; // Keep compiler happy + } + + // + // Get the last PTE + // + LastPte = MiAddressToPte((PVOID)((ULONG_PTR)LastAddress - 1)); + + // + // Loop the pages + // + do + { + // + // Assume failure and check for non-mapped pages + // + *MdlPages = -1; + while ((PointerPde->u.Hard.Valid == 0) || + (PointerPte->u.Hard.Valid == 0)) { - /* Fault the page in */ - Status = MmAccessFault(FALSE, Address, AccessMode, NULL); + // + // What kind of lock where we using? + // + if (UsePfnLock) + { + // + // Release PFN lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + else + { + // + // Release process address space lock + // + MmUnlockAddressSpace(AddressSpace); + } + + // + // Access the page + // + Address = MiPteToAddress(PointerPte); + Status = MmAccessFault(FALSE, Address, KernelMode, NULL); if (!NT_SUCCESS(Status)) { - goto cleanup; + // + // Fail + // + DPRINT1("Access fault failed\n"); + goto Cleanup; } + + // + // Waht lock should we use? + // + if (UsePfnLock) + { + // + // Grab the PFN lock + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + } + else + { + // + // Use the address space lock + // + MmLockAddressSpace(AddressSpace); + } + } + + // + // Check if this was a write or modify + // + if (Operation != IoReadAccess) + { + // + // Check if the PTE is not writable + // + if (!PointerPte->u.Hard.Write) + { + // + // Check if it's copy on write + // + if (PointerPte->u.Hard.CopyOnWrite) + { + // + // Get the base address and allow a change for user-mode + // + Address = MiPteToAddress(PointerPte); + if (Address <= MM_HIGHEST_USER_ADDRESS) + { + // + // What kind of lock where we using? + // + if (UsePfnLock) + { + // + // Release PFN lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + else + { + // + // Release process address space lock + // + MmUnlockAddressSpace(AddressSpace); + } + + // + // Access the page + // + Status = MmAccessFault(TRUE, Address, KernelMode, NULL); + if (!NT_SUCCESS(Status)) + { + // + // Fail + // + DPRINT1("Access fault failed\n"); + goto Cleanup; + } + + // + // Re-acquire the lock + // + if (UsePfnLock) + { + // + // Grab the PFN lock + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + } + else + { + // + // Use the address space lock + // + MmLockAddressSpace(AddressSpace); + } + + // + // Start over + // + continue; + } + } + + // + // Fail, since we won't allow this + // + Status = STATUS_ACCESS_VIOLATION; + goto CleanupWithLock; + } + } + + // + // Grab the PFN + // + PageFrameIndex = PFN_FROM_PTE(PointerPte); + if (PageFrameIndex < MmHighestPhysicalPage) + { + // + // Get the PFN entry + // + Pfn1 = MiGetPfnEntry(PageFrameIndex); + ASSERT((CurrentProcess == NULL) || (UsePfnLock == FALSE)); + + // + // Now lock the page + // + MmReferencePage(PageFrameIndex); + MmLockPage(PageFrameIndex); } else { - MmLockPage(MmGetPfnForProcess(NULL, Address)); + // + // For I/O addresses, just remember this + // + Mdl->MdlFlags |= MDL_IO_SPACE; } - if ((Operation == IoWriteAccess || Operation == IoModifyAccess) && - (!(MmGetPageProtect(NULL, (PVOID)Address) & PAGE_READWRITE))) + // + // Write the page and move on + // + *MdlPages++ = PageFrameIndex; + if (!((ULONG_PTR)(++PointerPte) & (PAGE_SIZE - 1))) PointerPde++; + } while (PointerPte <= LastPte); + + // + // What kind of lock where we using? + // + if (UsePfnLock) + { + // + // Release PFN lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + else + { + // + // Release process address space lock + // + MmUnlockAddressSpace(AddressSpace); + } + + // + // Sanity check + // + ASSERT((Mdl->MdlFlags & MDL_DESCRIBES_AWE) == 0); + return; + +CleanupWithLock: + // + // This is the failure path + // + ASSERT(!NT_SUCCESS(Status)); + + // + // What kind of lock where we using? + // + if (UsePfnLock) + { + // + // Release PFN lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + else + { + // + // Release process address space lock + // + MmUnlockAddressSpace(AddressSpace); + } +Cleanup: + // + // Pages must be locked so MmUnlock can work + // + ASSERT(Mdl->MdlFlags & MDL_PAGES_LOCKED); + MmUnlockPages(Mdl); + + // + // Raise the error + // + ExRaiseStatus(Status); +} + +/* + * @implemented + */ +VOID +NTAPI +MmUnlockPages(IN PMDL Mdl) +{ + PPFN_NUMBER MdlPages, LastPage; + PEPROCESS Process; + PVOID Base; + ULONG Flags, PageCount; + KIRQL OldIrql; + DPRINT("Unlocking MDL: %p\n", Mdl); + + // + // Sanity checks + // + ASSERT((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0); + ASSERT((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0); + ASSERT((Mdl->MdlFlags & MDL_PARTIAL) == 0); + ASSERT(Mdl->ByteCount != 0); + + // + // Get the process associated and capture the flags which are volatile + // + Process = Mdl->Process; + Flags = Mdl->MdlFlags; + + // + // Automagically undo any calls to MmGetSystemAddressForMdl's for this MDL + // + if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) + { + // + // Unmap the pages from system space + // + MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + } + + // + // Get the page count + // + MdlPages = (PPFN_NUMBER)(Mdl + 1); + Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); + PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); + ASSERT(PageCount != 0); + + // + // We don't support AWE + // + if (Flags & MDL_DESCRIBES_AWE) ASSERT(FALSE); + + // + // Check if the buffer is mapped I/O space + // + if (Flags & MDL_IO_SPACE) + { + // + // Acquire PFN lock + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + // + // Loop every page + // + LastPage = MdlPages + PageCount; + do { - Status = MmAccessFault(TRUE, Address, AccessMode, NULL); - if (!NT_SUCCESS(Status)) + // + // Last page, break out + // + if (*MdlPages == -1) break; + + // + // Check if this page is in the PFN database + // + if (*MdlPages <= MmHighestPhysicalPage) { - for (j = 0; j < i; j++) - { - Page = MdlPages[j]; - if (Page < MmPageArraySize) - { - MmUnlockPage(Page); - MmDereferencePage(Page); - } - } - goto cleanup; + // + // Unlock and dereference + // + MmUnlockPage(*MdlPages); + MmDereferencePage(*MdlPages); } + } while (++MdlPages < LastPage); + + // + // Release the lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + // + // Check if we have a process + // + if (Process) + { + // + // Handle the accounting of locked pages + // + ASSERT(Process->NumberOfLockedPages > 0); + InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages, + -PageCount); } - Page = MmGetPfnForProcess(NULL, Address); - MdlPages[i] = Page; - if (Page >= MmPageArraySize) + + // + // We're done + // + Mdl->MdlFlags &= ~MDL_IO_SPACE; + Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; + return; + } + + // + // Check if we have a process + // + if (Process) + { + // + // Handle the accounting of locked pages + // + ASSERT(Process->NumberOfLockedPages > 0); + InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages, + -PageCount); + } + + // + // Loop every page + // + LastPage = MdlPages + PageCount; + do + { + // + // Last page reached + // + if (*MdlPages == -1) { - Mdl->MdlFlags |= MDL_IO_SPACE; - } - else - { - MmReferencePage(Page); + // + // Were there no pages at all? + // + if (MdlPages == (PPFN_NUMBER)(Mdl + 1)) + { + // + // We're already done + // + Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; + return; + } + + // + // Otherwise, stop here + // + LastPage = MdlPages; + break; } - } - -cleanup: - if (OldIrql < DISPATCH_LEVEL) - MmUnlockAddressSpace(AddressSpace); - else - MmReleasePageListLock(OldIrql); - - if (!NT_SUCCESS(Status)) - ExRaiseStatus(STATUS_ACCESS_VIOLATION); - Mdl->MdlFlags |= MDL_PAGES_LOCKED; - return; -} - -/* - * @implemented - */ -PMDL -NTAPI -MmAllocatePagesForMdl(IN PHYSICAL_ADDRESS LowAddress, - IN PHYSICAL_ADDRESS HighAddress, - IN PHYSICAL_ADDRESS SkipBytes, - IN SIZE_T Totalbytes) -{ - PMDL Mdl; - PPFN_TYPE Pages; - ULONG NumberOfPagesWanted, NumberOfPagesAllocated; - ULONG Ret; - DPRINT("Allocating pages: %p\n", LowAddress.LowPart); - - /* SkipBytes must be a multiple of the page size */ - if (BYTE_OFFSET(SkipBytes.LowPart)) return NULL; - - /* Create the actual MDL */ - Mdl = MmCreateMdl(NULL, NULL, Totalbytes); - if (!Mdl) return NULL; - - /* Allocate pages into the MDL */ - NumberOfPagesAllocated = 0; - NumberOfPagesWanted = PAGE_ROUND_UP(Mdl->ByteCount + Mdl->ByteOffset) / PAGE_SIZE; - Pages = (PPFN_TYPE)(Mdl + 1); - while (NumberOfPagesWanted > 0) - { - Ret = MmAllocPagesSpecifyRange(MC_NPPOOL, - LowAddress, - HighAddress, - NumberOfPagesWanted, - Pages + NumberOfPagesAllocated); - if (Ret == (ULONG)-1) break; - - NumberOfPagesAllocated += Ret; - NumberOfPagesWanted -= Ret; - - if (SkipBytes.QuadPart == 0) break; - LowAddress.QuadPart += SkipBytes.QuadPart; - HighAddress.QuadPart += SkipBytes.QuadPart; - } - - /* If nothing was allocated, fail */ - if (NumberOfPagesWanted) - { - /* Free our MDL */ - ExFreePool(Mdl); - return NULL; - } - - /* Zero out the MDL pages */ - //RtlZeroMemory(LowAddress.LowPart, NumberOfPagesAllocated * PAGE_SIZE); - - /* Return the MDL */ - Mdl->MdlFlags |= MDL_PAGES_LOCKED; - Mdl->ByteCount = (ULONG)(NumberOfPagesAllocated * PAGE_SIZE); - return Mdl; -} - -/* - * @unimplemented - */ -PMDL -NTAPI -MmAllocatePagesForMdlEx(IN PHYSICAL_ADDRESS LowAddress, - IN PHYSICAL_ADDRESS HighAddress, - IN PHYSICAL_ADDRESS SkipBytes, - IN SIZE_T Totalbytes, - IN MEMORY_CACHING_TYPE CacheType, - IN ULONG Flags) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @implemented - */ -PVOID -NTAPI -MmMapLockedPagesSpecifyCache(IN PMDL Mdl, - IN KPROCESSOR_MODE AccessMode, - IN MEMORY_CACHING_TYPE CacheType, - IN PVOID BaseAddress, - IN ULONG BugCheckOnFailure, - IN MM_PAGE_PRIORITY Priority) -{ - PVOID Base; - PULONG MdlPages; - KIRQL oldIrql; - ULONG PageCount; - ULONG StartingOffset; - PEPROCESS CurrentProcess; - NTSTATUS Status; - ULONG Protect; - MEMORY_AREA *Result; - LARGE_INTEGER BoundaryAddressMultiple; - DPRINT("Mapping MDL: %p\n", Mdl); - DPRINT("Base: %p\n", BaseAddress); - - /* Sanity checks */ - ASSERT(Mdl->ByteCount != 0); - - /* Get the base */ - Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); - - /* Set default page protection */ - Protect = PAGE_READWRITE; - if (CacheType == MmNonCached) Protect |= PAGE_NOCACHE; - - /* Handle kernel case first */ - if (AccessMode == KernelMode) - { - /* Get the list of pages and count */ - MdlPages = (PPFN_NUMBER)(Mdl + 1); - PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); - - /* Sanity checks */ - ASSERT((Mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | - MDL_SOURCE_IS_NONPAGED_POOL | - MDL_PARTIAL_HAS_BEEN_MAPPED)) == 0); - ASSERT((Mdl->MdlFlags & (MDL_PAGES_LOCKED | MDL_PARTIAL)) != 0); - - /* Allocate that number of pages from the mdl mapping region. */ - KeAcquireSpinLock(&MiMdlMappingRegionLock, &oldIrql); - StartingOffset = RtlFindClearBitsAndSet(&MiMdlMappingRegionAllocMap, - PageCount, - MiMdlMappingRegionHint); - if (StartingOffset == 0xffffffff) - { - KeReleaseSpinLock(&MiMdlMappingRegionLock, oldIrql); - DPRINT("Out of MDL mapping space\n"); - if ((Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) || !BugCheckOnFailure) - { - return NULL; - } - KeBugCheck(MEMORY_MANAGEMENT); - } - Base = (PVOID)((ULONG_PTR)MiMdlMappingRegionBase + StartingOffset * PAGE_SIZE); - if (MiMdlMappingRegionHint == StartingOffset) MiMdlMappingRegionHint += PageCount; - KeReleaseSpinLock(&MiMdlMappingRegionLock, oldIrql); - - /* Set the virtual mappings for the MDL pages. */ - if (Mdl->MdlFlags & MDL_IO_SPACE) - { - /* Map the pages */ - Status = MmCreateVirtualMappingUnsafe(NULL, - Base, - Protect, - MdlPages, - PageCount); - } - else - { - /* Map the pages */ - Status = MmCreateVirtualMapping(NULL, - Base, - Protect, - MdlPages, - PageCount); - } - - /* Check if the mapping suceeded */ - if (!NT_SUCCESS(Status)) - { - /* If it can fail, return NULL */ - if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) return NULL; - - /* Should we bugcheck? */ - if (!BugCheckOnFailure) return NULL; - - /* Yes, crash the system */ - KeBugCheckEx(NO_MORE_SYSTEM_PTES, 0, PageCount, 0, 0); - } - - /* Mark it as mapped */ - ASSERT((Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) == 0); - Mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA; - - /* Check if it was partial */ - if (Mdl->MdlFlags & MDL_PARTIAL) - { - /* Write the appropriate flag here too */ - Mdl->MdlFlags |= MDL_PARTIAL_HAS_BEEN_MAPPED; - } - - /* Save the mapped address */ - Base = (PVOID)((ULONG_PTR)Base + Mdl->ByteOffset); - Mdl->MappedSystemVa = Base; - return Base; - } - - - /* Calculate the number of pages required. */ + + // + // Sanity check + // + ASSERT(*MdlPages <= MmHighestPhysicalPage); + } while (++MdlPages < LastPage); + + // + // Reset pointer + // MdlPages = (PPFN_NUMBER)(Mdl + 1); - PageCount = PAGE_ROUND_UP(Mdl->ByteCount + Mdl->ByteOffset) / PAGE_SIZE; - - BoundaryAddressMultiple.QuadPart = 0; - Base = BaseAddress; - - CurrentProcess = PsGetCurrentProcess(); - - MmLockAddressSpace(&CurrentProcess->Vm); - Status = MmCreateMemoryArea(&CurrentProcess->Vm, - MEMORY_AREA_MDL_MAPPING, - &Base, - PageCount * PAGE_SIZE, - Protect, - &Result, - (Base != NULL), - 0, - BoundaryAddressMultiple); - MmUnlockAddressSpace(&CurrentProcess->Vm); - if (!NT_SUCCESS(Status)) - { - if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) - { - return NULL; - } - - /* Throw exception */ - ExRaiseStatus(STATUS_ACCESS_VIOLATION); - ASSERT(0); - } - - /* Set the virtual mappings for the MDL pages. */ - if (Mdl->MdlFlags & MDL_IO_SPACE) - { - /* Map the pages */ - Status = MmCreateVirtualMappingUnsafe(CurrentProcess, - Base, - Protect, - MdlPages, - PageCount); - } - else - { - /* Map the pages */ - Status = MmCreateVirtualMapping(CurrentProcess, - Base, - Protect, - MdlPages, - PageCount); - } - - /* Check if the mapping suceeded */ - if (!NT_SUCCESS(Status)) - { - /* If it can fail, return NULL */ - if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) return NULL; - - /* Throw exception */ - ExRaiseStatus(STATUS_ACCESS_VIOLATION); - } - - /* Return the base */ - Base = (PVOID)((ULONG_PTR)Base + Mdl->ByteOffset); - return Base; + + // + // Now grab the PFN lock for the actual unlock and dereference + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + do + { + // + // Unlock and dereference + // + MmUnlockPage(*MdlPages); + MmDereferencePage(*MdlPages); + } while (++MdlPages < LastPage); + + // + // Release the lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + // + // We're done + // + Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; } /* @@ -916,4 +1316,3 @@ } /* EOF */ - Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Tue Jun 30 12:29:22 2009 @@ -53,6 +53,8 @@ extern MI_PFN_CACHE_ATTRIBUTE MiPlatformCacheAttributes[2][MmMaximumCacheType]; extern PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; extern ULONG MmBootImageSize; +extern PMMPTE MmSystemPtesStart[MaximumPtePoolTypes]; +extern PMMPTE MmSystemPtesEnd[MaximumPtePoolTypes]; VOID NTAPI @@ -106,4 +108,31 @@ IN MI_PFN_CACHE_ATTRIBUTE CacheAttribute ); +PMDL +NTAPI +MiAllocatePagesForMdl( + IN PHYSICAL_ADDRESS LowAddress, + IN PHYSICAL_ADDRESS HighAddress, + IN PHYSICAL_ADDRESS SkipBytes, + IN SIZE_T TotalBytes, + IN MI_PFN_CACHE_ATTRIBUTE CacheAttribute, + IN ULONG Flags +); + +PVOID +NTAPI +MiMapLockedPagesInUserSpace( + IN PMDL Mdl, + IN PVOID BaseVa, + IN MEMORY_CACHING_TYPE CacheType, + IN PVOID BaseAddress +); + +VOID +NTAPI +MiUnmapLockedPagesInUserSpace( + IN PVOID BaseAddress, + IN PMDL Mdl +); + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Tue Jun 30 12:29:22 2009 @@ -432,11 +432,278 @@ } } while (++i != MmPhysicalMemoryBlock->NumberOfRuns); - // // And if we get here, it means no suitable physical memory runs were found // return 0; +} + +PMDL +NTAPI +MiAllocatePagesForMdl(IN PHYSICAL_ADDRESS LowAddress, + IN PHYSICAL_ADDRESS HighAddress, + IN PHYSICAL_ADDRESS SkipBytes, + IN SIZE_T TotalBytes, + IN MI_PFN_CACHE_ATTRIBUTE CacheAttribute, + IN ULONG MdlFlags) +{ + PMDL Mdl; + PFN_NUMBER PageCount, LowPage, HighPage, SkipPages, PagesFound = 0, Page; + PPFN_NUMBER MdlPage, LastMdlPage; + KIRQL OldIrql; + PLIST_ENTRY ListEntry; + PPHYSICAL_PAGE Pfn1; + ULONG LookForZeroedPages; + ASSERT (KeGetCurrentIrql() <= APC_LEVEL); + + // + // Convert the low address into a PFN + // + LowPage = (PFN_NUMBER)(LowAddress.QuadPart >> PAGE_SHIFT); + + // + // Convert, and normalize, the high address into a PFN + // + HighPage = (PFN_NUMBER)(HighAddress.QuadPart >> PAGE_SHIFT); + if (HighPage > MmHighestPhysicalPage) HighPage = MmHighestPhysicalPage; + + // + // Validate skipbytes and convert them into pages + // + if (BYTE_OFFSET(SkipBytes.LowPart)) return NULL; + SkipPages = (PFN_NUMBER)(SkipBytes.QuadPart >> PAGE_SHIFT); + + // + // Now compute the number of pages the MDL will cover + // + PageCount = (PFN_NUMBER)ADDRESS_AND_SIZE_TO_SPAN_PAGES(0, TotalBytes); + do + { + // + // Try creating an MDL for these many pages + // + Mdl = MmCreateMdl(NULL, NULL, PageCount << PAGE_SHIFT); + if (Mdl) break; + + // + // This function is not required to return the amount of pages requested + // In fact, it can return as little as 1 page, and callers are supposed + // to deal with this scenario. So re-attempt the allocation with less + // pages than before, and see if it worked this time. + // + PageCount -= (PageCount >> 4); + } while (PageCount); + + // + // Wow, not even a single page was around! + // + if (!Mdl) return NULL; + + // + // This is where the page array starts.... + // + MdlPage = (PPFN_NUMBER)(Mdl + 1); + + // + // Lock the PFN database + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + // + // Are we looking for any pages, without discriminating? + // + if ((LowPage == 0) && (HighPage == MmHighestPhysicalPage)) + { + // + // Well then, let's go shopping + // + while (PagesFound < PageCount) + { + // + // Do we have zeroed pages? + // + if (!IsListEmpty(&FreeZeroedPageListHead)) + { + // + // Grab a zero page + // + ListEntry = RemoveTailList(&FreeZeroedPageListHead); + } + else if (!IsListEmpty(&FreeUnzeroedPageListHead)) + { + // + // Nope, grab an unzeroed page + // + ListEntry = RemoveTailList(&FreeUnzeroedPageListHead); + UnzeroedPageCount--; + } + else + { + // + // This is not good... hopefully we have at least SOME pages + // + ASSERT(PagesFound); + break; + } + + // + // Get the PFN entry for this page + // + Pfn1 = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); + + // + // Make sure it's really free + // + ASSERT(Pfn1->Flags.Type == MM_PHYSICAL_PAGE_FREE); + ASSERT(Pfn1->MapCount == 0); + ASSERT(Pfn1->ReferenceCount == 0); + + // + // Allocate it and mark it + // + Pfn1->Flags.Type = MM_PHYSICAL_PAGE_USED; + Pfn1->Flags.Consumer = MC_NPPOOL; + Pfn1->Flags.StartOfAllocation = 1; + Pfn1->Flags.EndOfAllocation = 1; + Pfn1->ReferenceCount = 1; + Pfn1->LockCount = 0; + Pfn1->MapCount = 0; + Pfn1->SavedSwapEntry = 0; + + // + // Decrease available pages + // + MmStats.NrSystemPages++; + MmStats.NrFreePages--; + + // + // Save it into the MDL + // + *MdlPage++ = MiGetPfnEntryIndex(Pfn1); + PagesFound++; + } + } + else + { + // + // You want specific range of pages. We'll do this in two runs + // + for (LookForZeroedPages = 1; LookForZeroedPages >= 0; LookForZeroedPages--) + { + // + // Scan the range you specified + // + for (Page = LowPage; Page < HighPage; Page++) + { + // + // Get the PFN entry for this page + // + Pfn1 = MiGetPfnEntry(Page); + + // + // Make sure it's free and if this is our first pass, zeroed + // + if (Pfn1->Flags.Type != MM_PHYSICAL_PAGE_FREE) continue; + if (Pfn1->Flags.Zero != LookForZeroedPages) continue; + + // + // Sanity checks + // + ASSERT(Pfn1->MapCount == 0); + ASSERT(Pfn1->ReferenceCount == 0); + + // + // Now setup the page and mark it + // + Pfn1->Flags.Type = MM_PHYSICAL_PAGE_USED; + Pfn1->Flags.Consumer = MC_NPPOOL; + Pfn1->ReferenceCount = 1; + Pfn1->Flags.StartOfAllocation = 1; + Pfn1->Flags.EndOfAllocation = 1; + Pfn1->LockCount = 0; + Pfn1->MapCount = 0; + Pfn1->SavedSwapEntry = 0; + + // + // If this page was unzeroed, we've consumed such a page + // + if (!Pfn1->Flags.Zero) UnzeroedPageCount--; + + // + // Decrease available pages + // + MmStats.NrSystemPages++; + MmStats.NrFreePages--; + + // + // Save this page into the MDL + // + *MdlPage++ = Page; + if (++PagesFound == PageCount) break; + } + + // + // If the first pass was enough, don't keep going, otherwise, go again + // + if (PagesFound == PageCount) break; + } + } + + // + // Now release the PFN count + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + // + // We might've found less pages, but not more ;-) + // + if (PagesFound != PageCount) ASSERT(PagesFound < PageCount); + if (!PagesFound) + { + // + // If we didn' tfind any pages at all, fail + // + DPRINT1("NO MDL PAGES!\n"); + ExFreePool(Mdl); + return NULL; + } + + // + // Write out how many pages we found + // + Mdl->ByteCount = (ULONG)(PagesFound << PAGE_SHIFT); + + // + // Terminate the MDL array if there's certain missing pages + // + if (PagesFound != PageCount) *MdlPage = -1; + + // + // Now go back and loop over all the MDL pages + // + MdlPage = (PPFN_NUMBER)(Mdl + 1); + LastMdlPage = MdlPage + PagesFound; + while (MdlPage < LastMdlPage) + { + // + // Check if we've reached the end + // + Page = *MdlPage; + if (Page == -1) break; + + // + // Get the PFN entry for the page and check if we should zero it out + // + Pfn1 = MiGetPfnEntry(Page); + if (Pfn1->Flags.Zero == 0) MiZeroPage(Page); + } + + // + // We're done, mark the pages as locked (should we lock them, though???) + // + Mdl->Process = NULL; + Mdl->MdlFlags |= MDL_PAGES_LOCKED; + return Mdl; } PFN_TYPE Removed: trunk/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mdlsup.c (removed) @@ -1,918 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/mdl.c - * PURPOSE: Manipulates MDLs - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES ****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitializeMdlImplementation) -#endif - -/* GLOBALS *******************************************************************/ - -#define TAG_MDL TAG('M', 'D', 'L', ' ') -#define MI_MDL_MAPPING_REGION_SIZE (256*1024*1024) - -PVOID MiMdlMappingRegionBase = NULL; -RTL_BITMAP MiMdlMappingRegionAllocMap; -ULONG MiMdlMappingRegionHint; -KSPIN_LOCK MiMdlMappingRegionLock; - -/* PRIVATE FUNCTIONS **********************************************************/ - -VOID -INIT_FUNCTION -NTAPI -MmInitializeMdlImplementation(VOID) -{ - MEMORY_AREA* Result; - NTSTATUS Status; - PVOID Buffer; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - - BoundaryAddressMultiple.QuadPart = 0; - MiMdlMappingRegionHint = 0; - MiMdlMappingRegionBase = NULL; - - MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_MDL_MAPPING, - &MiMdlMappingRegionBase, - MI_MDL_MAPPING_REGION_SIZE, - PAGE_READWRITE, - &Result, - FALSE, - 0, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - KeBugCheck(MEMORY_MANAGEMENT); - } - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - Buffer = ExAllocatePoolWithTag(NonPagedPool, - MI_MDL_MAPPING_REGION_SIZE / (PAGE_SIZE * 8), - TAG_MDL); - - RtlInitializeBitMap(&MiMdlMappingRegionAllocMap, Buffer, MI_MDL_MAPPING_REGION_SIZE / PAGE_SIZE); - RtlClearAllBits(&MiMdlMappingRegionAllocMap); - - KeInitializeSpinLock(&MiMdlMappingRegionLock); -} - -/* PUBLIC FUNCTIONS ***********************************************************/ - - -/* - * @implemented - */ -PMDL -NTAPI -MmCreateMdl(IN PMDL Mdl, - IN PVOID Base, - IN ULONG Length) -{ - ULONG Size; - - /* Check if we don't have an MDL built */ - if (!Mdl) - { - /* Calcualte the size we'll need and allocate the MDL */ - Size = MmSizeOfMdl(Base, Length); - Mdl = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_MDL); - if (!Mdl) return NULL; - } - - /* Initialize it */ - MmInitializeMdl(Mdl, Base, Length); - DPRINT("Creating MDL: %p\n", Mdl); - DPRINT("Base: %p. Length: %lx\n", Base, Length); - return Mdl; -} - -/* - * @implemented - */ -ULONG -NTAPI -MmSizeOfMdl(IN PVOID Base, - IN ULONG Length) -{ - /* Return the MDL size */ - return sizeof(MDL) + (ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Length) * sizeof(PFN_NUMBER)); -} - -/* - * @implemented - */ -VOID -NTAPI -MmBuildMdlForNonPagedPool(IN PMDL Mdl) -{ - ULONG i; - ULONG PageCount; - PPFN_NUMBER MdlPages; - PVOID Base; - DPRINT("Building MDL: %p\n", Mdl); - - /* Sanity checks */ - ASSERT(Mdl->ByteCount != 0); - ASSERT((Mdl->MdlFlags & (MDL_PAGES_LOCKED | - MDL_MAPPED_TO_SYSTEM_VA | - MDL_SOURCE_IS_NONPAGED_POOL | - MDL_PARTIAL)) == 0); - - /* We know the MDL isn't associated to a process now */ - Mdl->Process = NULL; - - /* Get page and VA information */ - MdlPages = (PPFN_NUMBER)(Mdl + 1); - Base = Mdl->StartVa; - - /* Set the system address and now get the page count */ - Mdl->MappedSystemVa = (PVOID)((ULONG_PTR)Base + Mdl->ByteOffset); - PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Mdl->MappedSystemVa, Mdl->ByteCount); - ASSERT(PageCount != 0); - - /* Go through each page */ - for (i = 0; i < PageCount; i++) - { - /* Map it */ - *MdlPages++ = MmGetPfnForProcess(NULL, - (PVOID)((ULONG_PTR)Base + (i * PAGE_SIZE))); - } - - /* Set the final flag */ - Mdl->MdlFlags |= MDL_SOURCE_IS_NONPAGED_POOL; -} - -/* - * @implemented - */ -VOID -NTAPI -MmFreePagesFromMdl(IN PMDL Mdl) -{ - PVOID Base; - PPFN_NUMBER Pages; - LONG NumberOfPages; - DPRINT("Freeing MDL: %p\n", Mdl); - - /* Sanity checks */ - ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - ASSERT((Mdl->MdlFlags & MDL_IO_SPACE) == 0); - ASSERT(((ULONG_PTR)Mdl->StartVa & (PAGE_SIZE - 1)) == 0); - - /* Get address and page information */ - Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); - NumberOfPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); - - /* Loop all the MDL pages */ - Pages = (PPFN_NUMBER)(Mdl + 1); - while (--NumberOfPages >= 0) - { - /* Dereference each one of them */ - MmDereferencePage(Pages[NumberOfPages]); - } - - /* Remove the pages locked flag */ - Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; -} - -/* - * @implemented - */ -PVOID -NTAPI -MmMapLockedPages(IN PMDL Mdl, - IN KPROCESSOR_MODE AccessMode) -{ - /* Call the extended version */ - return MmMapLockedPagesSpecifyCache(Mdl, - AccessMode, - MmCached, - NULL, - TRUE, - HighPagePriority); -} - -/* - * @implemented - */ -VOID -NTAPI -MmUnlockPages(IN PMDL Mdl) -{ - ULONG i; - PPFN_NUMBER MdlPages; - PFN_NUMBER Page; - PEPROCESS Process; - PVOID Base; - ULONG Flags, PageCount; - DPRINT("Unlocking MDL: %p\n", Mdl); - - /* Sanity checks */ - ASSERT((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0); - ASSERT((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0); - ASSERT((Mdl->MdlFlags & MDL_PARTIAL) == 0); - ASSERT(Mdl->ByteCount != 0); - - /* Get the process associated and capture the flags which are volatile */ - Process = Mdl->Process; - Flags = Mdl->MdlFlags; - - /* Automagically undo any calls to MmGetSystemAddressForMdl's for this mdl */ - if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) - { - /* Unmap the pages from system spage */ - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - - /* Get the page count */ - MdlPages = (PPFN_NUMBER)(Mdl + 1); - Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); - PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); - ASSERT(PageCount != 0); - - /* We don't support AWE */ - if (Flags & MDL_DESCRIBES_AWE) ASSERT(FALSE); - - /* Check if the buffer is mapped I/O space */ - if (Flags & MDL_IO_SPACE) - { - /* Check if this was a wirte */ - if (Flags & MDL_WRITE_OPERATION) - { - /* Windows keeps track of the modified bit */ - } - - /* Check if we have a process */ - if (Process) - { - /* Handle the accounting of locked pages */ - ASSERT(Process->NumberOfLockedPages > 0); - InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages, - -PageCount); - } - - /* We're done */ - Mdl->MdlFlags &= ~MDL_IO_SPACE; - Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; - return; - } - - /* Check if we have a process */ - if (Process) - { - /* Handle the accounting of locked pages */ - ASSERT(Process->NumberOfLockedPages > 0); - InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages, - -PageCount); - } - - /* Scan each page */ - for (i = 0; i < PageCount; i++) - { - /* Get the page entry */ - - /* Unlock and dereference it */ - Page = MdlPages[i]; - MmUnlockPage(Page); - MmDereferencePage(Page); - } - - /* We're done */ - Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; -} - -/* - * @implemented - */ -VOID -NTAPI -MmUnmapLockedPages(IN PVOID BaseAddress, - IN PMDL Mdl) -{ - KIRQL oldIrql; - ULONG i, PageCount; - ULONG Base; - MEMORY_AREA *MemoryArea; - DPRINT("Unmapping MDL: %p\n", Mdl); - DPRINT("Base: %p\n", BaseAddress); - - /* Sanity check */ - ASSERT(Mdl->ByteCount != 0); - - /* Check if this is a kernel request */ - if (BaseAddress > MM_HIGHEST_USER_ADDRESS) - { - /* Get base and count information */ - Base = (ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset; - PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); - - /* Sanity checks */ - ASSERT((Mdl->MdlFlags & MDL_PARENT_MAPPED_SYSTEM_VA) == 0); - ASSERT(PageCount != 0); - ASSERT(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA); - - /* ReactOS does not support this flag */ - if (Mdl->MdlFlags & MDL_FREE_EXTRA_PTES) ASSERT(FALSE); - - /* Remove flags */ - Mdl->MdlFlags &= ~(MDL_MAPPED_TO_SYSTEM_VA | - MDL_PARTIAL_HAS_BEEN_MAPPED | - MDL_FREE_EXTRA_PTES); - - /* If we came from non-paged pool, on ReactOS, we can leave */ - if (Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) return; - - /* Loop each page */ - BaseAddress = PAGE_ALIGN(BaseAddress); - for (i = 0; i < PageCount; i++) - { - /* Delete it */ - MmDeleteVirtualMapping(NULL, - (PVOID)((ULONG_PTR)BaseAddress + (i * PAGE_SIZE)), - FALSE, - NULL, - NULL); - } - - /* Lock the mapping region */ - KeAcquireSpinLock(&MiMdlMappingRegionLock, &oldIrql); - - /* Deallocate all the pages used. */ - Base = ((ULONG_PTR)BaseAddress - (ULONG_PTR)MiMdlMappingRegionBase) / PAGE_SIZE; - RtlClearBits(&MiMdlMappingRegionAllocMap, Base, PageCount); - MiMdlMappingRegionHint = min(MiMdlMappingRegionHint, Base); - - /* Release the lock */ - KeReleaseSpinLock(&MiMdlMappingRegionLock, oldIrql); - } - else - { - /* Sanity check */ - ASSERT(Mdl->Process == PsGetCurrentProcess()); - - /* Find the memory area */ - MemoryArea = MmLocateMemoryAreaByAddress(&Mdl->Process->Vm, - BaseAddress); - ASSERT(MemoryArea); - - /* Free it */ - MmFreeMemoryArea(&Mdl->Process->Vm, - MemoryArea, - NULL, - NULL); - } -} - -/* - * @implemented - */ -VOID -NTAPI -MmProbeAndLockPages(IN PMDL Mdl, - IN KPROCESSOR_MODE AccessMode, - IN LOCK_OPERATION Operation) -{ - PPFN_TYPE MdlPages; - PVOID Base, Address; - ULONG i, j; - ULONG NrPages; - NTSTATUS Status = STATUS_SUCCESS; - PFN_TYPE Page; - PEPROCESS CurrentProcess; - PETHREAD Thread; - PMMSUPPORT AddressSpace; - KIRQL OldIrql = KeGetCurrentIrql(); - DPRINT("Probing MDL: %p\n", Mdl); - - /* Sanity checks */ - ASSERT(Mdl->ByteCount != 0); - ASSERT(((ULONG)Mdl->ByteOffset & ~(PAGE_SIZE - 1)) == 0); - ASSERT(((ULONG_PTR)Mdl->StartVa & (PAGE_SIZE - 1)) == 0); - ASSERT((Mdl->MdlFlags & (MDL_PAGES_LOCKED | - MDL_MAPPED_TO_SYSTEM_VA | - MDL_SOURCE_IS_NONPAGED_POOL | - MDL_PARTIAL | - MDL_IO_SPACE)) == 0); - - /* Get page and base information */ - MdlPages = (PPFN_NUMBER)(Mdl + 1); - Base = (PVOID)Mdl->StartVa; - Address = (PVOID)((ULONG_PTR)Base + Mdl->ByteOffset); - NrPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Address, Mdl->ByteCount); - ASSERT(NrPages != 0); - - /* Check if this is an MDL in I/O Space */ - if (Mdl->StartVa >= MmSystemRangeStart && - MmGetPfnForProcess(NULL, Mdl->StartVa) >= MmHighestPhysicalPage) - { - /* Just loop each page */ - for (i = 0; i < NrPages; i++) - { - /* And map it */ - MdlPages[i] = MmGetPfnForProcess(NULL, - (PVOID)((ULONG_PTR)Mdl->StartVa + (i * PAGE_SIZE))); - } - - /* Set the flags and exit */ - Mdl->MdlFlags |= MDL_PAGES_LOCKED|MDL_IO_SPACE; - return; - } - - /* Get the thread and process */ - Thread = PsGetCurrentThread(); - if (Address <= MM_HIGHEST_USER_ADDRESS) - { - /* Get the process */ - CurrentProcess = PsGetCurrentProcess(); - } - else - { - /* No process */ - CurrentProcess = NULL; - } - - /* Check what kind of operaiton this is */ - if (Operation != IoReadAccess) - { - /* Set the write flag */ - Mdl->MdlFlags |= MDL_WRITE_OPERATION; - } - else - { - /* Remove the write flag */ - Mdl->MdlFlags &= ~(MDL_WRITE_OPERATION); - } - - /* Check if this came from kernel mode */ - if (Base >= MM_HIGHEST_USER_ADDRESS) - { - /* We should not have a process */ - ASSERT(CurrentProcess == NULL); - Mdl->Process = NULL; - AddressSpace = MmGetKernelAddressSpace(); - } - else - { - /* Sanity checks */ - ASSERT(NrPages != 0); - ASSERT(CurrentProcess == PsGetCurrentProcess()); - - /* Track locked pages */ - InterlockedExchangeAddSizeT(&CurrentProcess->NumberOfLockedPages, - NrPages); - - /* Save the process */ - Mdl->Process = CurrentProcess; - - /* Use the process lock */ - AddressSpace = &CurrentProcess->Vm; - } - - - /* - * Lock the pages - */ - if (OldIrql < DISPATCH_LEVEL) - MmLockAddressSpace(AddressSpace); - else - MmAcquirePageListLock(&OldIrql); - - for (i = 0; i < NrPages; i++) - { - PVOID Address; - - Address = (char*)Mdl->StartVa + (i*PAGE_SIZE); - - if (!MmIsPagePresent(NULL, Address)) - { - /* Fault the page in */ - Status = MmAccessFault(FALSE, Address, AccessMode, NULL); - if (!NT_SUCCESS(Status)) - { - goto cleanup; - } - } - else - { - MmLockPage(MmGetPfnForProcess(NULL, Address)); - } - - if ((Operation == IoWriteAccess || Operation == IoModifyAccess) && - (!(MmGetPageProtect(NULL, (PVOID)Address) & PAGE_READWRITE))) - { - Status = MmAccessFault(TRUE, Address, AccessMode, NULL); - if (!NT_SUCCESS(Status)) - { - for (j = 0; j < i; j++) - { - Page = MdlPages[j]; - if (Page < MmHighestPhysicalPage) - { - MmUnlockPage(Page); - MmDereferencePage(Page); - } - } - goto cleanup; - } - } - Page = MmGetPfnForProcess(NULL, Address); - MdlPages[i] = Page; - if (Page >= MmHighestPhysicalPage) - { - Mdl->MdlFlags |= MDL_IO_SPACE; - } - else - { - MmReferencePage(Page); - } - } - -cleanup: - if (OldIrql < DISPATCH_LEVEL) - MmUnlockAddressSpace(AddressSpace); - else - MmReleasePageListLock(OldIrql); - - if (!NT_SUCCESS(Status)) - ExRaiseStatus(STATUS_ACCESS_VIOLATION); - Mdl->MdlFlags |= MDL_PAGES_LOCKED; - return; -} - -/* - * @implemented - */ -PMDL -NTAPI -MmAllocatePagesForMdl(IN PHYSICAL_ADDRESS LowAddress, - IN PHYSICAL_ADDRESS HighAddress, - IN PHYSICAL_ADDRESS SkipBytes, - IN SIZE_T Totalbytes) -{ - PMDL Mdl; - PPFN_TYPE Pages; - ULONG NumberOfPagesWanted, NumberOfPagesAllocated; - ULONG Ret; - DPRINT("Allocating pages: %p\n", LowAddress.LowPart); - - /* SkipBytes must be a multiple of the page size */ - if (BYTE_OFFSET(SkipBytes.LowPart)) return NULL; - - /* Create the actual MDL */ - Mdl = MmCreateMdl(NULL, NULL, Totalbytes); - if (!Mdl) return NULL; - - /* Allocate pages into the MDL */ - NumberOfPagesAllocated = 0; - NumberOfPagesWanted = PAGE_ROUND_UP(Mdl->ByteCount + Mdl->ByteOffset) / PAGE_SIZE; - Pages = (PPFN_TYPE)(Mdl + 1); - while (NumberOfPagesWanted > 0) - { - Ret = MmAllocPagesSpecifyRange(MC_NPPOOL, - LowAddress, - HighAddress, - NumberOfPagesWanted, - Pages + NumberOfPagesAllocated); - if (Ret == (ULONG)-1) break; - - NumberOfPagesAllocated += Ret; - NumberOfPagesWanted -= Ret; - - if (SkipBytes.QuadPart == 0) break; - LowAddress.QuadPart += SkipBytes.QuadPart; - HighAddress.QuadPart += SkipBytes.QuadPart; - } - - /* If nothing was allocated, fail */ - if (NumberOfPagesWanted) - { - /* Free our MDL */ - ExFreePool(Mdl); - return NULL; - } - - /* Zero out the MDL pages */ - //RtlZeroMemory(LowAddress.LowPart, NumberOfPagesAllocated * PAGE_SIZE); - - /* Return the MDL */ - Mdl->MdlFlags |= MDL_PAGES_LOCKED; - Mdl->ByteCount = (ULONG)(NumberOfPagesAllocated * PAGE_SIZE); - return Mdl; -} - -/* - * @unimplemented - */ -PMDL -NTAPI -MmAllocatePagesForMdlEx(IN PHYSICAL_ADDRESS LowAddress, - IN PHYSICAL_ADDRESS HighAddress, - IN PHYSICAL_ADDRESS SkipBytes, - IN SIZE_T Totalbytes, - IN MEMORY_CACHING_TYPE CacheType, - IN ULONG Flags) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @implemented - */ -PVOID -NTAPI -MmMapLockedPagesSpecifyCache(IN PMDL Mdl, - IN KPROCESSOR_MODE AccessMode, - IN MEMORY_CACHING_TYPE CacheType, - IN PVOID BaseAddress, - IN ULONG BugCheckOnFailure, - IN MM_PAGE_PRIORITY Priority) -{ - PVOID Base; - PULONG MdlPages; - KIRQL oldIrql; - ULONG PageCount; - ULONG StartingOffset; - PEPROCESS CurrentProcess; - NTSTATUS Status; - ULONG Protect; - MEMORY_AREA *Result; - LARGE_INTEGER BoundaryAddressMultiple; - DPRINT("Mapping MDL: %p\n", Mdl); - DPRINT("Base: %p\n", BaseAddress); - - /* Sanity checks */ - ASSERT(Mdl->ByteCount != 0); - - /* Get the base */ - Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); - - /* Set default page protection */ - Protect = PAGE_READWRITE; - if (CacheType == MmNonCached) Protect |= PAGE_NOCACHE; - - /* Handle kernel case first */ - if (AccessMode == KernelMode) - { - /* Get the list of pages and count */ - MdlPages = (PPFN_NUMBER)(Mdl + 1); - PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); - - /* Sanity checks */ - ASSERT((Mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | - MDL_SOURCE_IS_NONPAGED_POOL | - MDL_PARTIAL_HAS_BEEN_MAPPED)) == 0); - ASSERT((Mdl->MdlFlags & (MDL_PAGES_LOCKED | MDL_PARTIAL)) != 0); - - /* Allocate that number of pages from the mdl mapping region. */ - KeAcquireSpinLock(&MiMdlMappingRegionLock, &oldIrql); - StartingOffset = RtlFindClearBitsAndSet(&MiMdlMappingRegionAllocMap, - PageCount, - MiMdlMappingRegionHint); - if (StartingOffset == 0xffffffff) - { - KeReleaseSpinLock(&MiMdlMappingRegionLock, oldIrql); - DPRINT("Out of MDL mapping space\n"); - if ((Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) || !BugCheckOnFailure) - { - return NULL; - } - KeBugCheck(MEMORY_MANAGEMENT); - } - Base = (PVOID)((ULONG_PTR)MiMdlMappingRegionBase + StartingOffset * PAGE_SIZE); - if (MiMdlMappingRegionHint == StartingOffset) MiMdlMappingRegionHint += PageCount; - KeReleaseSpinLock(&MiMdlMappingRegionLock, oldIrql); - - /* Set the virtual mappings for the MDL pages. */ - if (Mdl->MdlFlags & MDL_IO_SPACE) - { - /* Map the pages */ - Status = MmCreateVirtualMappingUnsafe(NULL, - Base, - Protect, - MdlPages, - PageCount); - } - else - { - /* Map the pages */ - Status = MmCreateVirtualMapping(NULL, - Base, - Protect, - MdlPages, - PageCount); - } - - /* Check if the mapping suceeded */ - if (!NT_SUCCESS(Status)) - { - /* If it can fail, return NULL */ - if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) return NULL; - - /* Should we bugcheck? */ - if (!BugCheckOnFailure) return NULL; - - /* Yes, crash the system */ - KeBugCheckEx(NO_MORE_SYSTEM_PTES, 0, PageCount, 0, 0); - } - - /* Mark it as mapped */ - ASSERT((Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) == 0); - Mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA; - - /* Check if it was partial */ - if (Mdl->MdlFlags & MDL_PARTIAL) - { - /* Write the appropriate flag here too */ - Mdl->MdlFlags |= MDL_PARTIAL_HAS_BEEN_MAPPED; - } - - /* Save the mapped address */ - Base = (PVOID)((ULONG_PTR)Base + Mdl->ByteOffset); - Mdl->MappedSystemVa = Base; - return Base; - } - - - /* Calculate the number of pages required. */ - MdlPages = (PPFN_NUMBER)(Mdl + 1); - PageCount = PAGE_ROUND_UP(Mdl->ByteCount + Mdl->ByteOffset) / PAGE_SIZE; - - BoundaryAddressMultiple.QuadPart = 0; - Base = BaseAddress; - - CurrentProcess = PsGetCurrentProcess(); - - MmLockAddressSpace(&CurrentProcess->Vm); - Status = MmCreateMemoryArea(&CurrentProcess->Vm, - MEMORY_AREA_MDL_MAPPING, - &Base, - PageCount * PAGE_SIZE, - Protect, - &Result, - (Base != NULL), - 0, - BoundaryAddressMultiple); - MmUnlockAddressSpace(&CurrentProcess->Vm); - if (!NT_SUCCESS(Status)) - { - if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) - { - return NULL; - } - - /* Throw exception */ - ExRaiseStatus(STATUS_ACCESS_VIOLATION); - ASSERT(0); - } - - /* Set the virtual mappings for the MDL pages. */ - if (Mdl->MdlFlags & MDL_IO_SPACE) - { - /* Map the pages */ - Status = MmCreateVirtualMappingUnsafe(CurrentProcess, - Base, - Protect, - MdlPages, - PageCount); - } - else - { - /* Map the pages */ - Status = MmCreateVirtualMapping(CurrentProcess, - Base, - Protect, - MdlPages, - PageCount); - } - - /* Check if the mapping suceeded */ - if (!NT_SUCCESS(Status)) - { - /* If it can fail, return NULL */ - if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) return NULL; - - /* Throw exception */ - ExRaiseStatus(STATUS_ACCESS_VIOLATION); - } - - /* Return the base */ - Base = (PVOID)((ULONG_PTR)Base + Mdl->ByteOffset); - return Base; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmAdvanceMdl(IN PMDL Mdl, - IN ULONG NumberOfBytes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -PVOID -NTAPI -MmMapLockedPagesWithReservedMapping(IN PVOID MappingAddress, - IN ULONG PoolTag, - IN PMDL MemoryDescriptorList, - IN MEMORY_CACHING_TYPE CacheType) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -VOID -NTAPI -MmUnmapReservedMapping(IN PVOID BaseAddress, - IN ULONG PoolTag, - IN PMDL MemoryDescriptorList) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmPrefetchPages(IN ULONG NumberOfLists, - IN PREAD_LIST *ReadLists) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmProtectMdlSystemAddress(IN PMDL MemoryDescriptorList, - IN ULONG NewProtect) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -VOID -NTAPI -MmProbeAndLockProcessPages(IN OUT PMDL MemoryDescriptorList, - IN PEPROCESS Process, - IN KPROCESSOR_MODE AccessMode, - IN LOCK_OPERATION Operation) -{ - UNIMPLEMENTED; -} - - -/* - * @unimplemented - */ -VOID -NTAPI -MmProbeAndLockSelectedPages(IN OUT PMDL MemoryDescriptorList, - IN LARGE_INTEGER PageList[], - IN KPROCESSOR_MODE AccessMode, - IN LOCK_OPERATION Operation) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -VOID -NTAPI -MmMapMemoryDumpMdl(IN PMDL Mdl) -{ - UNIMPLEMENTED; -} - -/* EOF */ - Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jun 30 12:29:22 2009 @@ -392,9 +392,6 @@ /* Initialize paged pool */ MmInitializePagedPool(); - - /* Initialize MDLs */ - MmInitializeMdlImplementation(); /* Initialize working sets */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Tue Jun 30 12:29:22 2009 @@ -620,6 +620,115 @@ MmUnlockAddressSpace(AddressSpace); return Status; +} + +PVOID +NTAPI +MiMapLockedPagesInUserSpace(IN PMDL Mdl, + IN PVOID BaseVa, + IN MEMORY_CACHING_TYPE CacheType, + IN PVOID BaseAddress) +{ + PVOID Base; + PPFN_NUMBER MdlPages; + ULONG PageCount; + PEPROCESS CurrentProcess; + NTSTATUS Status; + ULONG Protect; + MEMORY_AREA *Result; + LARGE_INTEGER BoundaryAddressMultiple; + + /* Calculate the number of pages required. */ + MdlPages = (PPFN_NUMBER)(Mdl + 1); + PageCount = PAGE_ROUND_UP(Mdl->ByteCount + Mdl->ByteOffset) / PAGE_SIZE; + + /* Set default page protection */ + Protect = PAGE_READWRITE; + if (CacheType == MmNonCached) Protect |= PAGE_NOCACHE; + + BoundaryAddressMultiple.QuadPart = 0; + Base = BaseAddress; + + CurrentProcess = PsGetCurrentProcess(); + + MmLockAddressSpace(&CurrentProcess->Vm); + Status = MmCreateMemoryArea(&CurrentProcess->Vm, + MEMORY_AREA_MDL_MAPPING, + &Base, + PageCount * PAGE_SIZE, + Protect, + &Result, + (Base != NULL), + 0, + BoundaryAddressMultiple); + MmUnlockAddressSpace(&CurrentProcess->Vm); + if (!NT_SUCCESS(Status)) + { + if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) + { + return NULL; + } + + /* Throw exception */ + ExRaiseStatus(STATUS_ACCESS_VIOLATION); + ASSERT(0); + } + + /* Set the virtual mappings for the MDL pages. */ + if (Mdl->MdlFlags & MDL_IO_SPACE) + { + /* Map the pages */ + Status = MmCreateVirtualMappingUnsafe(CurrentProcess, + Base, + Protect, + MdlPages, + PageCount); + } + else + { + /* Map the pages */ + Status = MmCreateVirtualMapping(CurrentProcess, + Base, + Protect, + MdlPages, + PageCount); + } + + /* Check if the mapping suceeded */ + if (!NT_SUCCESS(Status)) + { + /* If it can fail, return NULL */ + if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) return NULL; + + /* Throw exception */ + ExRaiseStatus(STATUS_ACCESS_VIOLATION); + } + + /* Return the base */ + Base = (PVOID)((ULONG_PTR)Base + Mdl->ByteOffset); + return Base; +} + +VOID +NTAPI +MiUnmapLockedPagesInUserSpace(IN PVOID BaseAddress, + IN PMDL Mdl) +{ + PMEMORY_AREA MemoryArea; + + /* Sanity check */ + ASSERT(Mdl->Process == PsGetCurrentProcess()); + + /* Find the memory area */ + MemoryArea = MmLocateMemoryAreaByAddress(&Mdl->Process->Vm, + BaseAddress); + ASSERT(MemoryArea); + + /* Free it */ + MmFreeMemoryArea(&Mdl->Process->Vm, + MemoryArea, + NULL, + NULL); } /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Jun 30 12:29:22 2009 @@ -366,6 +366,7 @@ <file>hypermap.c</file> <file>init.c</file> <file>iosup.c</file> + <file>mdlsup.c</file> <file>pool.c</file> <file>procsup.c</file> <file>syspte.c</file> @@ -375,7 +376,6 @@ <file>dbgpool.c</file> <file>freelist.c</file> <file>marea.c</file> - <file>mdlsup.c</file> <file>mmfault.c</file> <file>mmsup.c</file> <file>mminit.c</file>

1 0

[dreimer] 41706: After some heavy testing I can just say the following: The only bug I found were some wrong line skippers, but these were not able to kill a whole Start Menu at uninstall, they just deleted the hard coded RosBE shortcuts even if you said no. As a result I officially say that I have NO clude what goes wrong here and at the bug with a non loading uinstaller if you wanna install over a old version of rosbe. HAAAALP!
by dreimer＠svn.reactos.org 30 Jun '09

30 Jun '09

Author: dreimer Date: Tue Jun 30 11:20:09 2009 New Revision: 41706 URL: http://svn.reactos.org/svn/reactos?rev=41706&view=rev Log: After some heavy testing I can just say the following: The only bug I found were some wrong line skippers, but these were not able to kill a whole Start Menu at uninstall, they just deleted the hard coded RosBE shortcuts even if you said no. As a result I officially say that I have NO clude what goes wrong here and at the bug with a non loading uinstaller if you wanna install over a old version of rosbe. HAAAALP! Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Jun 30 11:20:09 2009 @@ -433,10 +433,10 @@ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Do you want to remove the Shortcuts? If you just want to Update to a new Version of RosBE, keep them. This keeps your previous settings." \ IDNO +5 - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" FunctionEnd Section Uninstall

1 0

[cgutman] 41705: - Memtrack enhancements - It now warns us when it detects an entry that wasn't freed by a memtrack-enabled function - It also provides some info when it detects a double free - Removed some extra tag tracking junk
by cgutman＠svn.reactos.org 30 Jun '09

30 Jun '09

Author: cgutman Date: Tue Jun 30 06:30:36 2009 New Revision: 41705 URL: http://svn.reactos.org/svn/reactos?rev=41705&view=rev Log: - Memtrack enhancements - It now warns us when it detects an entry that wasn't freed by a memtrack-enabled function - It also provides some info when it detects a double free - Removed some extra tag tracking junk Modified: trunk/reactos/drivers/network/tcpip/include/memtrack.h trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/lib/drivers/ip/network/memtrack.c Modified: trunk/reactos/drivers/network/tcpip/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/memtrack.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/memtrack.h [iso-8859-1] Tue Jun 30 06:30:36 2009 @@ -38,7 +38,6 @@ #define Untrack(Thing) UntrackFL(__FILE__,__LINE__,Thing) VOID TrackDumpFL( PCHAR File, ULONG Line ); #define TrackDump() TrackDumpFL(__FILE__,__LINE__) -VOID TrackTag( ULONG Tag ); static __inline PVOID ExAllocateFromNPagedLookasideListX( PNPAGED_LOOKASIDE_LIST List, PCHAR File, ULONG Line ) { PVOID Out = ExAllocateFromNPagedLookasideList( List ); @@ -62,14 +61,12 @@ ExFreePool( Data ); } -#define MEMTRACK_MAX_TAGS_TO_TRACK 64 #else #define MTMARK() #define Track(x,y) #define TrackingInit() #define TrackDump() #define Untrack(x) -#define TrackTag(x) #define exAllocatePoolWithTag(x,y,z) ExAllocatePoolWithTag(x,y,z) #define exAllocatePool(x,y) ExAllocatePool(x,y) #define exFreePool(x) ExFreePool(x) Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Jun 30 06:30:36 2009 @@ -725,10 +725,6 @@ TI_DbgPrint(MAX_TRACE, ("Called.\n")); TrackingInit(); - TrackTag(NDIS_BUFFER_TAG); - TrackTag(NDIS_PACKET_TAG); - TrackTag(FBSD_MALLOC); - TrackTag(EXALLOC_TAG); /* TdiInitialize() ? */ Modified: trunk/reactos/lib/drivers/ip/network/memtrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/mem… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] Tue Jun 30 06:30:36 2009 @@ -8,14 +8,6 @@ static LIST_ENTRY AllocatedObjectsList; static KSPIN_LOCK AllocatedObjectsLock; static NPAGED_LOOKASIDE_LIST AllocatedObjectsLookasideList; -ULONG TagsToShow[MEMTRACK_MAX_TAGS_TO_TRACK] = { 0 }; - -VOID TrackTag( ULONG Tag ) { - UINT i; - - for( i = 0; TagsToShow[i]; i++ ); - TagsToShow[i] = Tag; -} VOID TrackingInit() { TcpipInitializeSpinLock( &AllocatedObjectsLock ); @@ -82,9 +74,8 @@ if( ThingInList->Thing == Thing ) { RemoveEntryList(Entry); - TI_DbgPrint(MAX_TRACE,("TRACK: SPECIFIED ALREADY ALLOCATED ITEM %x\n", Thing)); - ShowTrackedThing( "Double Alloc (Item in list)", ThingInList, FALSE ); - ShowTrackedThing( "Double Alloc (Item not in list)", TrackedThing, FALSE ); + ShowTrackedThing( "Double Alloc (Item in list)", ThingInList, TRUE ); + ShowTrackedThing( "Double Alloc (Item not in list)", TrackedThing, TRUE ); ExFreeToNPagedLookasideList( &AllocatedObjectsLookasideList, ThingInList ); @@ -97,14 +88,6 @@ InsertHeadList( &AllocatedObjectsList, &TrackedThing->Entry ); TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); -} - -BOOLEAN ShowTag( ULONG Tag ) { - UINT i; - - for( i = 0; TagsToShow[i] && TagsToShow[i] != Tag; i++ ); - - return TagsToShow[i] ? TRUE : FALSE; } VOID UntrackFL( PCHAR File, ULONG Line, PVOID Thing, ULONG Tag ) { @@ -132,13 +115,21 @@ TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); - /* TrackDumpFL( File, Line ); */ return; } Entry = Entry->Flink; } TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); - DbgPrint("UNTRACK: SPECIFIED ALREADY FREE ITEM %x\n", Thing); + + DbgPrint("[Double Free] Thing %08x %c%c%c%c (%s:%d)\n", + Thing, + ((PCHAR)&Tag)[3], + ((PCHAR)&Tag)[2], + ((PCHAR)&Tag)[1], + ((PCHAR)&Tag)[0], + File, + Line); + ASSERT( FALSE ); }

1 0

[mkupfer] 41704: - revert selecting color and inactive menu state, because it doesn't work that way - needs further invastigation
by mkupfer＠svn.reactos.org 30 Jun '09

30 Jun '09

Author: mkupfer Date: Tue Jun 30 04:44:59 2009 New Revision: 41704 URL: http://svn.reactos.org/svn/reactos?rev=41704&view=rev Log: - revert selecting color and inactive menu state, because it doesn't work that way - needs further invastigation Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Tue Jun 30 04:44:59 2009 @@ -1023,6 +1023,8 @@ hFont = CreateFontIndirect(&lf); /* save font */ hOldFont = SelectObject(dc, hFont); + // FIXME selecting color doesn't work +#if 0 if(uFlags & DFCS_INACTIVE) { /* draw shadow */ @@ -1030,6 +1032,7 @@ TextOut(dc, r->left + 1, r->top + 1, &Symbol, 1); } SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); +#endif /* draw selected symbol */ TextOut(dc, r->left, r->top, &Symbol, 1); /* restore previous settings */

1 0

[dreimer] 41703: As always... post release problems. Try to fix a bug noone saw before in our installer
by dreimer＠svn.reactos.org 29 Jun '09

29 Jun '09

Author: dreimer Date: Tue Jun 30 02:56:41 2009 New Revision: 41703 URL: http://svn.reactos.org/svn/reactos?rev=41703&view=rev Log: As always... post release problems. Try to fix a bug noone saw before in our installer Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Jun 30 02:56:41 2009 @@ -423,16 +423,16 @@ IfFileExists "$PROFILE\RosBE\." 0 +5 MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Do you want to remove the ReactOS Build Environment configuration file from the Profile Path?" \ - IDNO +1 + IDNO +2 RMDir /r /REBOOTOK "$PROFILE\RosBE" IfFileExists "$APPDATA\RosBE\." 0 +5 MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Do you want to remove the ReactOS Build Environment configuration file from the Application Data Path?" \ - IDNO +1 + IDNO +2 RMDir /r /REBOOTOK "$APPDATA\RosBE" MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Do you want to remove the Shortcuts? If you just want to Update to a new Version of RosBE, keep them. This keeps your previous settings." \ - IDNO +9 + IDNO +5 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk"

1 0

[cfinck] 41702: Andrew Steinborn (asteinborn78@gmail.com) - Update Firefox link to 3.0.11 Will also be merged to the 0.3.10 release once I clean up the Downloader list there. See issue #4642 for more details.
by cfinck＠svn.reactos.org 29 Jun '09

29 Jun '09

Author: cfinck Date: Tue Jun 30 02:21:11 2009 New Revision: 41702 URL: http://svn.reactos.org/svn/reactos?rev=41702&view=rev Log: Andrew Steinborn (asteinborn78(a)gmail.com) - Update Firefox link to 3.0.11 Will also be merged to the 0.3.10 release once I clean up the Downloader list there. See issue #4642 for more details. Modified: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Tue Jun 30 02:21:11 2009 @@ -8,11 +8,11 @@ <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32…</location> </application> <application name="Firefox 3.0"> - <regname>Mozilla Firefox (3.0.9)</regname> + <regname>Mozilla Firefox (3.0.11)</regname> <licence>MPL/GPL/LGPL</licence> - <version>3.0.9</version> + <version>3.0.11</version> <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/en…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.11/win32/e…</location> </application> <application name="Opera"> <regname>Opera</regname>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009