Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 43483: - Add required globals for the ARM port.
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 19:41:09 2009 New Revision: 43483 URL: http://svn.reactos.org/svn/reactos?rev=43483&view=rev Log: - Add required globals for the ARM port. Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Thu Oct 15 19:41:09 2009 @@ -24,9 +24,36 @@ PVOID MmNonPagedSystemStart; PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; -PVOID MmNonPagedPoolEnd = (PVOID)0xFFBE0000; +PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; +PVOID MmPagedPoolStart = MI_PAGED_POOL_START; +PVOID MmPagedPoolEnd; +ULONG MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; +PVOID MiSessionSpaceEnd; +PVOID MiSessionImageEnd; +PVOID MiSessionImageStart; +PVOID MiSessionViewStart; +PVOID MiSessionPoolEnd; +PVOID MiSessionPoolStart; +PVOID MmSessionBase; +ULONG MmSessionSize; +ULONG MmSessionViewSize; +ULONG MmSessionPoolSize; +ULONG MmSessionImageSize; +PVOID MiSystemViewStart; +ULONG MmSystemViewSize; +PFN_NUMBER MmSystemPageDirectory; +PMMPTE MmSystemPagePtes; ULONG MmNumberOfSystemPtes; +ULONG MxPfnAllocation; +RTL_BITMAP MiPfnBitMap; PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; +PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; +MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; +ULONG MmBootImageSize; +ULONG MmUserProbeAddress; +PVOID MmHighestUserAddress; +PVOID MmSystemRangeStart; /* PRIVATE FUNCTIONS **********************************************************/

1 0

[ros-arm-bringup] 43482: - Fix calculations error in the setup of the paged pool bitmap. - Initialize the paged pool guarded mutex. - Add helper routines ExLock/UnlockPool to either acquire the NPP QSL or the PP GM depending on the pool descriptor, instead of hardcoding the NPP QSL. - Implement InitializePool for the PagedPool case. - Now call InitializePool for PagedPool as well.
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 19:23:21 2009 New Revision: 43482 URL: http://svn.reactos.org/svn/reactos?rev=43482&view=rev Log: - Fix calculations error in the setup of the paged pool bitmap. - Initialize the paged pool guarded mutex. - Add helper routines ExLock/UnlockPool to either acquire the NPP QSL or the PP GM depending on the pool descriptor, instead of hardcoding the NPP QSL. - Implement InitializePool for the PagedPool case. - Now call InitializePool for PagedPool as well. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Thu Oct 15 19:23:21 2009 @@ -20,6 +20,7 @@ POOL_DESCRIPTOR NonPagedPoolDescriptor; PPOOL_DESCRIPTOR PoolVector[2]; +PKGUARDED_MUTEX ExpPagedPoolMutex; /* PRIVATE FUNCTIONS **********************************************************/ @@ -69,18 +70,107 @@ InitializePool(IN POOL_TYPE PoolType, IN ULONG Threshold) { - ASSERT(PoolType == NonPagedPool); - - // - // Initialize the nonpaged pool descirptor - // - PoolVector[PoolType] = &NonPagedPoolDescriptor; - ExInitializePoolDescriptor(PoolVector[PoolType], - PoolType, - 0, - Threshold, - NULL); -} + PPOOL_DESCRIPTOR Descriptor; + + // + // Check what kind of pool this is + // + if (PoolType == NonPagedPool) + { + // + // Initialize the nonpaged pool descriptor + // + PoolVector[NonPagedPool] = &NonPagedPoolDescriptor; + ExInitializePoolDescriptor(PoolVector[NonPagedPool], + NonPagedPool, + 0, + Threshold, + NULL); + } + else + { + // + // Allocate the pool descriptor + // + Descriptor = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KGUARDED_MUTEX) + + sizeof(POOL_DESCRIPTOR), + 'looP'); + if (!Descriptor) + { + // + // This is really bad... + // + KeBugCheckEx(MUST_SUCCEED_POOL_EMPTY, + 0, + -1, + -1, + -1); + } + + // + // Setup the vector and guarded mutex for paged pool + // + PoolVector[PagedPool] = Descriptor; + ExpPagedPoolMutex = (PKGUARDED_MUTEX)(Descriptor + 1); + KeInitializeGuardedMutex(ExpPagedPoolMutex); + ExInitializePoolDescriptor(Descriptor, + PagedPool, + 0, + Threshold, + ExpPagedPoolMutex); + } +} + +FORCEINLINE +KIRQL +ExLockPool(IN PPOOL_DESCRIPTOR Descriptor) +{ + // + // Check if this is nonpaged pool + // + if ((Descriptor->PoolType & BASE_POOL_TYPE_MASK) == NonPagedPool) + { + // + // Use the queued spin lock + // + return KeAcquireQueuedSpinLock(LockQueueNonPagedPoolLock); + } + else + { + // + // Use the guarded mutex + // + KeAcquireGuardedMutex(Descriptor->LockAddress); + return APC_LEVEL; + } +} + +FORCEINLINE +VOID +ExUnlockPool(IN PPOOL_DESCRIPTOR Descriptor, + IN KIRQL OldIrql) +{ + // + // Check if this is nonpaged pool + // + if ((Descriptor->PoolType & BASE_POOL_TYPE_MASK) == NonPagedPool) + { + // + // Use the queued spin lock + // + KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + } + else + { + // + // Use the guarded mutex + // + KeReleaseGuardedMutex(Descriptor->LockAddress); + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ PVOID NTAPI @@ -153,7 +243,7 @@ // // Acquire the nonpaged pool lock now // - OldIrql = KeAcquireQueuedSpinLock(LockQueueNonPagedPoolLock); + OldIrql = ExLockPool(PoolDesc); // // And make sure the list still has entries @@ -166,7 +256,7 @@ // // Try again! // - KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + ExUnlockPool(PoolDesc, OldIrql); ListHead++; continue; } @@ -292,7 +382,7 @@ // and release the lock since we're done // Entry->PoolType = PoolType + 1; - KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + ExUnlockPool(PoolDesc, OldIrql); // // Return the pool allocation @@ -332,7 +422,7 @@ // // Excellent -- acquire the nonpaged pool lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueueNonPagedPoolLock); + OldIrql = ExLockPool(PoolDesc); // // And insert the free entry into the free list for this block size @@ -343,7 +433,7 @@ // // Release the nonpaged pool lock // - KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + ExUnlockPool(PoolDesc, OldIrql); } // @@ -408,7 +498,7 @@ // // Acquire the nonpaged pool lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueueNonPagedPoolLock); + OldIrql = ExLockPool(PoolDesc); // // Check if the next allocation is at the end of the page @@ -500,7 +590,7 @@ // // In this case, release the nonpaged pool lock, and free the page // - KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + ExUnlockPool(PoolDesc, OldIrql); MiFreePoolPages(Entry); return; } @@ -534,7 +624,7 @@ // Insert this new free block, and release the nonpaged pool lock // InsertHeadList(&PoolDesc->ListHeads[BlockSize - 1], (PLIST_ENTRY)Entry + 1); - KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + ExUnlockPool(PoolDesc, OldIrql); } VOID Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Oct 15 19:23:21 2009 @@ -540,14 +540,15 @@ // Size = Size * 1024; ASSERT(Size == MmSizeOfPagedPoolInPages); - BitMapSize = sizeof(RTL_BITMAP) + (((Size + 31) / 32) * sizeof(ULONG)); + BitMapSize = Size; + Size = sizeof(RTL_BITMAP) + (((Size + 31) / 32) * sizeof(ULONG)); // // Allocate the allocation bitmap, which tells us which regions have not yet // been mapped into memory // MmPagedPoolInfo.PagedPoolAllocationMap = ExAllocatePoolWithTag(NonPagedPool, - BitMapSize, + Size, ' mM'); ASSERT(MmPagedPoolInfo.PagedPoolAllocationMap); @@ -568,7 +569,7 @@ // entire allocation is. // MmPagedPoolInfo.EndOfPagedPoolBitmap = ExAllocatePoolWithTag(NonPagedPool, - BitMapSize, + Size, ' mM'); ASSERT(MmPagedPoolInfo.EndOfPagedPoolBitmap); RtlInitializeBitMap(MmPagedPoolInfo.EndOfPagedPoolBitmap, @@ -583,7 +584,12 @@ // // Initialize paged pool. // - //InitializePool(PagedPool, 0); + InitializePool(PagedPool, 0); + + // + // Initialize the paged pool mutex + // + KeInitializeGuardedMutex(&MmPagedPoolMutex); } NTSTATUS 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] Thu Oct 15 19:23:21 2009 @@ -146,6 +146,7 @@ extern ULONG MxPfnAllocation; extern MM_PAGED_POOL_INFO MmPagedPoolInfo; extern RTL_BITMAP MiPfnBitMap; +extern KGUARDED_MUTEX MmPagedPoolMutex; VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Thu Oct 15 19:23:21 2009 @@ -22,7 +22,7 @@ PFN_NUMBER MmNumberOfFreeNonPagedPool, MiExpansionPoolPagesInitialCharge; PVOID MmNonPagedPoolEnd0; PFN_NUMBER MiStartOfInitialPoolFrame, MiEndOfInitialPoolFrame; - +KGUARDED_MUTEX MmPagedPoolMutex; MM_PAGED_POOL_INFO MmPagedPoolInfo; /* PRIVATE FUNCTIONS **********************************************************/

1 0

[ros-arm-bringup] 43481: - Get rid of mm/mmsup.c and move some of the ROS-internal functions better where they belong. - Add ARM3/mmsup.c for miscellaneous function helper functions. - Implemented: - Move MmIsRecursiveIoFault, MmIsThisanNtAsSystem and MmQuerySystemSize. These belong here. - Unimplemented: - Move MmSetBankedSection and fix the prototype. This should probably go somewhere else later. - Move MmAdjustWorkingSetSize and fix the prototype. This should probably go in procsup.c later. -
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 19:01:31 2009 New Revision: 43481 URL: http://svn.reactos.org/svn/reactos?rev=43481&view=rev Log: - Get rid of mm/mmsup.c and move some of the ROS-internal functions better where they belong. - Add ARM3/mmsup.c for miscellaneous function helper functions. - Implemented: - Move MmIsRecursiveIoFault, MmIsThisanNtAsSystem and MmQuerySystemSize. These belong here. - Unimplemented: - Move MmSetBankedSection and fix the prototype. This should probably go somewhere else later. - Move MmAdjustWorkingSetSize and fix the prototype. This should probably go in procsup.c later. - Move MmMapUserAddressesToPage. This should also probably go in procsup.c later. - Move MmSetAddressrangeModified and MmIsNonPagedsystemAddressValid. These should probably go somewhere else later. Added: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c (with props) Removed: trunk/reactos/ntoskrnl/mm/mmsup.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Added: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c [iso-8859-1] Thu Oct 15 19:01:31 2009 @@ -1,0 +1,133 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/mmsup.c + * PURPOSE: ARM Memory Manager Support Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::MMSUP" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +BOOLEAN IsThisAnNtAsSystem = FALSE; +MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +MmMapUserAddressesToPage(IN PVOID BaseAddress, + IN SIZE_T NumberOfBytes, + IN PVOID PageAddress) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +MmAdjustWorkingSetSize(IN SIZE_T WorkingSetMinimumInBytes, + IN SIZE_T WorkingSetMaximumInBytes, + IN ULONG SystemCache, + IN BOOLEAN IncreaseOkay) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +MmSetAddressRangeModified(IN PVOID Address, + IN SIZE_T Length) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +MmIsNonPagedSystemAddressValid(IN PVOID VirtualAddress) +{ + DPRINT1("WARNING: %s returns bogus result\n", __FUNCTION__); + return MmIsAddressValid(VirtualAddress); +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +MmSetBankedSection(IN HANDLE ProcessHandle, + IN PVOID VirtualAddress, + IN ULONG BankLength, + IN BOOLEAN ReadWriteBank, + IN PVOID BankRoutine, + IN PVOID Context) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +MmIsRecursiveIoFault(VOID) +{ + PETHREAD Thread = PsGetCurrentThread(); + + // + // If any of these is true, this is a recursive fault + // + return ((Thread->DisablePageFaultClustering) | (Thread->ForwardClusterOnly)); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +MmIsThisAnNtAsSystem(VOID) +{ + // + // Return if this is a server system + // + return IsThisAnNtAsSystem; +} + +/* + * @implemented + */ +MM_SYSTEMSIZE +NTAPI +MmQuerySystemSize(VOID) +{ + // + // Return the low, medium or high memory system type + // + return MmSystemSize; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c ------------------------------------------------------------------------------ svn:mime-type = text/plain 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] Thu Oct 15 19:01:31 2009 @@ -1079,6 +1079,25 @@ NTSTATUS NTAPI +MiZeroPage(PFN_TYPE Page) +{ + KIRQL Irql; + PVOID TempAddress; + + Irql = KeRaiseIrqlToDpcLevel(); + TempAddress = MiMapPageToZeroInHyperSpace(Page); + if (TempAddress == NULL) + { + return(STATUS_NO_MEMORY); + } + memset(TempAddress, 0, PAGE_SIZE); + MiUnmapPagesInZeroSpace(TempAddress, 1); + KeLowerIrql(Irql); + return(STATUS_SUCCESS); +} + +NTSTATUS +NTAPI MmZeroPageThreadMain(PVOID Ignored) { NTSTATUS Status; Removed: trunk/reactos/ntoskrnl/mm/mmsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmsup.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmsup.c (removed) @@ -1,145 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/mmsup.c - * PURPOSE: Kernel memory managment functions - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ********************************************************************/ - -BOOLEAN IsThisAnNtAsSystem = FALSE; -MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; - -/* PRIVATE FUNCTIONS **********************************************************/ - -NTSTATUS -NTAPI -MiZeroPage(PFN_TYPE Page) -{ - KIRQL Irql; - PVOID TempAddress; - - Irql = KeRaiseIrqlToDpcLevel(); - TempAddress = MiMapPageToZeroInHyperSpace(Page); - if (TempAddress == NULL) - { - return(STATUS_NO_MEMORY); - } - memset(TempAddress, 0, PAGE_SIZE); - MiUnmapPagesInZeroSpace(TempAddress, 1); - KeLowerIrql(Irql); - return(STATUS_SUCCESS); -} - -NTSTATUS -NTAPI -MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress) -{ - PEPROCESS Process; - KIRQL Irql; - PVOID TempAddress; - - Process = PsGetCurrentProcess(); - TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); - if (TempAddress == NULL) - { - return(STATUS_NO_MEMORY); - } - memcpy(TempAddress, SourceAddress, PAGE_SIZE); - MiUnmapPageInHyperSpace(Process, TempAddress, Irql); - return(STATUS_SUCCESS); -} - -/* PRIVATE FUNCTIONS **********************************************************/ - -/* Miscellanea functions: they may fit somewhere else */ - -/* - * @implemented - */ -BOOLEAN -NTAPI -MmIsRecursiveIoFault (VOID) -{ - PETHREAD Thread = PsGetCurrentThread(); - - return (Thread->DisablePageFaultClustering | Thread->ForwardClusterOnly); -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmMapUserAddressesToPage(IN PVOID BaseAddress, - IN SIZE_T NumberOfBytes, - IN PVOID PageAddress) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -ULONG NTAPI -MmAdjustWorkingSetSize (ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3) -{ - UNIMPLEMENTED; - return (0); -} - -/* - * @unimplemented - */ -BOOLEAN -NTAPI -MmSetAddressRangeModified ( - IN PVOID Address, - IN ULONG Length -) -{ - UNIMPLEMENTED; - return (FALSE); -} - -/* - * @implemented - */ -BOOLEAN NTAPI MmIsNonPagedSystemAddressValid(PVOID VirtualAddress) -{ - DPRINT1("WARNING: %s returns bogus result\n", __FUNCTION__); - return MmIsAddressValid(VirtualAddress); -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -MmIsThisAnNtAsSystem(VOID) -{ - return IsThisAnNtAsSystem; -} - -/* - * @implemented - */ -MM_SYSTEMSIZE -NTAPI -MmQuerySystemSize(VOID) -{ - return MmSystemSize; -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Oct 15 19:01:31 2009 @@ -572,6 +572,25 @@ } } return FALSE; +} + +NTSTATUS +NTAPI +MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress) +{ + PEPROCESS Process; + KIRQL Irql; + PVOID TempAddress; + + Process = PsGetCurrentProcess(); + TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); + if (TempAddress == NULL) + { + return(STATUS_NO_MEMORY); + } + memcpy(TempAddress, SourceAddress, PAGE_SIZE); + MiUnmapPageInHyperSpace(Process, TempAddress, Irql); + return(STATUS_SUCCESS); } NTSTATUS @@ -4941,22 +4960,6 @@ return STATUS_NOT_IMPLEMENTED; } -/* - * @unimplemented - */ -NTSTATUS NTAPI -MmSetBankedSection (ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5) -{ - UNIMPLEMENTED; - return (STATUS_NOT_IMPLEMENTED); -} - - /********************************************************************** * NAME EXPORTED * MmCreateSection@ 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] Thu Oct 15 19:01:31 2009 @@ -390,6 +390,7 @@ <file>hypermap.c</file> <file>iosup.c</file> <file>mdlsup.c</file> + <file>mmsup.c</file> <file>ncache.c</file> <file>pool.c</file> <file>procsup.c</file> @@ -402,7 +403,6 @@ <file>freelist.c</file> <file>marea.c</file> <file>mmfault.c</file> - <file>mmsup.c</file> <file>mminit.c</file> <file>mpw.c</file> <file>pagefile.c</file>

1 0

[ros-arm-bringup] 43480: - Multiple Virtual Memory API fixes: - MiDoMappedcopy: The MDL should have 16 pages total, so MI_MAPPED_COPY_PAGES should be 14, not 16, to account for the MDL page itself, and the extra add-on page. - MiDoMappedCopy: Check for working set quota exception. - NtRead/WriteVirtualMemory: Do not attempt to do any work if the size is 0. - NtRead/WriteVirtualMemory: Do not return SEH status if we fail to write the number of bytes read/written -- return the function status. - N
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 18:50:49 2009 New Revision: 43480 URL: http://svn.reactos.org/svn/reactos?rev=43480&view=rev Log: - Multiple Virtual Memory API fixes: - MiDoMappedcopy: The MDL should have 16 pages total, so MI_MAPPED_COPY_PAGES should be 14, not 16, to account for the MDL page itself, and the extra add-on page. - MiDoMappedCopy: Check for working set quota exception. - NtRead/WriteVirtualMemory: Do not attempt to do any work if the size is 0. - NtRead/WriteVirtualMemory: Do not return SEH status if we fail to write the number of bytes read/written -- return the function status. - NtProtectVirtualMemory: Protect the memory while attached to the target process. - NtProtectVirtualMemory: Do not return SEH status if we fail to write the number of bytes protected -- return the function status. - NtLock/UnlockVirtualMemory: Fix incorrect function definition. The last parameter is a bitfield. The middle two parameters are pointers, not values. - VirtualLock/Unlock: Fix calling NtLock/UnlockVirtualMemory with new correct function definitions. Call with MAP_PROCESS. - NtLock/UnlockVirtualMemory: Apply SEH. Validate flags. Validate parameters. - NtLock/UnlockVirtualMemory: Attach to the process while doing the operation. Reference the process. - NtLock/UnlockVirtualMemory: Check for SE_LOCK_MEMORY_PRIVILEGE if MAP_SYSTEM is specified. - Move MAP_SYSTEM and MAP_PROCESS from ntifs.h to mmtypes.h in NDK. - NtLock/UnlockVirtualMemory: Return success and semi-legitimate return values saying nothing was actually done. - NtFlushVirtualMemory: Apply SEH. Validate flags. Validate parameters. Call MmFlushVirtualMemory. - NtFlushVirtualMemory: Reference the process. - NtFlushVirtualMemory: Return success and semi-legitimate return values indicating nothing was flushed. - NtGetWriteWatch: Fix function prototype. - NtGet/ResetWriteWatch: Apply SEH instead of hacked parameter checks. Validate parameters. - NtGet/ResetWriteWatch: Reference the process. - NtGet/ResetWriteWatch: Return semi-legitimate return values indicating nothing was written to. - These APIs are now owned by ARM3. Added: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c (with props) Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/mmfuncs.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/vir… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -170,14 +170,15 @@ VirtualLock(IN LPVOID lpAddress, IN SIZE_T dwSize) { - ULONG BytesLocked; - NTSTATUS Status; + NTSTATUS Status; + ULONG RegionSize = dwSize; + PVOID BaseAddress = lpAddress; /* Lock the memory */ Status = NtLockVirtualMemory(NtCurrentProcess(), - lpAddress, - dwSize, - &BytesLocked); + &BaseAddress, + &RegionSize, + MAP_PROCESS); if (!NT_SUCCESS(Status)) { /* We failed */ @@ -244,14 +245,15 @@ VirtualUnlock(IN LPVOID lpAddress, IN SIZE_T dwSize) { - ULONG BytesLocked; - NTSTATUS Status; - - /* Unlock the memory */ + NTSTATUS Status; + ULONG RegionSize = dwSize; + PVOID BaseAddress = lpAddress; + + /* Lock the memory */ Status = NtUnlockVirtualMemory(NtCurrentProcess(), - lpAddress, - dwSize, - &BytesLocked); + &BaseAddress, + &RegionSize, + MAP_PROCESS); if (!NT_SUCCESS(Status)) { /* We failed */ Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=43… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -329,8 +329,6 @@ #define MAILSLOT_SIZE_AUTO 0 -#define MAP_PROCESS 1L -#define MAP_SYSTEM 2L #define MEM_DOS_LIM 0x40000000 #define MCB_FLAG_RAISE_ON_ALLOCATION_FAILURE 1 Modified: trunk/reactos/include/ndk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -173,10 +173,10 @@ NTSTATUS NTAPI NtLockVirtualMemory( - HANDLE ProcessHandle, - PVOID BaseAddress, - SIZE_T NumberOfBytesToLock, - PSIZE_T NumberOfBytesLocked + IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToLock, + IN ULONG MapType ); NTSTATUS @@ -278,9 +278,9 @@ NTAPI NtUnlockVirtualMemory( IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN SIZE_T NumberOfBytesToUnlock, - OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToUnlock, + IN ULONG MapType ); NTSYSCALLAPI @@ -367,10 +367,10 @@ NTSTATUS NTAPI ZwLockVirtualMemory( - HANDLE ProcessHandle, - PVOID BaseAddress, - SIZE_T NumberOfBytesToLock, - PSIZE_T NumberOfBytesLocked + IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToLock, + IN ULONG MapType ); NTSYSAPI @@ -448,9 +448,9 @@ NTAPI ZwUnlockVirtualMemory( IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN SIZE_T NumberOfBytesToUnlock, - OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToUnlock, + IN ULONG MapType ); NTSYSAPI Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -56,6 +56,12 @@ #define MMPFNUSE_AWEPAGE 9 #define MMPFNUSE_DRIVERLOCKPAGE 10 #define MMPFNUSE_KERNELSTACK 11 + +// +// Lock/Unlock Virtuam Memory Flags +// +#define MAP_PROCESS 1 +#define MAP_SYSTEM 2 #ifndef NTOS_MODE_USER Added: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -1,0 +1,1757 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/virtual.c + * PURPOSE: ARM Memory Manager Virtual Memory Management + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::VIRTUAL" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +#define MI_MAPPED_COPY_PAGES 14 +#define MI_POOL_COPY_BYTES 512 +#define MI_MAX_TRANSFER_SIZE 64 * 1024 + +NTSTATUS NTAPI +MiProtectVirtualMemory(IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToProtect, + IN ULONG NewAccessProtection, + OUT PULONG OldAccessProtection OPTIONAL); + +/* PRIVATE FUNCTIONS **********************************************************/ + +LONG +MiGetExceptionInfo(IN PEXCEPTION_POINTERS ExceptionInfo, + OUT PBOOLEAN HaveBadAddress, + OUT PULONG_PTR BadAddress) +{ + PEXCEPTION_RECORD ExceptionRecord; + PAGED_CODE(); + + // + // Assume default + // + *HaveBadAddress = FALSE; + + // + // Get the exception record + // + ExceptionRecord = ExceptionInfo->ExceptionRecord; + + // + // Look at the exception code + // + if ((ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) || + (ExceptionRecord->ExceptionCode == STATUS_GUARD_PAGE_VIOLATION) || + (ExceptionRecord->ExceptionCode == STATUS_IN_PAGE_ERROR)) + { + // + // We can tell the address if we have more than one parameter + // + if (ExceptionRecord->NumberParameters > 1) + { + // + // Return the address + // + *HaveBadAddress = TRUE; + *BadAddress = ExceptionRecord->ExceptionInformation[1]; + } + } + + // + // Continue executing the next handler + // + return EXCEPTION_EXECUTE_HANDLER; +} + +NTSTATUS +NTAPI +MiDoMappedCopy(IN PEPROCESS SourceProcess, + IN PVOID SourceAddress, + IN PEPROCESS TargetProcess, + OUT PVOID TargetAddress, + IN SIZE_T BufferSize, + IN KPROCESSOR_MODE PreviousMode, + OUT PSIZE_T ReturnSize) +{ + PFN_NUMBER MdlBuffer[(sizeof(MDL) / sizeof(PFN_NUMBER)) + MI_MAPPED_COPY_PAGES + 1]; + PMDL Mdl = (PMDL)MdlBuffer; + SIZE_T TotalSize, CurrentSize, RemainingSize; + volatile BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; + volatile BOOLEAN PagesLocked; + PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; + volatile PVOID MdlAddress; + KAPC_STATE ApcState; + BOOLEAN HaveBadAddress; + ULONG_PTR BadAddress; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + // + // Calculate the maximum amount of data to move + // + TotalSize = MI_MAPPED_COPY_PAGES * PAGE_SIZE; + if (BufferSize <= TotalSize) TotalSize = BufferSize; + CurrentSize = TotalSize; + RemainingSize = BufferSize; + + // + // Loop as long as there is still data + // + while (RemainingSize > 0) + { + // + // Check if this transfer will finish everything off + // + if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; + + // + // Attach to the source address space + // + KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); + + // + // Reset state for this pass + // + MdlAddress = NULL; + PagesLocked = FALSE; + FailedInMoving = FALSE; + ASSERT(FailedInProbe == FALSE); + + // + // Protect user-mode copy + // + _SEH2_TRY + { + // + // If this is our first time, probe the buffer + // + if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) + { + // + // Catch a failure here + // + FailedInProbe = TRUE; + + // + // Do the probe + // + ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); + + // + // Passed + // + FailedInProbe = FALSE; + } + + // + // Initialize and probe and lock the MDL + // + MmInitializeMdl(Mdl, CurrentAddress, CurrentSize); + MmProbeAndLockPages(Mdl, PreviousMode, IoReadAccess); + PagesLocked = TRUE; + + // + // Now map the pages + // + MdlAddress = MmMapLockedPagesSpecifyCache(Mdl, + KernelMode, + MmCached, + NULL, + FALSE, + HighPagePriority); + if (!MdlAddress) + { + // + // Use our SEH handler to pick this up + // + FailedInMapping = TRUE; + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + + // + // Now let go of the source and grab to the target process + // + KeUnstackDetachProcess(&ApcState); + KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); + + // + // Check if this is our first time through + // + if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) + { + // + // Catch a failure here + // + FailedInProbe = TRUE; + + // + // Do the probe + // + ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); + + // + // Passed + // + FailedInProbe = FALSE; + } + + // + // Now do the actual move + // + FailedInMoving = TRUE; + RtlCopyMemory(CurrentTargetAddress, MdlAddress, CurrentSize); + } + _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), + &HaveBadAddress, + &BadAddress)) + { + // + // Detach from whoever we may be attached to + // + KeUnstackDetachProcess(&ApcState); + + // + // Check if we had mapped the pages + // + if (MdlAddress) MmUnmapLockedPages(MdlAddress, Mdl); + + // + // Check if we had locked the pages + // + if (PagesLocked) MmUnlockPages(Mdl); + + // + // Check if we hit working set quota + // + if (_SEH2_GetExceptionCode() == STATUS_WORKING_SET_QUOTA) + { + // + // Return the error + // + return STATUS_WORKING_SET_QUOTA; + } + + // + // Check if we failed during the probe or mapping + // + if ((FailedInProbe) || (FailedInMapping)) + { + // + // Exit + // + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(return Status); + } + + // + // Otherwise, we failed probably during the move + // + *ReturnSize = BufferSize - RemainingSize; + if (FailedInMoving) + { + // + // Check if we know exactly where we stopped copying + // + if (HaveBadAddress) + { + // + // Return the exact number of bytes copied + // + *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; + } + } + + // + // Return partial copy + // + Status = STATUS_PARTIAL_COPY; + } + _SEH2_END; + + // + // Check for SEH status + // + if (Status != STATUS_SUCCESS) return Status; + + // + // Detach from target + // + KeUnstackDetachProcess(&ApcState); + + // + // Unmap and unlock + // + MmUnmapLockedPages(MdlAddress, Mdl); + MmUnlockPages(Mdl); + + // + // Update location and size + // + RemainingSize -= CurrentSize; + CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); + CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); + } + + // + // All bytes read + // + *ReturnSize = BufferSize; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MiDoPoolCopy(IN PEPROCESS SourceProcess, + IN PVOID SourceAddress, + IN PEPROCESS TargetProcess, + OUT PVOID TargetAddress, + IN SIZE_T BufferSize, + IN KPROCESSOR_MODE PreviousMode, + OUT PSIZE_T ReturnSize) +{ + UCHAR StackBuffer[MI_POOL_COPY_BYTES]; + SIZE_T TotalSize, CurrentSize, RemainingSize; + volatile BOOLEAN FailedInProbe = FALSE, FailedInMoving, HavePoolAddress = FALSE; + PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; + PVOID PoolAddress; + KAPC_STATE ApcState; + BOOLEAN HaveBadAddress; + ULONG_PTR BadAddress; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + // + // Calculate the maximum amount of data to move + // + TotalSize = MI_MAX_TRANSFER_SIZE; + if (BufferSize <= MI_MAX_TRANSFER_SIZE) TotalSize = BufferSize; + CurrentSize = TotalSize; + RemainingSize = BufferSize; + + // + // Check if we can use the stack + // + if (BufferSize <= MI_POOL_COPY_BYTES) + { + // + // Use it + // + PoolAddress = (PVOID)StackBuffer; + } + else + { + // + // Allocate pool + // + PoolAddress = ExAllocatePoolWithTag(NonPagedPool, TotalSize, 'VmRw'); + if (!PoolAddress) ASSERT(FALSE); + HavePoolAddress = TRUE; + } + + // + // Loop as long as there is still data + // + while (RemainingSize > 0) + { + // + // Check if this transfer will finish everything off + // + if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; + + // + // Attach to the source address space + // + KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); + + // + // Reset state for this pass + // + FailedInMoving = FALSE; + ASSERT(FailedInProbe == FALSE); + + // + // Protect user-mode copy + // + _SEH2_TRY + { + // + // If this is our first time, probe the buffer + // + if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) + { + // + // Catch a failure here + // + FailedInProbe = TRUE; + + // + // Do the probe + // + ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); + + // + // Passed + // + FailedInProbe = FALSE; + } + + // + // Do the copy + // + RtlCopyMemory(PoolAddress, CurrentAddress, CurrentSize); + + // + // Now let go of the source and grab to the target process + // + KeUnstackDetachProcess(&ApcState); + KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); + + // + // Check if this is our first time through + // + if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) + { + // + // Catch a failure here + // + FailedInProbe = TRUE; + + // + // Do the probe + // + ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); + + // + // Passed + // + FailedInProbe = FALSE; + } + + // + // Now do the actual move + // + FailedInMoving = TRUE; + RtlCopyMemory(CurrentTargetAddress, PoolAddress, CurrentSize); + } + _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), + &HaveBadAddress, + &BadAddress)) + { + // + // Detach from whoever we may be attached to + // + KeUnstackDetachProcess(&ApcState); + + // + // Check if we had allocated pool + // + if (HavePoolAddress) ExFreePool(PoolAddress); + + // + // Check if we failed during the probe + // + if (FailedInProbe) + { + // + // Exit + // + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(return Status); + } + + // + // Otherwise, we failed, probably during the move + // + *ReturnSize = BufferSize - RemainingSize; + if (FailedInMoving) + { + // + // Check if we know exactly where we stopped copying + // + if (HaveBadAddress) + { + // + // Return the exact number of bytes copied + // + *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; + } + } + + // + // Return partial copy + // + Status = STATUS_PARTIAL_COPY; + } + _SEH2_END; + + // + // Check for SEH status + // + if (Status != STATUS_SUCCESS) return Status; + + // + // Detach from target + // + KeUnstackDetachProcess(&ApcState); + + // + // Update location and size + // + RemainingSize -= CurrentSize; + CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); + CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + + CurrentSize); + } + + // + // Check if we had allocated pool + // + if (HavePoolAddress) ExFreePool(PoolAddress); + + // + // All bytes read + // + *ReturnSize = BufferSize; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MmCopyVirtualMemory(IN PEPROCESS SourceProcess, + IN PVOID SourceAddress, + IN PEPROCESS TargetProcess, + OUT PVOID TargetAddress, + IN SIZE_T BufferSize, + IN KPROCESSOR_MODE PreviousMode, + OUT PSIZE_T ReturnSize) +{ + NTSTATUS Status; + PEPROCESS Process = SourceProcess; + + // + // Don't accept zero-sized buffers + // + if (!BufferSize) return STATUS_SUCCESS; + + // + // If we are copying from ourselves, lock the target instead + // + if (SourceProcess == PsGetCurrentProcess()) Process = TargetProcess; + + // + // Acquire rundown protection + // + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + // + // Fail + // + return STATUS_PROCESS_IS_TERMINATING; + } + + // + // See if we should use the pool copy + // + if (BufferSize > MI_POOL_COPY_BYTES) + { + // + // Use MDL-copy + // + Status = MiDoMappedCopy(SourceProcess, + SourceAddress, + TargetProcess, + TargetAddress, + BufferSize, + PreviousMode, + ReturnSize); + } + else + { + // + // Do pool copy + // + Status = MiDoPoolCopy(SourceProcess, + SourceAddress, + TargetProcess, + TargetAddress, + BufferSize, + PreviousMode, + ReturnSize); + } + + // + // Release the lock + // + ExReleaseRundownProtection(&Process->RundownProtect); + return Status; +} + +NTSTATUS +NTAPI +MmFlushVirtualMemory(IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T RegionSize, + OUT PIO_STATUS_BLOCK IoStatusBlock) +{ + PAGED_CODE(); + UNIMPLEMENTED; + + // + // Fake success + // + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @unimplemented + */ +PVOID +NTAPI +MmGetVirtualForPhysical(IN PHYSICAL_ADDRESS PhysicalAddress) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +MmSecureVirtualMemory(IN PVOID Address, + IN SIZE_T Length, + IN ULONG Mode) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +VOID +NTAPI +MmUnsecureVirtualMemory(IN PVOID SecureMem) +{ + UNIMPLEMENTED; +} + +/* SYSTEM CALLS ***************************************************************/ + +NTSTATUS +NTAPI +NtReadVirtualMemory(IN HANDLE ProcessHandle, + IN PVOID BaseAddress, + OUT PVOID Buffer, + IN SIZE_T NumberOfBytesToRead, + OUT PSIZE_T NumberOfBytesRead OPTIONAL) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PEPROCESS Process; + NTSTATUS Status = STATUS_SUCCESS; + SIZE_T BytesRead = 0; + PAGED_CODE(); + + // + // Check if we came from user mode + // + if (PreviousMode != KernelMode) + { + // + // Validate the read addresses + // + if ((((ULONG_PTR)BaseAddress + NumberOfBytesToRead) < (ULONG_PTR)BaseAddress) || + (((ULONG_PTR)Buffer + NumberOfBytesToRead) < (ULONG_PTR)Buffer) || + (((ULONG_PTR)BaseAddress + NumberOfBytesToRead) > MmUserProbeAddress) || + (((ULONG_PTR)Buffer + NumberOfBytesToRead) > MmUserProbeAddress)) + { + // + // Don't allow to write into kernel space + // + return STATUS_ACCESS_VIOLATION; + } + + // + // Enter SEH for probe + // + _SEH2_TRY + { + // + // Probe the output value + // + if (NumberOfBytesRead) ProbeForWriteSize_t(NumberOfBytesRead); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + + // + // Don't do zero-byte transfers + // + if (NumberOfBytesToRead) + { + // + // Reference the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_READ, + PsProcessType, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (NT_SUCCESS(Status)) + { + // + // Do the copy + // + Status = MmCopyVirtualMemory(Process, + BaseAddress, + PsGetCurrentProcess(), + Buffer, + NumberOfBytesToRead, + PreviousMode, + &BytesRead); + + // + // Dereference the process + // + ObDereferenceObject(Process); + } + } + + // + // Check if the caller sent this parameter + // + if (NumberOfBytesRead) + { + // + // Enter SEH to guard write + // + _SEH2_TRY + { + // + // Return the number of bytes read + // + *NumberOfBytesRead = BytesRead; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + + // + // Return status + // + return Status; +} + +NTSTATUS +NTAPI +NtWriteVirtualMemory(IN HANDLE ProcessHandle, + IN PVOID BaseAddress, + IN PVOID Buffer, + IN SIZE_T NumberOfBytesToWrite, + OUT PSIZE_T NumberOfBytesWritten OPTIONAL) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PEPROCESS Process; + NTSTATUS Status = STATUS_SUCCESS; + ULONG BytesWritten = 0; + PAGED_CODE(); + + // + // Check if we came from user mode + // + if (PreviousMode != KernelMode) + { + // + // Validate the read addresses + // + if ((((ULONG_PTR)BaseAddress + NumberOfBytesToWrite) < (ULONG_PTR)BaseAddress) || + (((ULONG_PTR)Buffer + NumberOfBytesToWrite) < (ULONG_PTR)Buffer) || + (((ULONG_PTR)BaseAddress + NumberOfBytesToWrite) > MmUserProbeAddress) || + (((ULONG_PTR)Buffer + NumberOfBytesToWrite) > MmUserProbeAddress)) + { + // + // Don't allow to write into kernel space + // + return STATUS_ACCESS_VIOLATION; + } + + // + // Enter SEH for probe + // + _SEH2_TRY + { + // + // Probe the output value + // + if (NumberOfBytesWritten) ProbeForWriteSize_t(NumberOfBytesWritten); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + + // + // Don't do zero-byte transfers + // + if (NumberOfBytesToWrite) + { + // + // Reference the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_WRITE, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (NT_SUCCESS(Status)) + { + // + // Do the copy + // + Status = MmCopyVirtualMemory(PsGetCurrentProcess(), + Buffer, + Process, + BaseAddress, + NumberOfBytesToWrite, + PreviousMode, + &BytesWritten); + + // + // Dereference the process + // + ObDereferenceObject(Process); + } + } + + // + // Check if the caller sent this parameter + // + if (NumberOfBytesWritten) + { + // + // Enter SEH to guard write + // + _SEH2_TRY + { + // + // Return the number of bytes written + // + *NumberOfBytesWritten = BytesWritten; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + + // + // Return status + // + return Status; +} + +NTSTATUS +NTAPI +NtProtectVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID *UnsafeBaseAddress, + IN OUT SIZE_T *UnsafeNumberOfBytesToProtect, + IN ULONG NewAccessProtection, + OUT PULONG UnsafeOldAccessProtection) +{ + PEPROCESS Process; + ULONG OldAccessProtection; + ULONG Protection; + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + PVOID BaseAddress = NULL; + SIZE_T NumberOfBytesToProtect = 0; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status; + BOOLEAN Attached = FALSE; + KAPC_STATE ApcState; + PAGED_CODE(); + + // + // Check for valid protection flags + // + Protection = NewAccessProtection & ~(PAGE_GUARD|PAGE_NOCACHE); + if (Protection != PAGE_NOACCESS && + Protection != PAGE_READONLY && + Protection != PAGE_READWRITE && + Protection != PAGE_WRITECOPY && + Protection != PAGE_EXECUTE && + Protection != PAGE_EXECUTE_READ && + Protection != PAGE_EXECUTE_READWRITE && + Protection != PAGE_EXECUTE_WRITECOPY) + { + // + // Fail + // + return STATUS_INVALID_PAGE_PROTECTION; + } + + // + // Check if we came from user mode + // + if (PreviousMode != KernelMode) + { + // + // Enter SEH for probing + // + _SEH2_TRY + { + // + // Validate all outputs + // + ProbeForWritePointer(UnsafeBaseAddress); + ProbeForWriteSize_t(UnsafeNumberOfBytesToProtect); + ProbeForWriteUlong(UnsafeOldAccessProtection); + + // + // Capture them + // + BaseAddress = *UnsafeBaseAddress; + NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + // + // Capture directly + // + BaseAddress = *UnsafeBaseAddress; + NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; + } + + // + // Catch illegal base address + // + if (BaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER_2; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)BaseAddress) < NumberOfBytesToProtect) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER_3; + } + + // + // 0 is also illegal + // + if (!NumberOfBytesToProtect) return STATUS_INVALID_PARAMETER_3; + + // + // Get a reference to the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + // + // Check if we should attach + // + if (CurrentProcess != Process) + { + // + // Do it + // + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + + // + // Do the actual work + // + Status = MiProtectVirtualMemory(Process, + &BaseAddress, + &NumberOfBytesToProtect, + NewAccessProtection, + &OldAccessProtection); + + // + // Detach if needed + // + if (Attached) KeUnstackDetachProcess(&ApcState); + + // + // Release reference + // + ObDereferenceObject(Process); + + // + // Enter SEH to return data + // + _SEH2_TRY + { + // + // Return data to user + // + *UnsafeOldAccessProtection = OldAccessProtection; + *UnsafeBaseAddress = BaseAddress; + *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + // + // Return status + // + return Status; +} + +NTSTATUS +NTAPI +NtLockVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToLock, + IN ULONG MapType) +{ + PEPROCESS Process; + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + NTSTATUS Status; + BOOLEAN Attached = FALSE; + KAPC_STATE ApcState; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PVOID CapturedBaseAddress; + SIZE_T CapturedBytesToLock; + PAGED_CODE(); + + // + // Validate flags + // + if ((MapType & ~(MAP_PROCESS | MAP_SYSTEM))) + { + // + // Invalid set of flags + // + return STATUS_INVALID_PARAMETER; + } + + // + // At least one flag must be specified + // + if (!(MapType & (MAP_PROCESS | MAP_SYSTEM))) + { + // + // No flag given + // + return STATUS_INVALID_PARAMETER; + } + + // + // Enter SEH for probing + // + _SEH2_TRY + { + // + // Validate output data + // + ProbeForWritePointer(BaseAddress); + ProbeForWriteSize_t(NumberOfBytesToLock); + + // + // Capture it + // + CapturedBaseAddress = *BaseAddress; + CapturedBytesToLock = *NumberOfBytesToLock; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + // + // Catch illegal base address + // + if (CapturedBaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)CapturedBaseAddress) < CapturedBytesToLock) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER; + } + + // + // 0 is also illegal + // + if (!CapturedBytesToLock) return STATUS_INVALID_PARAMETER; + + // + // Get a reference to the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + // + // Check if this is is system-mapped + // + if (MapType & MAP_SYSTEM) + { + // + // Check for required privilege + // + if (!SeSinglePrivilegeCheck(SeLockMemoryPrivilege, PreviousMode)) + { + // + // Fail: Don't have it + // + ObDereferenceObject(Process); + return STATUS_PRIVILEGE_NOT_HELD; + } + } + + // + // Check if we should attach + // + if (CurrentProcess != Process) + { + // + // Do it + // + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + + // + // Oops :( + // + UNIMPLEMENTED; + + // + // Detach if needed + // + if (Attached) KeUnstackDetachProcess(&ApcState); + + // + // Release reference + // + ObDereferenceObject(Process); + + // + // Enter SEH to return data + // + _SEH2_TRY + { + // + // Return data to user + // + *BaseAddress = CapturedBaseAddress; + *NumberOfBytesToLock = 0; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + // + // Return status + // + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NtUnlockVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToUnlock, + IN ULONG MapType) +{ + PEPROCESS Process; + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + NTSTATUS Status; + BOOLEAN Attached = FALSE; + KAPC_STATE ApcState; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PVOID CapturedBaseAddress; + SIZE_T CapturedBytesToUnlock; + PAGED_CODE(); + + // + // Validate flags + // + if ((MapType & ~(MAP_PROCESS | MAP_SYSTEM))) + { + // + // Invalid set of flags + // + return STATUS_INVALID_PARAMETER; + } + + // + // At least one flag must be specified + // + if (!(MapType & (MAP_PROCESS | MAP_SYSTEM))) + { + // + // No flag given + // + return STATUS_INVALID_PARAMETER; + } + + // + // Enter SEH for probing + // + _SEH2_TRY + { + // + // Validate output data + // + ProbeForWritePointer(BaseAddress); + ProbeForWriteSize_t(NumberOfBytesToUnlock); + + // + // Capture it + // + CapturedBaseAddress = *BaseAddress; + CapturedBytesToUnlock = *NumberOfBytesToUnlock; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + // + // Catch illegal base address + // + if (CapturedBaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)CapturedBaseAddress) < CapturedBytesToUnlock) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER; + } + + // + // 0 is also illegal + // + if (!CapturedBytesToUnlock) return STATUS_INVALID_PARAMETER; + + // + // Get a reference to the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + // + // Check if this is is system-mapped + // + if (MapType & MAP_SYSTEM) + { + // + // Check for required privilege + // + if (!SeSinglePrivilegeCheck(SeLockMemoryPrivilege, PreviousMode)) + { + // + // Fail: Don't have it + // + ObDereferenceObject(Process); + return STATUS_PRIVILEGE_NOT_HELD; + } + } + + // + // Check if we should attach + // + if (CurrentProcess != Process) + { + // + // Do it + // + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + + // + // Oops :( + // + UNIMPLEMENTED; + + // + // Detach if needed + // + if (Attached) KeUnstackDetachProcess(&ApcState); + + // + // Release reference + // + ObDereferenceObject(Process); + + // + // Enter SEH to return data + // + _SEH2_TRY + { + // + // Return data to user + // + *BaseAddress = PAGE_ALIGN(CapturedBaseAddress); + *NumberOfBytesToUnlock = 0; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + // + // Return status + // + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NtFlushVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToFlush, + OUT PIO_STATUS_BLOCK IoStatusBlock) +{ + PEPROCESS Process; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PVOID CapturedBaseAddress; + SIZE_T CapturedBytesToFlush; + IO_STATUS_BLOCK LocalStatusBlock; + PAGED_CODE(); + + // + // Check if we came from user mode + // + if (PreviousMode != KernelMode) + { + // + // Enter SEH for probing + // + _SEH2_TRY + { + // + // Validate all outputs + // + ProbeForWritePointer(BaseAddress); + ProbeForWriteSize_t(NumberOfBytesToFlush); + ProbeForWriteIoStatusBlock(IoStatusBlock); + + // + // Capture them + // + CapturedBaseAddress = *BaseAddress; + CapturedBytesToFlush = *NumberOfBytesToFlush; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + // + // Capture directly + // + CapturedBaseAddress = *BaseAddress; + CapturedBytesToFlush = *NumberOfBytesToFlush; + } + + // + // Catch illegal base address + // + if (CapturedBaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)CapturedBaseAddress) < CapturedBytesToFlush) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER; + } + + // + // Get a reference to the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + // + // Do it + // + Status = MmFlushVirtualMemory(Process, + &CapturedBaseAddress, + &CapturedBytesToFlush, + &LocalStatusBlock); + + // + // Release reference + // + ObDereferenceObject(Process); + + // + // Enter SEH to return data + // + _SEH2_TRY + { + // + // Return data to user + // + *BaseAddress = PAGE_ALIGN(CapturedBaseAddress); + *NumberOfBytesToFlush = 0; + *IoStatusBlock = LocalStatusBlock; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + // + // Return status + // + return Status; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtGetWriteWatch(IN HANDLE ProcessHandle, + IN ULONG Flags, + IN PVOID BaseAddress, + IN SIZE_T RegionSize, + IN PVOID *UserAddressArray, + OUT PULONG_PTR EntriesInUserAddressArray, + OUT PULONG Granularity) +{ + PEPROCESS Process; + NTSTATUS Status; + PVOID EndAddress; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + ULONG_PTR CapturedEntryCount; + PAGED_CODE(); + + // + // Check if we came from user mode + // + if (PreviousMode != KernelMode) + { + // + // Enter SEH for probing + // + _SEH2_TRY + { + // + // Catch illegal base address + // + if (BaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER_2; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)BaseAddress) < RegionSize) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER_3; + } + + // + // Validate all data + // + ProbeForWriteSize_t(EntriesInUserAddressArray); + ProbeForWriteUlong(Granularity); + + // + // Capture them + // + CapturedEntryCount = *EntriesInUserAddressArray; + + // + // Must have a count + // + if (CapturedEntryCount == 0) return STATUS_INVALID_PARAMETER_5; + + // + // Can't be larger than the maximum + // + if (CapturedEntryCount > (MAXULONG_PTR / sizeof(ULONG_PTR))) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER_5; + } + + // + // Probe the actual array + // + ProbeForWrite(UserAddressArray, + CapturedEntryCount * sizeof(PVOID), + sizeof(PVOID)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + // + // Capture directly + // + CapturedEntryCount = *EntriesInUserAddressArray; + ASSERT(CapturedEntryCount != 0); + } + + // + // Check if this is a local request + // + if (ProcessHandle == NtCurrentProcess()) + { + // + // No need to reference the process + // + Process = PsGetCurrentProcess(); + } + else + { + // + // Reference the target + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID *)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + } + + // + // Compute the last address and validate it + // + EndAddress = (PVOID)((ULONG_PTR)BaseAddress + RegionSize - 1); + if (BaseAddress > EndAddress) + { + // + // Fail + // + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return STATUS_INVALID_PARAMETER_4; + } + + // + // Oops :( + // + UNIMPLEMENTED; + + // + // Dereference if needed + // + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + // + // Enter SEH to return data + // + _SEH2_TRY + { + // + // Return data to user + // + *EntriesInUserAddressArray = 0; + *Granularity = PAGE_SIZE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + // + // Return success + // + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtResetWriteWatch(IN HANDLE ProcessHandle, + IN PVOID BaseAddress, + IN SIZE_T RegionSize) +{ + PVOID EndAddress; + PEPROCESS Process; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + ASSERT (KeGetCurrentIrql() == PASSIVE_LEVEL); + + // + // Catch illegal base address + // + if (BaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER_2; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)BaseAddress) < RegionSize) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER_3; + } + + // + // Check if this is a local request + // + if (ProcessHandle == NtCurrentProcess()) + { + // + // No need to reference the process + // + Process = PsGetCurrentProcess(); + } + else + { + // + // Reference the target + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID *)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + } + + // + // Compute the last address and validate it + // + EndAddress = (PVOID)((ULONG_PTR)BaseAddress + RegionSize - 1); + if (BaseAddress > EndAddress) + { + // + // Fail + // + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return STATUS_INVALID_PARAMETER_3; + } + + // + // Oops :( + // + UNIMPLEMENTED; + + // + // Dereference if needed + // + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + // + // Return success + // + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c ------------------------------------------------------------------------------ svn:mime-type = text/plain 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] Thu Oct 15 18:50:49 2009 @@ -13,391 +13,7 @@ #define NDEBUG #include <debug.h> -#define MI_MAPPED_COPY_PAGES 16 -#define MI_POOL_COPY_BYTES 512 -#define MI_MAX_TRANSFER_SIZE 64 * 1024 -#define TAG_VM 'wRmV' - /* PRIVATE FUNCTIONS **********************************************************/ - -LONG -MiGetExceptionInfo(EXCEPTION_POINTERS *ExceptionInfo, BOOLEAN * HaveBadAddress, ULONG_PTR * BadAddress) -{ - PEXCEPTION_RECORD ExceptionRecord; - PAGED_CODE(); - - /* Assume default */ - *HaveBadAddress = FALSE; - - /* Get the exception record */ - ExceptionRecord = ExceptionInfo->ExceptionRecord; - - /* Look at the exception code */ - if ((ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) || - (ExceptionRecord->ExceptionCode == STATUS_GUARD_PAGE_VIOLATION) || - (ExceptionRecord->ExceptionCode == STATUS_IN_PAGE_ERROR)) - { - /* We can tell the address if we have more than one parameter */ - if (ExceptionRecord->NumberParameters > 1) - { - /* Return the address */ - *HaveBadAddress = TRUE; - *BadAddress = ExceptionRecord->ExceptionInformation[1]; - } - } - - /* Continue executing the next handler */ - return EXCEPTION_EXECUTE_HANDLER; -} - -NTSTATUS -NTAPI -MiDoMappedCopy(IN PEPROCESS SourceProcess, - IN PVOID SourceAddress, - IN PEPROCESS TargetProcess, - OUT PVOID TargetAddress, - IN SIZE_T BufferSize, - IN KPROCESSOR_MODE PreviousMode, - OUT PSIZE_T ReturnSize) -{ - PFN_NUMBER MdlBuffer[(sizeof(MDL) / sizeof(PFN_NUMBER)) + MI_MAPPED_COPY_PAGES + 1]; - PMDL Mdl = (PMDL)MdlBuffer; - SIZE_T TotalSize, CurrentSize, RemainingSize; - volatile BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; - volatile BOOLEAN PagesLocked; - PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; - volatile PVOID MdlAddress; - KAPC_STATE ApcState; - BOOLEAN HaveBadAddress; - ULONG_PTR BadAddress; - PAGED_CODE(); - - /* Calculate the maximum amount of data to move */ - TotalSize = (MI_MAPPED_COPY_PAGES - 2) * PAGE_SIZE; - if (BufferSize <= TotalSize) TotalSize = BufferSize; - CurrentSize = TotalSize; - RemainingSize = BufferSize; - - /* Loop as long as there is still data */ - while (RemainingSize > 0) - { - /* Check if this transfer will finish everything off */ - if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; - - /* Attach to the source address space */ - KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); - - /* Reset state for this pass */ - MdlAddress = NULL; - PagesLocked = FALSE; - FailedInMoving = FALSE; - ASSERT(FailedInProbe == FALSE); - - /* Protect user-mode copy */ - _SEH2_TRY - { - /* If this is our first time, probe the buffer */ - if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) - { - /* Catch a failure here */ - FailedInProbe = TRUE; - - /* Do the probe */ - ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); - - /* Passed */ - FailedInProbe = FALSE; - } - - /* Initialize and probe and lock the MDL */ - MmInitializeMdl (Mdl, CurrentAddress, CurrentSize); - MmProbeAndLockPages (Mdl, PreviousMode, IoReadAccess); - PagesLocked = TRUE; - - /* Now map the pages */ - MdlAddress = MmMapLockedPagesSpecifyCache(Mdl, - KernelMode, - MmCached, - NULL, - FALSE, - HighPagePriority); - if (!MdlAddress) - { - /* Use our SEH handler to pick this up */ - FailedInMapping = TRUE; - ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); - } - - /* Now let go of the source and grab to the target process */ - KeUnstackDetachProcess(&ApcState); - KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); - - /* Check if this is our first time through */ - if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) - { - /* Catch a failure here */ - FailedInProbe = TRUE; - - /* Do the probe */ - ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); - - /* Passed */ - FailedInProbe = FALSE; - } - - /* Now do the actual move */ - FailedInMoving = TRUE; - RtlCopyMemory(CurrentTargetAddress, MdlAddress, CurrentSize); - } - _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), &HaveBadAddress, &BadAddress)) - { - /* Detach from whoever we may be attached to */ - KeUnstackDetachProcess(&ApcState); - - /* Check if we had mapped the pages */ - if (MdlAddress) MmUnmapLockedPages(MdlAddress, Mdl); - - /* Check if we had locked the pages */ - if (PagesLocked) MmUnlockPages(Mdl); - - /* Check if we failed during the probe or mapping */ - if ((FailedInProbe) || (FailedInMapping)) - { - /* Exit */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - - /* Otherwise, we failed probably during the move */ - *ReturnSize = BufferSize - RemainingSize; - if (FailedInMoving) - { - /* Check if we know exactly where we stopped copying */ - if (HaveBadAddress) - { - /* Return the exact number of bytes copied */ - *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; - } - } - - /* Return partial copy */ - _SEH2_YIELD(return STATUS_PARTIAL_COPY); - } - _SEH2_END; - - /* Detach from target */ - KeUnstackDetachProcess(&ApcState); - - /* Unmap and unlock */ - MmUnmapLockedPages(MdlAddress, Mdl); - MmUnlockPages(Mdl); - - /* Update location and size */ - RemainingSize -= CurrentSize; - CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); - CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); - } - - /* All bytes read */ - *ReturnSize = BufferSize; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -MiDoPoolCopy(IN PEPROCESS SourceProcess, - IN PVOID SourceAddress, - IN PEPROCESS TargetProcess, - OUT PVOID TargetAddress, - IN SIZE_T BufferSize, - IN KPROCESSOR_MODE PreviousMode, - OUT PSIZE_T ReturnSize) -{ - UCHAR StackBuffer[MI_POOL_COPY_BYTES]; - SIZE_T TotalSize, CurrentSize, RemainingSize; - volatile BOOLEAN FailedInProbe = FALSE, FailedInMoving, HavePoolAddress = FALSE; - PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; - PVOID PoolAddress; - KAPC_STATE ApcState; - BOOLEAN HaveBadAddress; - ULONG_PTR BadAddress; - PAGED_CODE(); - - /* Calculate the maximum amount of data to move */ - TotalSize = MI_MAX_TRANSFER_SIZE; - if (BufferSize <= MI_MAX_TRANSFER_SIZE) TotalSize = BufferSize; - CurrentSize = TotalSize; - RemainingSize = BufferSize; - - /* Check if we can use the stack */ - if (BufferSize <= MI_POOL_COPY_BYTES) - { - /* Use it */ - PoolAddress = (PVOID)StackBuffer; - } - else - { - /* Allocate pool */ - PoolAddress = ExAllocatePoolWithTag(NonPagedPool, TotalSize, TAG_VM); - if (!PoolAddress) ASSERT(FALSE); - HavePoolAddress = TRUE; - } - - /* Loop as long as there is still data */ - while (RemainingSize > 0) - { - /* Check if this transfer will finish everything off */ - if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; - - /* Attach to the source address space */ - KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); - - /* Reset state for this pass */ - FailedInMoving = FALSE; - ASSERT(FailedInProbe == FALSE); - - /* Protect user-mode copy */ - _SEH2_TRY - { - /* If this is our first time, probe the buffer */ - if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) - { - /* Catch a failure here */ - FailedInProbe = TRUE; - - /* Do the probe */ - ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); - - /* Passed */ - FailedInProbe = FALSE; - } - - /* Do the copy */ - RtlCopyMemory(PoolAddress, CurrentAddress, CurrentSize); - - /* Now let go of the source and grab to the target process */ - KeUnstackDetachProcess(&ApcState); - KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); - - /* Check if this is our first time through */ - if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) - { - /* Catch a failure here */ - FailedInProbe = TRUE; - - /* Do the probe */ - ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); - - /* Passed */ - FailedInProbe = FALSE; - } - - /* Now do the actual move */ - FailedInMoving = TRUE; - RtlCopyMemory(CurrentTargetAddress, PoolAddress, CurrentSize); - } - _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), &HaveBadAddress, &BadAddress)) - { - /* Detach from whoever we may be attached to */ - KeUnstackDetachProcess(&ApcState); - - /* Check if we had allocated pool */ - if (HavePoolAddress) ExFreePool(PoolAddress); - - /* Check if we failed during the probe */ - if (FailedInProbe) - { - /* Exit */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - - /* Otherwise, we failed probably during the move */ - *ReturnSize = BufferSize - RemainingSize; - if (FailedInMoving) - { - /* Check if we know exactly where we stopped copying */ - if (HaveBadAddress) - { - /* Return the exact number of bytes copied */ - *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; - } - } - - /* Return partial copy */ - _SEH2_YIELD(return STATUS_PARTIAL_COPY); - } - _SEH2_END; - - /* Detach from target */ - KeUnstackDetachProcess(&ApcState); - - /* Update location and size */ - RemainingSize -= CurrentSize; - CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); - CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); - } - - /* Check if we had allocated pool */ - if (HavePoolAddress) ExFreePool(PoolAddress); - - /* All bytes read */ - *ReturnSize = BufferSize; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -MmCopyVirtualMemory(IN PEPROCESS SourceProcess, - IN PVOID SourceAddress, - IN PEPROCESS TargetProcess, - OUT PVOID TargetAddress, - IN SIZE_T BufferSize, - IN KPROCESSOR_MODE PreviousMode, - OUT PSIZE_T ReturnSize) -{ - NTSTATUS Status; - PEPROCESS Process = SourceProcess; - - /* Don't accept zero-sized buffers */ - if (!BufferSize) return STATUS_SUCCESS; - - /* If we are copying from ourselves, lock the target instead */ - if (SourceProcess == PsGetCurrentProcess()) Process = TargetProcess; - - /* Acquire rundown protection */ - if (!ExAcquireRundownProtection(&Process->RundownProtect)) - { - /* Fail */ - return STATUS_PROCESS_IS_TERMINATING; - } - - /* See if we should use the pool copy */ - if (BufferSize > MI_POOL_COPY_BYTES) - { - /* Use MDL-copy */ - Status = MiDoMappedCopy(SourceProcess, - SourceAddress, - TargetProcess, - TargetAddress, - BufferSize, - PreviousMode, - ReturnSize); - } - else - { - /* Do pool copy */ - Status = MiDoPoolCopy(SourceProcess, - SourceAddress, - TargetProcess, - TargetAddress, - BufferSize, - PreviousMode, - ReturnSize); - } - - /* Release the lock */ - ExReleaseRundownProtection(&Process->RundownProtect); - return Status; -} NTSTATUS FASTCALL MiQueryVirtualMemory(IN HANDLE ProcessHandle, @@ -721,322 +337,7 @@ NULL); } -/* PUBLIC FUNCTIONS ***********************************************************/ - -/* - * @unimplemented - */ -PVOID -NTAPI -MmGetVirtualForPhysical(IN PHYSICAL_ADDRESS PhysicalAddress) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -PVOID -NTAPI -MmSecureVirtualMemory(IN PVOID Address, - IN SIZE_T Length, - IN ULONG Mode) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -VOID -NTAPI -MmUnsecureVirtualMemory(IN PVOID SecureMem) -{ - UNIMPLEMENTED; -} - /* SYSTEM CALLS ***************************************************************/ - -NTSTATUS -NTAPI -NtReadVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - OUT PVOID Buffer, - IN SIZE_T NumberOfBytesToRead, - OUT PSIZE_T NumberOfBytesRead OPTIONAL) -{ - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PEPROCESS Process; - NTSTATUS Status; - SIZE_T BytesRead = 0; - PAGED_CODE(); - - /* Check if we came from user mode */ - if (PreviousMode != KernelMode) - { - /* Validate the read addresses */ - if ((((ULONG_PTR)BaseAddress + NumberOfBytesToRead) < (ULONG_PTR)BaseAddress) || - (((ULONG_PTR)Buffer + NumberOfBytesToRead) < (ULONG_PTR)Buffer) || - (((ULONG_PTR)BaseAddress + NumberOfBytesToRead) > MmUserProbeAddress) || - (((ULONG_PTR)Buffer + NumberOfBytesToRead) > MmUserProbeAddress)) - { - /* Don't allow to write into kernel space */ - return STATUS_ACCESS_VIOLATION; - } - - /* Enter SEH for probe */ - _SEH2_TRY - { - /* Probe the output value */ - if (NumberOfBytesRead) ProbeForWriteSize_t(NumberOfBytesRead); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - - /* Reference the process */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_READ, - PsProcessType, - PreviousMode, - (PVOID*)(&Process), - NULL); - if (NT_SUCCESS(Status)) - { - /* Do the copy */ - Status = MmCopyVirtualMemory(Process, - BaseAddress, - PsGetCurrentProcess(), - Buffer, - NumberOfBytesToRead, - PreviousMode, - &BytesRead); - - /* Dereference the process */ - ObDereferenceObject(Process); - } - - /* Check if the caller sent this parameter */ - if (NumberOfBytesRead) - { - /* Enter SEH to guard write */ - _SEH2_TRY - { - /* Return the number of bytes read */ - *NumberOfBytesRead = BytesRead; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Handle exception */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - /* Return status */ - return Status; -} - -NTSTATUS -NTAPI -NtWriteVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN PVOID Buffer, - IN SIZE_T NumberOfBytesToWrite, - OUT PSIZE_T NumberOfBytesWritten OPTIONAL) -{ - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PEPROCESS Process; - NTSTATUS Status; - ULONG BytesWritten = 0; - PAGED_CODE(); - - /* Check if we came from user mode */ - if (PreviousMode != KernelMode) - { - /* Validate the read addresses */ - if ((((ULONG_PTR)BaseAddress + NumberOfBytesToWrite) < (ULONG_PTR)BaseAddress) || - (((ULONG_PTR)Buffer + NumberOfBytesToWrite) < (ULONG_PTR)Buffer) || - (((ULONG_PTR)BaseAddress + NumberOfBytesToWrite) > MmUserProbeAddress) || - (((ULONG_PTR)Buffer + NumberOfBytesToWrite) > MmUserProbeAddress)) - { - /* Don't allow to write into kernel space */ - return STATUS_ACCESS_VIOLATION; - } - - /* Enter SEH for probe */ - _SEH2_TRY - { - /* Probe the output value */ - if (NumberOfBytesWritten) ProbeForWriteSize_t(NumberOfBytesWritten); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - - /* Reference the process */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_WRITE, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (NT_SUCCESS(Status)) - { - /* Do the copy */ - Status = MmCopyVirtualMemory(PsGetCurrentProcess(), - Buffer, - Process, - BaseAddress, - NumberOfBytesToWrite, - PreviousMode, - &BytesWritten); - - /* Dereference the process */ - ObDereferenceObject(Process); - } - - /* Check if the caller sent this parameter */ - if (NumberOfBytesWritten) - { - /* Enter SEH to guard write */ - _SEH2_TRY - { - /* Return the number of bytes read */ - *NumberOfBytesWritten = BytesWritten; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Handle exception */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - /* Return status */ - return Status; -} - -NTSTATUS -NTAPI -NtProtectVirtualMemory(IN HANDLE ProcessHandle, - IN OUT PVOID *UnsafeBaseAddress, - IN OUT SIZE_T *UnsafeNumberOfBytesToProtect, - IN ULONG NewAccessProtection, - OUT PULONG UnsafeOldAccessProtection) -{ - PEPROCESS Process; - ULONG OldAccessProtection; - ULONG Protection; - PVOID BaseAddress = NULL; - SIZE_T NumberOfBytesToProtect = 0; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status; - PAGED_CODE(); - - /* Check for valid protection flags */ - Protection = NewAccessProtection & ~(PAGE_GUARD|PAGE_NOCACHE); - if (Protection != PAGE_NOACCESS && - Protection != PAGE_READONLY && - Protection != PAGE_READWRITE && - Protection != PAGE_WRITECOPY && - Protection != PAGE_EXECUTE && - Protection != PAGE_EXECUTE_READ && - Protection != PAGE_EXECUTE_READWRITE && - Protection != PAGE_EXECUTE_WRITECOPY) - { - return STATUS_INVALID_PAGE_PROTECTION; - } - - /* Check if we came from user mode */ - if (PreviousMode != KernelMode) - { - /* Enter SEH for probing */ - _SEH2_TRY - { - /* Validate all outputs */ - ProbeForWritePointer(UnsafeBaseAddress); - ProbeForWriteSize_t(UnsafeNumberOfBytesToProtect); - ProbeForWriteUlong(UnsafeOldAccessProtection); - - /* Capture them */ - BaseAddress = *UnsafeBaseAddress; - NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - else - { - /* Capture directly */ - BaseAddress = *UnsafeBaseAddress; - NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; - } - - /* Catch illegal base address */ - if (BaseAddress > (PVOID)MmUserProbeAddress) return STATUS_INVALID_PARAMETER_2; - - /* Catch illegal region size */ - if ((MmUserProbeAddress - (ULONG_PTR)BaseAddress) < NumberOfBytesToProtect) - { - /* Fail */ - return STATUS_INVALID_PARAMETER_3; - } - - /* 0 is also illegal */ - if (!NumberOfBytesToProtect) return STATUS_INVALID_PARAMETER_3; - - /* Get a reference to the process */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Do the actual work */ - Status = MiProtectVirtualMemory(Process, - &BaseAddress, - &NumberOfBytesToProtect, - NewAccessProtection, - &OldAccessProtection); - - /* Release reference */ - ObDereferenceObject(Process); - - /* Enter SEH to return data */ - _SEH2_TRY - { - /* Return data to user */ - *UnsafeOldAccessProtection = OldAccessProtection; - *UnsafeBaseAddress = BaseAddress; - *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Catch exception */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - /* Return status */ - return Status; -} NTSTATUS NTAPI NtQueryVirtualMemory(IN HANDLE ProcessHandle, @@ -1202,92 +503,4 @@ return(Status); } -NTSTATUS -NTAPI -NtLockVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN SIZE_T NumberOfBytesToLock, - OUT PSIZE_T NumberOfBytesLocked OPTIONAL) -{ - UNIMPLEMENTED; - if (NumberOfBytesLocked) *NumberOfBytesLocked = 0; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -NtUnlockVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN SIZE_T NumberOfBytesToUnlock, - OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL) -{ - UNIMPLEMENTED; - if (NumberOfBytesUnlocked) *NumberOfBytesUnlocked = 0; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -NtFlushVirtualMemory(IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T NumberOfBytesToFlush, - OUT PIO_STATUS_BLOCK IoStatusBlock) -{ - UNIMPLEMENTED; - return STATUS_SUCCESS; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -NtGetWriteWatch(IN HANDLE ProcessHandle, - IN ULONG Flags, - IN PVOID BaseAddress, - IN ULONG RegionSize, - IN PVOID *UserAddressArray, - OUT PULONG EntriesInUserAddressArray, - OUT PULONG Granularity) -{ - if (!EntriesInUserAddressArray || !Granularity) - { - return STATUS_ACCESS_VIOLATION; - } - - if (!*EntriesInUserAddressArray || !RegionSize) - { - return STATUS_INVALID_PARAMETER; - } - - if (!UserAddressArray) - { - return STATUS_ACCESS_VIOLATION; - } - - /* HACK: Set granularity to PAGE_SIZE */ - *Granularity = PAGE_SIZE; - - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -NtResetWriteWatch(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN ULONG RegionSize) -{ - if (!RegionSize) - { - return STATUS_INVALID_PARAMETER; - } - - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* 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] Thu Oct 15 18:50:49 2009 @@ -394,6 +394,7 @@ <file>pool.c</file> <file>procsup.c</file> <file>syspte.c</file> + <file>virtual.c</file> </directory> <file>anonmem.c</file> <file>balance.c</file>

1 0

[fireball] 43479: - Fix inverted if condition in TEB initialization, spotted by Stefan.
by fireball＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: fireball Date: Thu Oct 15 18:47:26 2009 New Revision: 43479 URL: http://svn.reactos.org/svn/reactos?rev=43479&view=rev Log: - Fix inverted if condition in TEB initialization, spotted by Stefan. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Oct 15 18:47:26 2009 @@ -655,21 +655,21 @@ (InitialTeb->PreviousStackLimit == NULL)) { // - // Use grandparent TEB values - // - Teb->Tib.StackBase = InitialTeb->PreviousStackBase; - Teb->Tib.StackLimit = InitialTeb->PreviousStackLimit; - } - else - { - // // Use initial TEB values // Teb->Tib.StackBase = InitialTeb->StackBase; Teb->Tib.StackLimit = InitialTeb->StackLimit; Teb->DeallocationStack = InitialTeb->AllocatedStackBase; } - + else + { + // + // Use grandparent TEB values + // + Teb->Tib.StackBase = InitialTeb->PreviousStackBase; + Teb->Tib.StackLimit = InitialTeb->PreviousStackLimit; + } + // // Initialize the static unicode string //

1 0

[gschneider] 43478: Remove duplicate libjpeg from rosapps, used one is in trunk
by gschneider＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: gschneider Date: Thu Oct 15 17:19:58 2009 New Revision: 43478 URL: http://svn.reactos.org/svn/reactos?rev=43478&view=rev Log: Remove duplicate libjpeg from rosapps, used one is in trunk Removed: trunk/rosapps/lib/libjpeg/ Modified: trunk/rosapps/lib/directory.rbuild Modified: trunk/rosapps/lib/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/directory.rbuild?rev=4… ============================================================================== --- trunk/rosapps/lib/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/lib/directory.rbuild [iso-8859-1] Thu Oct 15 17:19:58 2009 @@ -1,11 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -  <directory name="libpng"> <xi:include href="libpng/libpng.rbuild" /> </directory>

1 0

[fireball] 43477: [fastfat_new] - Add a helper function for reading (mapping) volume's stream file object. - Read a boot sector during volume mounting, unpack it and store values in Vcb->Bpb for later usage. In particular, a volume's serial number being empty problem is fixed now. Volume label is still empty. - Silence more non-important debug prints.
by fireball＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: fireball Date: Thu Oct 15 12:50:12 2009 New Revision: 43477 URL: http://svn.reactos.org/svn/reactos?rev=43477&view=rev Log: [fastfat_new] - Add a helper function for reading (mapping) volume's stream file object. - Read a boot sector during volume mounting, unpack it and store values in Vcb->Bpb for later usage. In particular, a volume's serial number being empty problem is fixed now. Volume label is still empty. - Silence more non-important debug prints. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c trunk/reactos/drivers/filesystems/fastfat_new/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Thu Oct 15 12:50:12 2009 @@ -49,6 +49,13 @@ NTSTATUS NTAPI FatSetVolumeInfo(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +VOID NTAPI +FatReadStreamFile(PVCB Vcb, + ULONGLONG ByteOffset, + ULONG ByteSize, + PBCB *Bcb, + PVOID *Buffer); /* ------------------------------------------------------ blockdev.c */ NTSTATUS Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Thu Oct 15 12:50:12 2009 @@ -502,7 +502,7 @@ RtlDowncaseUnicodeString(UnicodeName, UnicodeName, FALSE); RtlUpcaseUnicodeString(UnicodeName, UnicodeName, FALSE); - DPRINT1("Converted long name: %wZ\n", UnicodeName); + DPRINT("Converted long name: %wZ\n", UnicodeName); /* Add the long unicode name link */ FatInsertName(IrpContext, &Fcb->ParentFcb->Dcb.SplayLinksUnicode, &Fcb->LongName); @@ -603,7 +603,7 @@ /* Set the length */ OutString->Length = BaseLen + ExtLen; - DPRINT1("'%s', len %d\n", OutString->Buffer, OutString->Length); + DPRINT("'%s', len %d\n", OutString->Buffer, OutString->Length); } VOID Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Thu Oct 15 12:50:12 2009 @@ -47,6 +47,37 @@ ExReleaseResourceLite(&FatGlobalData.Resource); } +VOID +NTAPI +FatiUnpackBpb(PBIOS_PARAMETER_BLOCK Bpb, PPACKED_BIOS_PARAMETER_BLOCK PackedBpb) +{ + CopyUchar2(&Bpb->BytesPerSector, &PackedBpb->BytesPerSector[0]); + CopyUchar1(&Bpb->SectorsPerCluster, &PackedBpb->SectorsPerCluster[0]); + CopyUchar2(&Bpb->ReservedSectors, &PackedBpb->ReservedSectors[0]); + CopyUchar1(&Bpb->Fats, &PackedBpb->Fats[0]); + CopyUchar2(&Bpb->RootEntries, &PackedBpb->RootEntries[0]); + CopyUchar2(&Bpb->Sectors, &PackedBpb->Sectors[0]); + CopyUchar1(&Bpb->Media, &PackedBpb->Media[0]); + CopyUchar2(&Bpb->SectorsPerFat, &PackedBpb->SectorsPerFat[0]); + CopyUchar2(&Bpb->SectorsPerTrack, &PackedBpb->SectorsPerTrack[0]); + CopyUchar2(&Bpb->Heads, &PackedBpb->Heads[0]); + CopyUchar4(&Bpb->HiddenSectors, &PackedBpb->HiddenSectors[0]); + CopyUchar4(&Bpb->LargeSectors, &PackedBpb->LargeSectors[0]); + CopyUchar4(&Bpb->LargeSectorsPerFat, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->LargeSectorsPerFat[0]); + CopyUchar2(&Bpb->ExtendedFlags, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->ExtendedFlags[0]); + CopyUchar2(&Bpb->FsVersion, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->FsVersion[0]); + CopyUchar4(&Bpb->RootDirFirstCluster,&((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->RootDirFirstCluster[0]); + CopyUchar2(&Bpb->FsInfoSector, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->FsInfoSector[0]); + CopyUchar2(&Bpb->BackupBootSector, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->BackupBootSector[0]); +} + +BOOLEAN +NTAPI +FatiBpbFat32(PPACKED_BIOS_PARAMETER_BLOCK PackedBpb) +{ + return (*(USHORT *)(&PackedBpb->SectorsPerFat) == 0); +} + NTSTATUS NTAPI FatMountVolume(PFAT_IRP_CONTEXT IrpContext, @@ -60,6 +91,8 @@ PVOLUME_DEVICE_OBJECT VolumeDevice; VCB *Vcb; FF_ERROR Error; + PBCB BootBcb; + PPACKED_BOOT_SECTOR BootSector; DPRINT1("FatMountVolume()\n"); @@ -167,7 +200,46 @@ goto FatMountVolumeCleanup; } - // TODO: Read BPB and store it in Vcb->Bpb + /* Read the boot sector */ + FatReadStreamFile(Vcb, 0, sizeof(PACKED_BOOT_SECTOR), &BootBcb, (PVOID)&BootSector); + + /* Check if it's successful */ + if (!BootBcb) + { + Status = STATUS_UNRECOGNIZED_VOLUME; + goto FatMountVolumeCleanup; + } + + /* Unpack data */ + FatiUnpackBpb(&Vcb->Bpb, &BootSector->PackedBpb); + + /* Verify if sector size matches */ + if (DiskGeometry.BytesPerSector != Vcb->Bpb.BytesPerSector) + { + DPRINT1("Disk geometry BPS %d and bios BPS %d don't match!\n", + DiskGeometry.BytesPerSector, Vcb->Bpb.BytesPerSector); + + /* Fail */ + Status = STATUS_UNRECOGNIZED_VOLUME; + goto FatMountVolumeCleanup; + } + + /* If Sectors value is set, discard the LargeSectors value */ + if (Vcb->Bpb.Sectors) Vcb->Bpb.LargeSectors = 0; + + /* Copy serial number */ + if (FatiBpbFat32(&BootSector->PackedBpb)) + { + CopyUchar4(&Vpb->SerialNumber, ((PPACKED_BOOT_SECTOR_EX)BootSector)->Id); + } + else + { + /* This is FAT12/16 */ + CopyUchar4(&Vpb->SerialNumber, BootSector->Id); + } + + /* Unpin the BCB */ + CcUnpinData(BootBcb); /* Create root DCB for it */ FatCreateRootDcb(IrpContext, &VolumeDevice->Vcb); @@ -249,7 +321,7 @@ PFAT_IRP_CONTEXT IrpContext; BOOLEAN CanWait = TRUE; - DPRINT1("FatFileSystemControl(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + DPRINT("FatFileSystemControl(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); /* Get CanWait flag */ if (IoGetCurrentIrpStackLocation(Irp)->FileObject) Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] Thu Oct 15 12:50:12 2009 @@ -171,4 +171,27 @@ return STATUS_NOT_IMPLEMENTED; } +VOID +NTAPI +FatReadStreamFile(PVCB Vcb, + ULONGLONG ByteOffset, + ULONG ByteSize, + PBCB *Bcb, + PVOID *Buffer) +{ + LARGE_INTEGER Offset; + + Offset.QuadPart = ByteOffset; + + if (!CcMapData(Vcb->StreamFileObject, + &Offset, + ByteSize, + TRUE, // FIXME: CanWait + Bcb, + Buffer)) + { + ASSERT(FALSE); + } +} + /* EOF */

1 0

[ros-arm-bringup] 43476: - Multiple PEB/TEB creation fixes: - Set up PEB and TEB under SEH to handle possible paging errors (which are legitimate). - Also touch the image under SEH to handle image paging errors (also legitimate). - Should avoid kernel panics in cases where the executable is damaged, invalid, or impossible to page in. - Initialize more PEB fields. - Add new INITIAL_PEB structure to support fork() in the future. Also fixes the fact we don't create a PEB for the system process anym
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 07:56:41 2009 New Revision: 43476 URL: http://svn.reactos.org/svn/reactos?rev=43476&view=rev Log: - Multiple PEB/TEB creation fixes: - Set up PEB and TEB under SEH to handle possible paging errors (which are legitimate). - Also touch the image under SEH to handle image paging errors (also legitimate). - Should avoid kernel panics in cases where the executable is damaged, invalid, or impossible to page in. - Initialize more PEB fields. - Add new INITIAL_PEB structure to support fork() in the future. Also fixes the fact we don't create a PEB for the system process anymore. - Create PEB while attached to the process. - Handle UP-only images, and set correct affinity mask in the PEB. - Set session ID instead of session structure (currently zero). - Set correct TIB version in the TEB. Due to a historical oddity, the NT TIB identifies itself as '0x1e00', which is 30 shifted 8 bits. 30 is the version identifier of OS/2 3.0, the original 32-bit target of the Windows NT effort. - Handle initial TEB correctly for fork(). - Move AWE APIs to procsup.c instea of section.c since they are unrelated. - Move the rewritten PEB/TEB functions to ARM3's procsup.c. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -587,23 +587,53 @@ } PEB_FREE_BLOCK, *PPEB_FREE_BLOCK; // +// Initial PEB +// +typedef struct _INITIAL_PEB +{ + BOOLEAN InheritedAddressSpace; + BOOLEAN ReadImageFileExecOptions; + BOOLEAN BeingDebugged; + union + { + BOOLEAN BitField; +#if (NTDDI_VERSION >= NTDDI_WS03) + struct + { + BOOLEAN ImageUsesLargePages:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + BOOLEAN IsProtectedProcess:1; + BOOLEAN IsLegacyProcess:1; + BOOLEAN SpareBits:5; +#else + BOOLEAN SpareBits:7; +#endif + }; +#else + BOOLEAN SpareBool; +#endif + }; + HANDLE Mutant; +} INITIAL_PEB, *PINITIAL_PEB; + +// // Process Environment Block (PEB) // typedef struct _PEB { - UCHAR InheritedAddressSpace; - UCHAR ReadImageFileExecOptions; - UCHAR BeingDebugged; + BOOLEAN InheritedAddressSpace; + BOOLEAN ReadImageFileExecOptions; + BOOLEAN BeingDebugged; #if (NTDDI_VERSION >= NTDDI_WS03) struct { - UCHAR ImageUsesLargePages:1; + BOOLEAN ImageUsesLargePages:1; #if (NTDDI_VERSION >= NTDDI_LONGHORN) - UCHAR IsProtectedProcess:1; - UCHAR IsLegacyProcess:1; - UCHAR SpareBits:5; + BOOLEAN IsProtectedProcess:1; + BOOLEAN IsLegacyProcess:1; + BOOLEAN SpareBits:5; #else - UCHAR SpareBits:7; + BOOLEAN SpareBits:7; #endif }; #else Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -776,14 +776,19 @@ NTSTATUS NTAPI -MmCreatePeb(struct _EPROCESS *Process); - -PTEB +MmCreatePeb( + IN PEPROCESS Process, + IN PINITIAL_PEB InitialPeb, + OUT PPEB *BasePeb +); + +NTSTATUS NTAPI MmCreateTeb( - struct _EPROCESS *Process, - PCLIENT_ID ClientId, - PINITIAL_TEB InitialTeb + IN PEPROCESS Process, + IN PCLIENT_ID ClientId, + IN PINITIAL_TEB InitialTeb, + OUT PTEB* BaseTeb ); VOID 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] Thu Oct 15 07:56:41 2009 @@ -28,6 +28,10 @@ #define MI_PAGED_POOL_START (PVOID)0xE1000000 #define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 + +#define MM_HIGHEST_VAD_ADDRESS \ + (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) + // // FIXFIX: These should go in ex.h after the pool merge Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -16,6 +16,13 @@ #define MODULE_INVOLVED_IN_ARM3 #include "../ARM3/miarm.h" +extern MM_SYSTEMSIZE MmSystemSize; + +PVOID +NTAPI +MiCreatePebOrTeb(PEPROCESS Process, + PVOID BaseAddress); + /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -278,4 +285,454 @@ return MmGrowKernelStackEx(StackPointer, KERNEL_LARGE_STACK_COMMIT); } +NTSTATUS +NTAPI +MmSetMemoryPriorityProcess(IN PEPROCESS Process, + IN UCHAR MemoryPriority) +{ + UCHAR OldPriority; + + // + // Check if we have less then 16MB of Physical Memory + // + if ((MmSystemSize == MmSmallSystem) && + (MmStats.NrTotalPages < ((15 * 1024 * 1024) / PAGE_SIZE))) + { + // + // Always use background priority + // + MemoryPriority = MEMORY_PRIORITY_BACKGROUND; + } + + // + // Save the old priority and update it + // + OldPriority = (UCHAR)Process->Vm.Flags.MemoryPriority; + Process->Vm.Flags.MemoryPriority = MemoryPriority; + + // + // Return the old priority + // + return OldPriority; +} + +LCID +NTAPI +MmGetSessionLocaleId(VOID) +{ + PEPROCESS Process; + PAGED_CODE(); + + // + // Get the current process + // + Process = PsGetCurrentProcess(); + + // + // Check if it's the Session Leader + // + if (Process->Vm.Flags.SessionLeader) + { + // + // Make sure it has a valid Session + // + if (Process->Session) + { + // + // Get the Locale ID + // +#if ROS_HAS_SESSIONS + return ((PMM_SESSION_SPACE)Process->Session)->LocaleId; +#endif + } + } + + // + // Not a session leader, return the default + // + return PsDefaultThreadLocaleId; +} + +NTSTATUS +NTAPI +MmCreatePeb(IN PEPROCESS Process, + IN PINITIAL_PEB InitialPeb, + OUT PPEB *BasePeb) +{ + PPEB Peb = NULL; + LARGE_INTEGER SectionOffset; + SIZE_T ViewSize = 0; + PVOID TableBase = NULL; + PIMAGE_NT_HEADERS NtHeaders; + PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigData; + NTSTATUS Status; + USHORT Characteristics; + KAFFINITY ProcessAffinityMask = 0; + SectionOffset.QuadPart = (ULONGLONG)0; + *BasePeb = NULL; + + // + // Attach to Process + // + KeAttachProcess(&Process->Pcb); + + // + // Allocate the PEB + // + Peb = MiCreatePebOrTeb(Process, + (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); + ASSERT(Peb == (PVOID)0x7FFDF000); + + // + // Map NLS Tables + // + Status = MmMapViewOfSection(ExpNlsSectionPointer, + (PEPROCESS)Process, + &TableBase, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + MEM_TOP_DOWN, + PAGE_READONLY); + if (!NT_SUCCESS(Status)) return Status; + + // + // Use SEH in case we can't load the PEB + // + _SEH2_TRY + { + // + // Initialize the PEB + // + RtlZeroMemory(Peb, sizeof(PEB)); + + // + // Set up data + // + Peb->ImageBaseAddress = Process->SectionBaseAddress; + Peb->InheritedAddressSpace = InitialPeb->InheritedAddressSpace; + Peb->Mutant = InitialPeb->Mutant; + Peb->ImageUsesLargePages = InitialPeb->ImageUsesLargePages; + + // + // NLS + // + Peb->AnsiCodePageData = (PCHAR)TableBase + ExpAnsiCodePageDataOffset; + Peb->OemCodePageData = (PCHAR)TableBase + ExpOemCodePageDataOffset; + Peb->UnicodeCaseTableData = (PCHAR)TableBase + ExpUnicodeCaseTableDataOffset; + + // + // Default Version Data (could get changed below) + // + Peb->OSMajorVersion = NtMajorVersion; + Peb->OSMinorVersion = NtMinorVersion; + Peb->OSBuildNumber = (USHORT)(NtBuildNumber & 0x3FFF); + Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ + Peb->OSCSDVersion = (USHORT)CmNtCSDVersion; + + // + // Heap and Debug Data + // + Peb->NumberOfProcessors = KeNumberProcessors; + Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL ? TRUE : FALSE); + Peb->NtGlobalFlag = NtGlobalFlag; + /*Peb->HeapSegmentReserve = MmHeapSegmentReserve; + Peb->HeapSegmentCommit = MmHeapSegmentCommit; + Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; + Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold; + Peb->CriticalSectionTimeout = MmCriticalSectionTimeout; + Peb->MinimumStackCommit = MmMinimumStackCommitInBytes; + */ + Peb->MaximumNumberOfHeaps = (PAGE_SIZE - sizeof(PEB)) / sizeof(PVOID); + Peb->ProcessHeaps = (PVOID*)(Peb + 1); + + // + // Session ID + // + if (Process->Session) Peb->SessionId = 0; // MmGetSessionId(Process); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Fail + // + KeDetachProcess(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + // + // Use SEH in case we can't load the image + // + _SEH2_TRY + { + // + // Get NT Headers + // + NtHeaders = RtlImageNtHeader(Peb->ImageBaseAddress); + Characteristics = NtHeaders->FileHeader.Characteristics; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Fail + // + KeDetachProcess(); + _SEH2_YIELD(return STATUS_INVALID_IMAGE_PROTECT); + } + _SEH2_END; + + // + // Parse the headers + // + if (NtHeaders) + { + // + // Use SEH in case we can't load the headers + // + _SEH2_TRY + { + // + // Get the Image Config Data too + // + ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, + &ViewSize); + if (ImageConfigData) + { + // + // Probe it + // + ProbeForRead(ImageConfigData, + sizeof(IMAGE_LOAD_CONFIG_DIRECTORY), + sizeof(ULONG)); + } + + // + // Write subsystem data + // + Peb->ImageSubSystem = NtHeaders->OptionalHeader.Subsystem; + Peb->ImageSubSystemMajorVersion = NtHeaders->OptionalHeader.MajorSubsystemVersion; + Peb->ImageSubSystemMinorVersion = NtHeaders->OptionalHeader.MinorSubsystemVersion; + + // + // Check for version data + // + if (NtHeaders->OptionalHeader.Win32VersionValue) + { + // + // Extract values and write them + // + Peb->OSMajorVersion = NtHeaders->OptionalHeader.Win32VersionValue & 0xFF; + Peb->OSMinorVersion = (NtHeaders->OptionalHeader.Win32VersionValue >> 8) & 0xFF; + Peb->OSBuildNumber = (NtHeaders->OptionalHeader.Win32VersionValue >> 16) & 0x3FFF; + Peb->OSPlatformId = (NtHeaders->OptionalHeader.Win32VersionValue >> 30) ^ 2; + } + + // + // Process the image config data overrides if specfied + // + if (ImageConfigData != NULL) + { + // + // Process CSD version override + // + if (ImageConfigData->CSDVersion) + { + // + // Set new data + // + Peb->OSCSDVersion = ImageConfigData->CSDVersion; + } + + // + // Process affinity mask ovverride + // + if (ImageConfigData->ProcessAffinityMask) + { + // + // Set new data + // + ProcessAffinityMask = ImageConfigData->ProcessAffinityMask; + } + } + + // + // Check if this is a UP image + if (Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY) + { + // + // Force it to use CPU 0 + // + Peb->ImageProcessAffinityMask = 0; + } + else + { + // + // Whatever was configured + // + Peb->ImageProcessAffinityMask = ProcessAffinityMask; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Fail + // + KeDetachProcess(); + _SEH2_YIELD(return STATUS_INVALID_IMAGE_PROTECT); + } + _SEH2_END; + } + + // + // Detach from the Process + // + KeDetachProcess(); + *BasePeb = Peb; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MmCreateTeb(IN PEPROCESS Process, + IN PCLIENT_ID ClientId, + IN PINITIAL_TEB InitialTeb, + OUT PTEB *BaseTeb) +{ + PTEB Teb; + NTSTATUS Status = STATUS_SUCCESS; + *BaseTeb = NULL; + + // + // Attach to Target + // + KeAttachProcess(&Process->Pcb); + + // + // Allocate the TEB + // + Teb = MiCreatePebOrTeb(Process, + (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); + if (!Teb) return STATUS_INSUFFICIENT_RESOURCES; + + // + // Use SEH in case we can't load the TEB + // + _SEH2_TRY + { + // + // Initialize the PEB + // + RtlZeroMemory(Teb, sizeof(TEB)); + + // + // Set TIB Data + // + Teb->Tib.ExceptionList = EXCEPTION_CHAIN_END; + Teb->Tib.Self = (PNT_TIB)Teb; + + // + // Identify this as an OS/2 V3.0 ("Cruiser") TIB + // + Teb->Tib.Version = 30 << 8; + + // + // Set TEB Data + // + Teb->ClientId = *ClientId; + Teb->RealClientId = *ClientId; + Teb->ProcessEnvironmentBlock = Process->Peb; + Teb->CurrentLocale = PsDefaultThreadLocaleId; + + // + // Check if we have a grandparent TEB + // + if ((InitialTeb->PreviousStackBase == NULL) && + (InitialTeb->PreviousStackLimit == NULL)) + { + // + // Use grandparent TEB values + // + Teb->Tib.StackBase = InitialTeb->PreviousStackBase; + Teb->Tib.StackLimit = InitialTeb->PreviousStackLimit; + } + else + { + // + // Use initial TEB values + // + Teb->Tib.StackBase = InitialTeb->StackBase; + Teb->Tib.StackLimit = InitialTeb->StackLimit; + Teb->DeallocationStack = InitialTeb->AllocatedStackBase; + } + + // + // Initialize the static unicode string + // + Teb->StaticUnicodeString.MaximumLength = sizeof(Teb->StaticUnicodeBuffer); + Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get error code + // + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + // + // Return + // + KeDetachProcess(); + *BaseTeb = Teb; + return Status; +} + +/* SYSTEM CALLS ***************************************************************/ + +NTSTATUS +NTAPI +NtAllocateUserPhysicalPages(IN HANDLE ProcessHandle, + IN OUT PULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtMapUserPhysicalPages(IN PVOID VirtualAddresses, + IN ULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtMapUserPhysicalPagesScatter(IN PVOID *VirtualAddresses, + IN ULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtFreeUserPhysicalPages(IN HANDLE ProcessHandle, + IN OUT PULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -13,66 +13,7 @@ #define NDEBUG #include <debug.h> -extern ULONG NtMajorVersion; -extern ULONG NtMinorVersion; -extern ULONG CmNtCSDVersion; -extern ULONG NtBuildNumber; -extern MM_SYSTEMSIZE MmSystemSize; - -#define MM_HIGHEST_VAD_ADDRESS \ - (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) - /* FUNCTIONS *****************************************************************/ - -NTSTATUS -NTAPI -MmSetMemoryPriorityProcess(IN PEPROCESS Process, - IN UCHAR MemoryPriority) -{ - UCHAR OldPriority; - - /* Check if we have less then 16MB of Physical Memory */ - if ((MmSystemSize == MmSmallSystem) && - (MmStats.NrTotalPages < ((15 * 1024 * 1024) / PAGE_SIZE))) - { - /* Always use background priority */ - MemoryPriority = 0; - } - - /* Save the old priority and update it */ - OldPriority = (UCHAR)Process->Vm.Flags.MemoryPriority; - Process->Vm.Flags.MemoryPriority = MemoryPriority; - - /* Return the old priority */ - return OldPriority; -} - -LCID -NTAPI -MmGetSessionLocaleId(VOID) -{ - PEPROCESS Process; - PAGED_CODE(); - - /* Get the current process */ - Process = PsGetCurrentProcess(); - - /* Check if it's the Session Leader */ - if (Process->Vm.Flags.SessionLeader) - { - /* Make sure it has a valid Session */ - if (Process->Session) - { - /* Get the Locale ID */ -#if ROS_HAS_SESSIONS - return ((PMM_SESSION_SPACE)Process->Session)->LocaleId; -#endif - } - } - - /* Not a session leader, return the default */ - return PsDefaultThreadLocaleId; -} PVOID NTAPI @@ -146,211 +87,6 @@ /* Unlock the Address Space */ MmUnlockAddressSpace(ProcessAddressSpace); -} - -NTSTATUS -NTAPI -MmCreatePeb(PEPROCESS Process) -{ - PPEB Peb = NULL; - LARGE_INTEGER SectionOffset; - SIZE_T ViewSize = 0; - PVOID TableBase = NULL; - PIMAGE_NT_HEADERS NtHeaders; - PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigData; - NTSTATUS Status; - KAFFINITY ProcessAffinityMask = 0; - SectionOffset.QuadPart = (ULONGLONG)0; - DPRINT("MmCreatePeb\n"); - - /* Allocate the PEB */ - Peb = MiCreatePebOrTeb(Process, - (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); - ASSERT(Peb == (PVOID)0x7FFDF000); - - /* Map NLS Tables */ - DPRINT("Mapping NLS\n"); - Status = MmMapViewOfSection(ExpNlsSectionPointer, - (PEPROCESS)Process, - &TableBase, - 0, - 0, - &SectionOffset, - &ViewSize, - ViewShare, - MEM_TOP_DOWN, - PAGE_READONLY); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmMapViewOfSection() failed (Status %lx)\n", Status); - return(Status); - } - DPRINT("TableBase %p ViewSize %lx\n", TableBase, ViewSize); - - /* Attach to Process */ - KeAttachProcess(&Process->Pcb); - - /* Initialize the PEB */ - DPRINT("Allocated: %x\n", Peb); - RtlZeroMemory(Peb, sizeof(PEB)); - - /* Set up data */ - DPRINT("Setting up PEB\n"); - Peb->ImageBaseAddress = Process->SectionBaseAddress; - Peb->InheritedAddressSpace = 0; - Peb->Mutant = NULL; - - /* NLS */ - Peb->AnsiCodePageData = (PCHAR)TableBase + ExpAnsiCodePageDataOffset; - Peb->OemCodePageData = (PCHAR)TableBase + ExpOemCodePageDataOffset; - Peb->UnicodeCaseTableData = (PCHAR)TableBase + ExpUnicodeCaseTableDataOffset; - - /* Default Version Data (could get changed below) */ - Peb->OSMajorVersion = NtMajorVersion; - Peb->OSMinorVersion = NtMinorVersion; - Peb->OSBuildNumber = (USHORT)(NtBuildNumber & 0x3FFF); - Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ - Peb->OSCSDVersion = (USHORT)CmNtCSDVersion; - - /* Heap and Debug Data */ - Peb->NumberOfProcessors = KeNumberProcessors; - Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL ? TRUE : FALSE); - Peb->NtGlobalFlag = NtGlobalFlag; - /*Peb->HeapSegmentReserve = MmHeapSegmentReserve; - Peb->HeapSegmentCommit = MmHeapSegmentCommit; - Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; - Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold;*/ - Peb->NumberOfHeaps = 0; - Peb->MaximumNumberOfHeaps = (PAGE_SIZE - sizeof(PEB)) / sizeof(PVOID); - Peb->ProcessHeaps = (PVOID*)(Peb + 1); - - /* Image Data */ - if ((NtHeaders = RtlImageNtHeader(Peb->ImageBaseAddress))) - { - /* Write subsystem data */ - Peb->ImageSubSystem = NtHeaders->OptionalHeader.Subsystem; - Peb->ImageSubSystemMajorVersion = NtHeaders->OptionalHeader.MajorSubsystemVersion; - Peb->ImageSubSystemMinorVersion = NtHeaders->OptionalHeader.MinorSubsystemVersion; - - /* Write Version Data */ - if (NtHeaders->OptionalHeader.Win32VersionValue) - { - Peb->OSMajorVersion = NtHeaders->OptionalHeader.Win32VersionValue & 0xFF; - Peb->OSMinorVersion = (NtHeaders->OptionalHeader.Win32VersionValue >> 8) & 0xFF; - Peb->OSBuildNumber = (NtHeaders->OptionalHeader.Win32VersionValue >> 16) & 0x3FFF; - - /* Set the Platform ID */ - Peb->OSPlatformId = (NtHeaders->OptionalHeader.Win32VersionValue >> 30) ^ 2; - } - - /* Check if the image is not safe for SMP */ - if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY) - { - /* FIXME: Choose one randomly */ - Peb->ImageProcessAffinityMask = 1; - } - else - { - /* Use affinity from Image Header */ - Peb->ImageProcessAffinityMask = ProcessAffinityMask; - } - - _SEH2_TRY - { - /* Get the Image Config Data too */ - ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, - TRUE, - IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, - &ViewSize); - - ProbeForRead(ImageConfigData, - sizeof(IMAGE_LOAD_CONFIG_DIRECTORY), - sizeof(ULONG)); - - /* Process the image config data overrides if specfied. */ - if (ImageConfigData != NULL) - { - if (ImageConfigData->CSDVersion) - { - Peb->OSCSDVersion = ImageConfigData->CSDVersion; - } - if (ImageConfigData->ProcessAffinityMask) - { - ProcessAffinityMask = ImageConfigData->ProcessAffinityMask; - } - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - /* Misc data */ - Peb->SessionId = Process->Session; - Process->Peb = Peb; - - /* Detach from the Process */ - KeDetachProcess(); - - DPRINT("MmCreatePeb: Peb created at %p\n", Peb); - return Status; -} - -PTEB -NTAPI -MmCreateTeb(PEPROCESS Process, - PCLIENT_ID ClientId, - PINITIAL_TEB InitialTeb) -{ - PTEB Teb; - BOOLEAN Attached = FALSE; - - /* Attach to the process */ - DPRINT("MmCreateTeb\n"); - if (Process != PsGetCurrentProcess()) - { - /* Attach to Target */ - KeAttachProcess(&Process->Pcb); - Attached = TRUE; - } - - /* Allocate the TEB */ - Teb = MiCreatePebOrTeb(Process, - (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); - - /* Initialize the PEB */ - RtlZeroMemory(Teb, sizeof(TEB)); - - /* Set TIB Data */ - Teb->Tib.ExceptionList = (PVOID)0xFFFFFFFF; - Teb->Tib.Version = 1; - Teb->Tib.Self = (PNT_TIB)Teb; - - /* Set TEB Data */ - Teb->ClientId = *ClientId; - Teb->RealClientId = *ClientId; - Teb->ProcessEnvironmentBlock = Process->Peb; - Teb->CurrentLocale = PsDefaultThreadLocaleId; - - /* Store stack information from InitialTeb */ - if(InitialTeb != NULL) - { - Teb->Tib.StackBase = InitialTeb->StackBase; - Teb->Tib.StackLimit = InitialTeb->StackLimit; - Teb->DeallocationStack = InitialTeb->AllocatedStackBase; - } - - /* Initialize the static unicode string */ - Teb->StaticUnicodeString.Length = 0; - Teb->StaticUnicodeString.MaximumLength = sizeof(Teb->StaticUnicodeBuffer); - Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; - - /* Return TEB Address */ - DPRINT("Allocated: %x\n", Teb); - if (Attached) KeDetachProcess(); - return Teb; } NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -5072,52 +5072,12 @@ NTSTATUS NTAPI -NtAllocateUserPhysicalPages(IN HANDLE ProcessHandle, - IN OUT PULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray) +NtAreMappedFilesTheSame(IN PVOID File1MappedAsAnImage, + IN PVOID File2MappedAsFile) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -NTSTATUS -NTAPI -NtMapUserPhysicalPages(IN PVOID VirtualAddresses, - IN ULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtMapUserPhysicalPagesScatter(IN PVOID *VirtualAddresses, - IN ULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtFreeUserPhysicalPages(IN HANDLE ProcessHandle, - IN OUT PULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtAreMappedFilesTheSame(IN PVOID File1MappedAsAnImage, - IN PVOID File2MappedAsFile) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -379,6 +379,8 @@ BOOLEAN Result, SdAllocated; PSECURITY_DESCRIPTOR SecurityDescriptor; SECURITY_SUBJECT_CONTEXT SubjectContext; + BOOLEAN NeedsPeb = FALSE; + INITIAL_PEB InitialPeb; PAGED_CODE(); PSTRACE(PS_PROCESS_DEBUG, "ProcessHandle: %p Parent: %p\n", ProcessHandle, ParentProcess); @@ -635,17 +637,27 @@ SeAuditProcessCreationInfo. ImageFileName); if (!NT_SUCCESS(Status)) goto CleanupWithRef; + + // + // We need a PEB + // + NeedsPeb = TRUE; } else if (Parent) { /* Check if this is a child of the system process */ if (Parent != PsInitialSystemProcess) { + // + // We need a PEB + // + NeedsPeb = TRUE; + /* This is a clone! */ ASSERTMSG("No support for cloning yet\n", FALSE); } else - { + { /* This is the initial system process */ Flags &= ~PS_LARGE_PAGES; Status = MmInitializeProcessAddressSpace(Process, @@ -702,11 +714,34 @@ } /* Create PEB only for User-Mode Processes */ - if (Parent) - { - /* Create it */ - Status = MmCreatePeb(Process); - if (!NT_SUCCESS(Status)) goto CleanupWithRef; + if ((Parent) && (NeedsPeb)) + { + // + // Set up the initial PEB + // + RtlZeroMemory(&InitialPeb, sizeof(INITIAL_PEB)); + InitialPeb.Mutant = (HANDLE)-1; + InitialPeb.ImageUsesLargePages = 0; // FIXME: Not yet supported + + // + // Create it only if we have an image section + // + if (SectionHandle) + { + // + // Create it + // + Status = MmCreatePeb(Process, &InitialPeb, &Process->Peb); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + } + else + { + // + // We have to clone it + // + ASSERTMSG("No support for cloning yet\n", FALSE); + } + } /* The process can now be activated */ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -310,13 +310,13 @@ if (ThreadContext) { /* User-mode Thread, create Teb */ - TebBase = MmCreateTeb(Process, &Thread->Cid, InitialTeb); - if (!TebBase) + Status = MmCreateTeb(Process, &Thread->Cid, InitialTeb, &TebBase); + if (!NT_SUCCESS(Status)) { /* Failed to create the TEB. Release rundown and dereference */ ExReleaseRundownProtection(&Process->RundownProtect); ObDereferenceObject(Thread); - return STATUS_INSUFFICIENT_RESOURCES; + return Status; } /* Set the Start Addresses */

1 0

[jimtabor] 43475: - Revert 43470.
by jimtabor＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: jimtabor Date: Thu Oct 15 07:23:06 2009 New Revision: 43475 URL: http://svn.reactos.org/svn/reactos?rev=43475&view=rev Log: - Revert 43470. Modified: trunk/reactos/include/psdk/wsahelp.h Modified: trunk/reactos/include/psdk/wsahelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wsahelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wsahelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wsahelp.h [iso-8859-1] Thu Oct 15 07:23:06 2009 @@ -70,7 +70,7 @@ typedef INT (WINAPI *PWSH_GET_PROVIDER_GUID)(LPWSTR,LPGUID); typedef INT (WINAPI *PWSH_GET_SOCKADDR_TYPE)(PSOCKADDR,DWORD,PSOCKADDR_INFO); typedef INT (WINAPI *PWSH_GET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT); -typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKADDR)(PVOID,PSOCKADDR,PINT); +typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKEADDR)(PVOID,PSOCKADDR,PINT); typedef DWORD (WINAPI *PWSH_GET_WINSOCK_MAPPING)(PWINSOCK_MAPPING,DWORD); typedef INT (WINAPI *PWSH_GET_WSAPROTOCOL_INFO)(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD); typedef INT (WINAPI *PWSH_IOCTL)(PVOID,SOCKET,HANDLE,HANDLE,DWORD,LPVOID,DWORD,

1 0

[ros-arm-bringup] 43474: - unix is one of many platforms that use LP64, so instead of defining every single possible OS which uses LP64, how about we define the *only* OS that uses LLP64: Win64. - Fixes building on BSD and Solaris.
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 06:34:47 2009 New Revision: 43474 URL: http://svn.reactos.org/svn/reactos?rev=43474&view=rev Log: - unix is one of many platforms that use LP64, so instead of defining every single possible OS which uses LP64, how about we define the *only* OS that uses LLP64: Win64. - Fixes building on BSD and Solaris. Modified: trunk/reactos/tools/rsym/rsym.h Modified: trunk/reactos/tools/rsym/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.h?rev=4347… ============================================================================== --- trunk/reactos/tools/rsym/rsym.h [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.h [iso-8859-1] Thu Oct 15 06:34:47 2009 @@ -45,7 +45,7 @@ typedef unsigned short WORD; typedef unsigned short USHORT; typedef unsigned long long ULONGLONG; -#if defined(__x86_64__) && defined(unix) +#if defined(__x86_64__) && !defined(_WIN64) typedef signed int LONG; typedef unsigned int ULONG; typedef unsigned int DWORD; @@ -57,7 +57,7 @@ #if defined(_WIN64) typedef unsigned __int64 ULONG_PTR; #else -#if defined(__x86_64__) && defined(unix) +#if defined(__x86_64__) && !defined(_WIN64) typedef unsigned int ULONG_PTR; #else typedef unsigned long ULONG_PTR;

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