Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[ros-arm-bringup] 34879: The address space creation lock is a guarded mutex, not a pushlock, in NT 5.2. While it is commendable to attempt using Vista optimizations (it is a push lock on Vista) in order to speed up the kernel, it is entirely stupid to do so by completing ignoring the ramifications of this change, and furthermore, to pollute the kernel with typecasts, as well as to introduce non-standard behavior. Ironically it is ion himself who made this change.
by ros-arm-bringup＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: ros-arm-bringup Date: Sun Jul 27 20:11:19 2008 New Revision: 34879 URL: http://svn.reactos.org/svn/reactos?rev=34879&view=rev Log: The address space creation lock is a guarded mutex, not a pushlock, in NT 5.2. While it is commendable to attempt using Vista optimizations (it is a push lock on Vista) in order to speed up the kernel, it is entirely stupid to do so by completing ignoring the ramifications of this change, and furthermore, to pollute the kernel with typecasts, as well as to introduce non-standard behavior. Ironically it is ion himself who made this change. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/procsup.c 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] Sun Jul 27 20:11:19 2008 @@ -1574,16 +1574,14 @@ VOID MmLockAddressSpace(PMADDRESS_SPACE AddressSpace) { - KeEnterCriticalRegion(); - ExAcquirePushLockExclusive((PEX_PUSH_LOCK)&CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot)->AddressCreationLock); + KeAcquireGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot)->AddressCreationLock); } FORCEINLINE VOID MmUnlockAddressSpace(PMADDRESS_SPACE AddressSpace) { - ExReleasePushLock((PEX_PUSH_LOCK)&CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot)->AddressCreationLock); - KeLeaveCriticalRegion(); + KeReleaseGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot)->AddressCreationLock); } FORCEINLINE Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Jul 27 20:11:19 2008 @@ -196,6 +196,7 @@ *DirectoryTableBase = PsGetCurrentProcess()->Pcb.DirectoryTableBase; /* Initialize the Addresss Space */ + KeInitializeGuardedMutex(&Process->AddressCreationLock); MmInitializeAddressSpace(Process, (PMADDRESS_SPACE)&Process->VadRoot); /* The process now has an address space */ 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] Sun Jul 27 20:11:19 2008 @@ -520,6 +520,7 @@ BoundaryAddressMultiple.QuadPart = 0; /* Initialize the Addresss Space */ + KeInitializeGuardedMutex(&Process->AddressCreationLock); MmInitializeAddressSpace(Process, ProcessAddressSpace); /* Acquire the Lock */

1 0

[ros-arm-bringup] 34878: There is no point in saving the address of the address space lock in the address space structure anymore, since this lock is always the address creation lock of the owner process, and there's always an owner process now.
by ros-arm-bringup＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: ros-arm-bringup Date: Sun Jul 27 19:56:39 2008 New Revision: 34878 URL: http://svn.reactos.org/svn/reactos?rev=34878&view=rev Log: There is no point in saving the address of the address space lock in the address space structure anymore, since this lock is always the address creation lock of the owner process, and there's always an owner process now. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/aspace.c 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] Sun Jul 27 19:56:39 2008 @@ -253,7 +253,6 @@ typedef struct _MADDRESS_SPACE { PMEMORY_AREA MemoryAreaRoot; - PEX_PUSH_LOCK Lock; } MADDRESS_SPACE, *PMADDRESS_SPACE; typedef struct @@ -1576,14 +1575,14 @@ MmLockAddressSpace(PMADDRESS_SPACE AddressSpace) { KeEnterCriticalRegion(); - ExAcquirePushLockExclusive(AddressSpace->Lock); + ExAcquirePushLockExclusive((PEX_PUSH_LOCK)&CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot)->AddressCreationLock); } FORCEINLINE VOID MmUnlockAddressSpace(PMADDRESS_SPACE AddressSpace) { - ExReleasePushLock(AddressSpace->Lock); + ExReleasePushLock((PEX_PUSH_LOCK)&CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot)->AddressCreationLock); KeLeaveCriticalRegion(); } Modified: trunk/reactos/ntoskrnl/mm/aspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/aspace.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/aspace.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/aspace.c [iso-8859-1] Sun Jul 27 19:56:39 2008 @@ -32,8 +32,6 @@ PMADDRESS_SPACE AddressSpace) { AddressSpace->MemoryAreaRoot = NULL; - AddressSpace->Lock = (PEX_PUSH_LOCK)&Process->AddressCreationLock; - ExInitializePushLock((PULONG_PTR)AddressSpace->Lock); return STATUS_SUCCESS; }

1 0

[tkreuzer] 34877: - add another missing export to ntoskrnl_amd64.def - fix LARGE_INTEGER to pointer cast - add more drivers to build
by tkreuzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: tkreuzer Date: Sun Jul 27 19:47:28 2008 New Revision: 34877 URL: http://svn.reactos.org/svn/reactos?rev=34877&view=rev Log: - add another missing export to ntoskrnl_amd64.def - fix LARGE_INTEGER to pointer cast - add more drivers to build Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/drivers/storage/floppy/floppy.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sun Jul 27 19:47:28 2008 @@ -93,14 +93,12 @@ <directory name="drivers"> <directory name="base"> - <directory name="bootvid"> - <xi:include href="drivers/base/bootvid/bootvid.rbuild" /> - </directory> - <directory name="kdcom"> - <xi:include href="drivers/base/kdcom/kdcom.rbuild" /> - </directory> + <xi:include href="drivers/base/directory.rbuild" /> </directory> <directory name="filesystems"> + <directory name="cdfs"> + <xi:include href="drivers/filesystems/cdfs/cdfs.rbuild" /> + </directory> <directory name="fastfat"> <xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" /> </directory> @@ -116,11 +114,23 @@ <xi:include href="drivers/network/tcpip/tcpip.rbuild" /> </directory> </directory> + <directory name="setup"> + <xi:include href="drivers/setup/directory.rbuild" /> + </directory> <directory name="storage"> <directory name="class"> + <directory name="cdrom"> + <xi:include href="drivers/storage/class/cdrom/cdrom.rbuild" /> + </directory> <directory name="class2"> <xi:include href="drivers/storage/class/class2/class2.rbuild" /> </directory> + <directory name="disk"> + <xi:include href="drivers/storage/class/disk/disk.rbuild" /> + </directory> + </directory> + <directory name="floppy"> + <xi:include href="drivers/storage/floppy/floppy.rbuild" /> </directory> <directory name="ide"> <directory name="atapi"> Modified: branches/ros-amd64-bringup/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Sun Jul 27 19:47:28 2008 @@ -520,7 +520,7 @@ if(AddressSpace == 0) gControllerInfo[gNumberOfControllers].BaseAddress = MmMapIoSpace(TranslatedAddress, FDC_PORT_BYTES, MmNonCached); else - gControllerInfo[gNumberOfControllers].BaseAddress = (PUCHAR)TranslatedAddress.u.LowPart; + gControllerInfo[gNumberOfControllers].BaseAddress = (PUCHAR)(ULONG_PTR)TranslatedAddress.QuadPart; } else if(PartialDescriptor->Type == CmResourceTypeDma) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] Sun Jul 27 19:47:28 2008 @@ -14,6 +14,7 @@ KeGetCurrentProcessorNumber RtlConvertUlongToLargeInteger RtlExtendedIntegerMultiply +KeQueryTickCount ; ; original: CcCanIWrite

1 0

[ros-arm-bringup] 34876: Looks like this address space nonsense made even less sense than originally understood. The kernel address space was something created very early-on, and associated with a global variable that actually contained the address space itself (so it wasn't part of any process). Its locks however, were associated to the "current process", which, when this function is called, is the idle process (which later is cloned into the initial system process). Shortly thereafter, the add
by ros-arm-bringup＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: ros-arm-bringup Date: Sun Jul 27 19:43:57 2008 New Revision: 34876 URL: http://svn.reactos.org/svn/reactos?rev=34876&view=rev Log: Looks like this address space nonsense made even less sense than originally understood. The kernel address space was something created very early-on, and associated with a global variable that actually contained the address space itself (so it wasn't part of any process). Its locks however, were associated to the "current process", which, when this function is called, is the idle process (which later is cloned into the initial system process). Shortly thereafter, the address space of the "current process" (still, at this point, the idle process) was initialized with the function reserved for real processes (MmInitializeProcessAddressSpace), which among other things, performed a couple of user-mode mappings (which are irrelevant and should not be part of the system process address space). This created a weird schism: the kernel address space was actually a global variable associated with no process at all, while the kernel process had its own address space as well (which was not the kernel address space). It's a miracle this didn't screw anything up especially since whether or not the address space has an owner determined the lowest address (which means that if the kernel process allocated a memory with its *own* address space, the code would think it was a user-mode process). This patch gets rid of the kernel address space as a static structure, and instead makes it a pointer into the idle/system process' address space. It also gets rid of MmInitializeKernelAddresSpace and instead makes use of the existing MmInitializeHandBuiltProcess, cleaning up the user-mode allocations previously made. Even though all address spaces now have an owner and are part of a process, MmGetAddressSpaceOwner will still return NULL for now, to remain backwards compatible with legacy code. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/aspace.c trunk/reactos/ntoskrnl/mm/mminit.c 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] Sun Jul 27 19:43:57 2008 @@ -1569,7 +1569,7 @@ } -extern MADDRESS_SPACE MmKernelAddressSpace; +extern PMADDRESS_SPACE MmKernelAddressSpace; FORCEINLINE VOID @@ -1591,7 +1591,7 @@ PEPROCESS MmGetAddressSpaceOwner(IN PMADDRESS_SPACE AddressSpace) { - if (AddressSpace == &MmKernelAddressSpace) return NULL; + if (AddressSpace == MmKernelAddressSpace) return NULL; return CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot); } @@ -1606,7 +1606,7 @@ PMADDRESS_SPACE MmGetKernelAddressSpace(VOID) { - return &MmKernelAddressSpace; + return MmKernelAddressSpace; } #endif Modified: trunk/reactos/ntoskrnl/mm/aspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/aspace.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/aspace.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/aspace.c [iso-8859-1] Sun Jul 27 19:43:57 2008 @@ -19,20 +19,12 @@ /* GLOBALS ******************************************************************/ -MADDRESS_SPACE MmKernelAddressSpace; +PMADDRESS_SPACE MmKernelAddressSpace; ULONGLONG Cycles; ULONG TimeDelta; /* FUNCTIONS *****************************************************************/ - -VOID -INIT_FUNCTION -NTAPI -MmInitializeKernelAddressSpace(VOID) -{ - MmInitializeAddressSpace(NULL, &MmKernelAddressSpace); -} NTSTATUS NTAPI @@ -40,18 +32,8 @@ PMADDRESS_SPACE AddressSpace) { AddressSpace->MemoryAreaRoot = NULL; - - if (Process != NULL) - { - AddressSpace->Lock = (PEX_PUSH_LOCK)&Process->AddressCreationLock; - ExInitializePushLock((PULONG_PTR)AddressSpace->Lock); - } - else - { - AddressSpace->Lock = (PEX_PUSH_LOCK)&PsGetCurrentProcess()->AddressCreationLock; - ExInitializePushLock((PULONG_PTR)AddressSpace->Lock); - } - + AddressSpace->Lock = (PEX_PUSH_LOCK)&Process->AddressCreationLock; + ExInitializePushLock((PULONG_PTR)AddressSpace->Lock); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Jul 27 19:43:57 2008 @@ -368,6 +368,7 @@ MmInit1(VOID) { PLDR_DATA_TABLE_ENTRY LdrEntry; + LARGE_INTEGER Dummy; /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); @@ -395,7 +396,8 @@ DbgPrint("Used memory %dKb\n", (MmNumberOfPhysicalPages * PAGE_SIZE) / 1024); /* Initialize the kernel address space */ - MmInitializeKernelAddressSpace(); + MmInitializeHandBuiltProcess(PsGetCurrentProcess(), &Dummy); + MmKernelAddressSpace = MmGetCurrentAddressSpace(); MmInitGlobalKernelPageDirectory(); /* Get kernel address boundaries */ @@ -456,7 +458,6 @@ MmInitSystem(IN ULONG Phase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG Flags = 0; if (Phase == 0) { /* Initialize Mm bootstrap */ @@ -464,13 +465,6 @@ /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); - - /* Initialize the address space for the system process */ - MmInitializeProcessAddressSpace(PsGetCurrentProcess(), - NULL, - NULL, - &Flags, - NULL); /* Reload boot drivers */ MiReloadBootLoadedDrivers(LoaderBlock);

1 0

[tkreuzer] 34875: - add missing export RtlExtended integerMultiply to ntoskrnl - build class2, atapi and scsiport drivers
by tkreuzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: tkreuzer Date: Sun Jul 27 19:34:07 2008 New Revision: 34875 URL: http://svn.reactos.org/svn/reactos?rev=34875&view=rev Log: - add missing export RtlExtended integerMultiply to ntoskrnl - build class2, atapi and scsiport drivers Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sun Jul 27 19:34:07 2008 @@ -117,13 +117,21 @@ </directory> </directory> <directory name="storage"> + <directory name="class"> + <directory name="class2"> + <xi:include href="drivers/storage/class/class2/class2.rbuild" /> + </directory> + </directory> <directory name="ide"> <directory name="atapi"> -  + <xi:include href="drivers/storage/ide/atapi/atapi.rbuild" /> </directory> </directory> + <directory name="port"> + <xi:include href="drivers/storage/port/directory.rbuild" /> + </directory> <directory name="scsiport"> -  + <xi:include href="drivers/storage/scsiport/scsiport.rbuild" /> </directory> </directory> </directory> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] Sun Jul 27 19:34:07 2008 @@ -13,6 +13,7 @@ KeInitializeSpinLock KeGetCurrentProcessorNumber RtlConvertUlongToLargeInteger +RtlExtendedIntegerMultiply ; ; original: CcCanIWrite

1 0

[tkreuzer] 34874: class2: fix ULONG to pointer cast
by tkreuzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: tkreuzer Date: Sun Jul 27 19:32:21 2008 New Revision: 34874 URL: http://svn.reactos.org/svn/reactos?rev=34874&view=rev Log: class2: fix ULONG to pointer cast Modified: branches/ros-amd64-bringup/reactos/drivers/storage/class/class2/class2.c Modified: branches/ros-amd64-bringup/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Sun Jul 27 19:32:21 2008 @@ -1316,7 +1316,7 @@ // of original IRP. // - nextIrpStack->Parameters.Others.Argument1 = (PVOID) irpCount; + nextIrpStack->Parameters.Others.Argument1 = (PVOID)(ULONG_PTR) irpCount; for (i = 0; i < irpCount; i++) {

1 0

[ros-arm-bringup] 34873: The puzzle of the design decisions behind the React address space structure continues to be troubling (perhaps there was no design?). Every time a process address space is initialized, the owner process is stored (which we now use to figure out the lowest address). Recall that NULL means kernel, anything else means per-process. This is great, except that after some painfull header groking, one understands that the PMADDRESS_SPACE structure is actually *not* a separate st
by ros-arm-bringup＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: ros-arm-bringup Date: Sun Jul 27 18:53:04 2008 New Revision: 34873 URL: http://svn.reactos.org/svn/reactos?rev=34873&view=rev Log: The puzzle of the design decisions behind the React address space structure continues to be troubling (perhaps there was no design?). Every time a process address space is initialized, the owner process is stored (which we now use to figure out the lowest address). Recall that NULL means kernel, anything else means per-process. This is great, except that after some painfull header groking, one understands that the PMADDRESS_SPACE structure is actually *not* a separate structure, but embedded within PEPROCESS itself. It is a React-specific structure (hence the attempts to get rid of it), that seems to have been "overloaded" on top of the VadRoot structure that Windows uses for user-mode memory allocations. To clarify, this structure is actually embedded inside the process that owns it, except for the kernel address space, which is a global variable. So there's absolutely *no* point in saving a reference to the owner process, since we'll always be embedded inside it (except for kernel address space). This patch creates the MmGetAddressSpaceOwner macro which either returns NULL for kernel address space, or uses the CONTAINING_RECORD macro to return the owner (embedded) process. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/aspace.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/section.c 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] Sun Jul 27 18:53:04 2008 @@ -253,7 +253,6 @@ typedef struct _MADDRESS_SPACE { PMEMORY_AREA MemoryAreaRoot; - PEPROCESS Process; PEX_PUSH_LOCK Lock; } MADDRESS_SPACE, *PMADDRESS_SPACE; @@ -1589,6 +1588,14 @@ } FORCEINLINE +PEPROCESS +MmGetAddressSpaceOwner(IN PMADDRESS_SPACE AddressSpace) +{ + if (AddressSpace == &MmKernelAddressSpace) return NULL; + return CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot); +} + +FORCEINLINE PMADDRESS_SPACE MmGetCurrentAddressSpace(VOID) { Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sun Jul 27 18:53:04 2008 @@ -55,6 +55,7 @@ SWAPENTRY SwapEntry; PFN_TYPE Page; NTSTATUS Status; + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); /* * Check for paging out from a deleted virtual memory area. @@ -67,12 +68,12 @@ return(STATUS_UNSUCCESSFUL); } - Page = MmGetPfnForProcess(AddressSpace->Process, Address); + Page = MmGetPfnForProcess(Process, Address); /* * Get that the page actually is dirty. */ - if (!MmIsDirtyPage(AddressSpace->Process, Address)) + if (!MmIsDirtyPage(Process, Address)) { PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -83,7 +84,7 @@ /* * Speculatively set the mapping to clean. */ - MmSetCleanPage(AddressSpace->Process, Address); + MmSetCleanPage(Process, Address); /* * If necessary, allocate an entry in the paging file for this page @@ -94,7 +95,7 @@ SwapEntry = MmAllocSwapPage(); if (SwapEntry == 0) { - MmSetDirtyPage(AddressSpace->Process, Address); + MmSetDirtyPage(Process, Address); PageOp->Status = STATUS_PAGEFILE_QUOTA_EXCEEDED; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -110,7 +111,7 @@ { DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", Status); - MmSetDirtyPage(AddressSpace->Process, Address); + MmSetDirtyPage(Process, Address); PageOp->Status = STATUS_UNSUCCESSFUL; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -138,9 +139,10 @@ BOOLEAN WasDirty; SWAPENTRY SwapEntry; NTSTATUS Status; - + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + DPRINT("MmPageOutVirtualMemory(Address 0x%.8X) PID %d\n", - Address, AddressSpace->Process->UniqueProcessId); + Address, Process->UniqueProcessId); /* * Check for paging out from a deleted virtual memory area. @@ -156,7 +158,7 @@ /* * Disable the virtual mapping. */ - MmDisableVirtualMapping(AddressSpace->Process, Address, + MmDisableVirtualMapping(Process, Address, &WasDirty, &Page); if (Page == 0) @@ -170,11 +172,11 @@ if (!WasDirty) { MmLockAddressSpace(AddressSpace); - MmDeleteVirtualMapping(AddressSpace->Process, Address, FALSE, NULL, NULL); + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); MmDeleteAllRmaps(Page, NULL, NULL); if ((SwapEntry = MmGetSavedSwapEntryPage(Page)) != 0) { - MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); + MmCreatePageFileMapping(Process, Address, SwapEntry); MmSetSavedSwapEntryPage(Page, 0); } MmUnlockAddressSpace(AddressSpace); @@ -195,7 +197,7 @@ if (SwapEntry == 0) { MmShowOutOfSpaceMessagePagingFile(); - MmEnableVirtualMapping(AddressSpace->Process, Address); + MmEnableVirtualMapping(Process, Address); PageOp->Status = STATUS_UNSUCCESSFUL; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -211,7 +213,7 @@ { DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", Status); - MmEnableVirtualMapping(AddressSpace->Process, Address); + MmEnableVirtualMapping(Process, Address); PageOp->Status = STATUS_UNSUCCESSFUL; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -223,8 +225,8 @@ */ DPRINT("MM: Swapped out virtual memory page 0x%.8X!\n", Page << PAGE_SHIFT); MmLockAddressSpace(AddressSpace); - MmDeleteVirtualMapping(AddressSpace->Process, Address, FALSE, NULL, NULL); - MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); + MmCreatePageFileMapping(Process, Address, SwapEntry); MmUnlockAddressSpace(AddressSpace); MmDeleteAllRmaps(Page, NULL, NULL); MmSetSavedSwapEntryPage(Page, 0); @@ -255,7 +257,8 @@ NTSTATUS Status; PMM_REGION Region; PMM_PAGEOP PageOp; - + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + /* * There is a window between taking the page fault and locking the * address space when another thread could load the page so we check @@ -292,7 +295,7 @@ /* * Get or create a page operation */ - PageOp = MmGetPageOp(MemoryArea, AddressSpace->Process->UniqueProcessId, + PageOp = MmGetPageOp(MemoryArea, Process->UniqueProcessId, (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, MM_PAGEOP_PAGEIN, FALSE); if (PageOp == NULL) @@ -380,7 +383,7 @@ { SWAPENTRY SwapEntry; - MmDeletePageFileMapping(AddressSpace->Process, Address, &SwapEntry); + MmDeletePageFileMapping(Process, Address, &SwapEntry); Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { @@ -393,7 +396,7 @@ * Set the page. If we fail because we are out of memory then * try again */ - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, (PVOID)PAGE_ROUND_DOWN(Address), Region->Protect, &Page, @@ -401,7 +404,7 @@ while (Status == STATUS_NO_MEMORY) { MmUnlockAddressSpace(AddressSpace); - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, Region->Protect, &Page, @@ -418,7 +421,7 @@ /* * Add the page to the process's working set */ - MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAGE_ROUND_DOWN(Address)); + MmInsertRmap(Page, Process, (PVOID)PAGE_ROUND_DOWN(Address)); /* * Finish the operation @@ -445,6 +448,8 @@ * FUNCTION: Modify the attributes of a memory region */ { + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + /* * If we are switching a previously committed region to reserved then * free any allocated pages within the region @@ -457,19 +462,19 @@ { PFN_TYPE Page; - if (MmIsPageSwapEntry(AddressSpace->Process, + if (MmIsPageSwapEntry(Process, (char*)BaseAddress + (i * PAGE_SIZE))) { SWAPENTRY SwapEntry; - MmDeletePageFileMapping(AddressSpace->Process, + MmDeletePageFileMapping(Process, (char*)BaseAddress + (i * PAGE_SIZE), &SwapEntry); MmFreeSwapPage(SwapEntry); } else { - MmDeleteVirtualMapping(AddressSpace->Process, + MmDeleteVirtualMapping(Process, (char*)BaseAddress + (i*PAGE_SIZE), FALSE, NULL, &Page); if (Page != 0) @@ -481,7 +486,7 @@ MmFreeSwapPage(SavedSwapEntry); MmSetSavedSwapEntryPage(Page, 0); } - MmDeleteRmap(Page, AddressSpace->Process, + MmDeleteRmap(Page, Process, (char*)BaseAddress + (i * PAGE_SIZE)); MmReleasePageMemoryConsumer(MC_USER, Page); } @@ -500,10 +505,10 @@ for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) { - if (MmIsPagePresent(AddressSpace->Process, + if (MmIsPagePresent(Process, (char*)BaseAddress + (i*PAGE_SIZE))) { - MmSetPageProtect(AddressSpace->Process, + MmSetPageProtect(Process, (char*)BaseAddress + (i*PAGE_SIZE), NewProtect); } Modified: trunk/reactos/ntoskrnl/mm/aspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/aspace.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/aspace.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/aspace.c [iso-8859-1] Sun Jul 27 18:53:04 2008 @@ -43,13 +43,11 @@ if (Process != NULL) { - AddressSpace->Process = Process; AddressSpace->Lock = (PEX_PUSH_LOCK)&Process->AddressCreationLock; ExInitializePushLock((PULONG_PTR)AddressSpace->Lock); } else { - AddressSpace->Process = NULL; AddressSpace->Lock = (PEX_PUSH_LOCK)&PsGetCurrentProcess()->AddressCreationLock; ExInitializePushLock((PULONG_PTR)AddressSpace->Lock); } Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=34… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Jul 27 18:53:04 2008 @@ -470,8 +470,8 @@ ULONG_PTR Length, ULONG_PTR Granularity) { - PVOID LowestAddress = AddressSpace->Process ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; - PVOID HighestAddress = AddressSpace->Process ? + PVOID LowestAddress = MmGetAddressSpaceOwner(AddressSpace) ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; + PVOID HighestAddress = MmGetAddressSpaceOwner(AddressSpace) ? (PVOID)((ULONG_PTR)MmSystemRangeStart - 1) : (PVOID)MAXULONG_PTR; PVOID AlignedAddress; PMEMORY_AREA Node; @@ -548,8 +548,8 @@ ULONG_PTR Length, ULONG_PTR Granularity) { - PVOID LowestAddress = AddressSpace->Process ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; - PVOID HighestAddress = AddressSpace->Process ? + PVOID LowestAddress = MmGetAddressSpaceOwner(AddressSpace) ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; + PVOID HighestAddress = MmGetAddressSpaceOwner(AddressSpace) ? (PVOID)((ULONG_PTR)MmSystemRangeStart - 1) : (PVOID)MAXULONG_PTR; PVOID AlignedAddress; PMEMORY_AREA Node; @@ -648,8 +648,8 @@ { PMEMORY_AREA Node = AddressSpace->MemoryAreaRoot; PMEMORY_AREA RightNeighbour = NULL; - PVOID LowestAddress = AddressSpace->Process ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; - PVOID HighestAddress = AddressSpace->Process ? + PVOID LowestAddress = MmGetAddressSpaceOwner(AddressSpace) ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; + PVOID HighestAddress = MmGetAddressSpaceOwner(AddressSpace) ? (PVOID)((ULONG_PTR)MmSystemRangeStart - 1) : (PVOID)MAXULONG_PTR; MmVerifyMemoryAreas(AddressSpace); @@ -749,11 +749,12 @@ ULONG_PTR Address; PVOID EndAddress; PEPROCESS CurrentProcess = PsGetCurrentProcess(); - - if (AddressSpace->Process != NULL && - AddressSpace->Process != CurrentProcess) - { - KeAttachProcess(&AddressSpace->Process->Pcb); + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + + if (Process != NULL && + Process != CurrentProcess) + { + KeAttachProcess(&Process->Pcb); } EndAddress = MM_ROUND_UP(MemoryArea->EndingAddress, PAGE_SIZE); @@ -771,13 +772,13 @@ SWAPENTRY SwapEntry = 0; PFN_TYPE Page = 0; - if (MmIsPageSwapEntry(AddressSpace->Process, (PVOID)Address)) + if (MmIsPageSwapEntry(Process, (PVOID)Address)) { - MmDeletePageFileMapping(AddressSpace->Process, (PVOID)Address, &SwapEntry); + MmDeletePageFileMapping(Process, (PVOID)Address, &SwapEntry); } else { - MmDeleteVirtualMapping(AddressSpace->Process, (PVOID)Address, FALSE, &Dirty, &Page); + MmDeleteVirtualMapping(Process, (PVOID)Address, FALSE, &Dirty, &Page); } if (FreePage != NULL) { @@ -787,8 +788,8 @@ } } - if (AddressSpace->Process != NULL && - AddressSpace->Process != CurrentProcess) + if (Process != NULL && + Process != CurrentProcess) { KeDetachProcess(); } @@ -975,13 +976,13 @@ - (ULONG_PTR) MM_ROUND_DOWN(*BaseAddress, Granularity)); *BaseAddress = MM_ROUND_DOWN(*BaseAddress, Granularity); - if (!AddressSpace->Process && *BaseAddress < MmSystemRangeStart) + if (!MmGetAddressSpaceOwner(AddressSpace) && *BaseAddress < MmSystemRangeStart) { CHECKPOINT; return STATUS_ACCESS_VIOLATION; } - if (AddressSpace->Process && + if (MmGetAddressSpaceOwner(AddressSpace) && (ULONG_PTR)(*BaseAddress) + tmpLength > (ULONG_PTR)MmSystemRangeStart) { CHECKPOINT; 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] Sun Jul 27 18:53:04 2008 @@ -724,17 +724,18 @@ PMM_PAGEOP PageOp; PMM_REGION Region; BOOLEAN HasSwapEntry; - + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + /* * There is a window between taking the page fault and locking the * address space when another thread could load the page so we check * that. */ - if (MmIsPagePresent(AddressSpace->Process, Address)) + if (MmIsPagePresent(Process, Address)) { if (Locked) { - MmLockPage(MmGetPfnForProcess(AddressSpace->Process, Address)); + MmLockPage(MmGetPfnForProcess(Process, Address)); } return(STATUS_SUCCESS); } @@ -825,10 +826,10 @@ * If the completed fault was for another address space then set the * page in this one. */ - if (!MmIsPagePresent(AddressSpace->Process, Address)) + if (!MmIsPagePresent(Process, Address)) { Entry = MmGetPageEntrySectionSegment(Segment, Offset); - HasSwapEntry = MmIsPageSwapEntry(AddressSpace->Process, (PVOID)PAddress); + HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); if (PAGE_FROM_SSE(Entry) == 0 || HasSwapEntry) { @@ -847,7 +848,7 @@ /* FIXME: Should we call MmCreateVirtualMappingUnsafe if * (Section->AllocationAttributes & SEC_PHYSICALMEMORY) is true? */ - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, Attributes, &Page, @@ -857,7 +858,7 @@ DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } - MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); + MmInsertRmap(Page, Process, (PVOID)PAddress); } if (Locked) { @@ -870,7 +871,7 @@ return(STATUS_SUCCESS); } - HasSwapEntry = MmIsPageSwapEntry(AddressSpace->Process, (PVOID)PAddress); + HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); if (HasSwapEntry) { /* @@ -888,7 +889,7 @@ } MmUnlockSectionSegment(Segment); - MmDeletePageFileMapping(AddressSpace->Process, (PVOID)PAddress, &SwapEntry); + MmDeletePageFileMapping(Process, (PVOID)PAddress, &SwapEntry); MmUnlockAddressSpace(AddressSpace); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); @@ -904,7 +905,7 @@ KEBUGCHECK(0); } MmLockAddressSpace(AddressSpace); - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, Region->Protect, &Page, @@ -924,7 +925,7 @@ /* * Add the page to the process's working set */ - MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); + MmInsertRmap(Page, Process, (PVOID)PAddress); /* * Finish the operation @@ -949,7 +950,7 @@ * Just map the desired physical page */ Page = Offset >> PAGE_SHIFT; - Status = MmCreateVirtualMappingUnsafe(AddressSpace->Process, + Status = MmCreateVirtualMappingUnsafe(Process, Address, Region->Protect, &Page, @@ -995,7 +996,7 @@ { KEBUGCHECK(0); } - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, Region->Protect, &Page, @@ -1006,7 +1007,7 @@ KEBUGCHECK(0); return(Status); } - MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); + MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) { MmLockPage(Page); @@ -1095,7 +1096,7 @@ MmSetPageEntrySectionSegment(Segment, Offset, Entry); MmUnlockSectionSegment(Segment); - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, Attributes, &Page, @@ -1105,7 +1106,7 @@ DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } - MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); + MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) { @@ -1170,7 +1171,7 @@ * Save the swap entry. */ MmSetSavedSwapEntryPage(Page, SwapEntry); - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, Region->Protect, &Page, @@ -1180,7 +1181,7 @@ DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } - MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); + MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) { MmLockPage(Page); @@ -1202,7 +1203,7 @@ MmSharePageEntrySectionSegment(Segment, Offset); MmUnlockSectionSegment(Segment); - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, Attributes, &Page, @@ -1212,7 +1213,7 @@ DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } - MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); + MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) { MmLockPage(Page); @@ -1241,14 +1242,15 @@ PMM_PAGEOP PageOp; PMM_REGION Region; ULONG Entry; - + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address, Locked); /* * Check if the page has been paged out or has already been set readwrite */ - if (!MmIsPagePresent(AddressSpace->Process, Address) || - MmGetPageProtect(AddressSpace->Process, Address) & PAGE_READWRITE) + if (!MmIsPagePresent(Process, Address) || + MmGetPageProtect(Process, Address) & PAGE_READWRITE) { DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); @@ -1291,7 +1293,7 @@ PFN_FROM_SSE(Entry) != OldPage) { /* This is a private page. We must only change the page protection. */ - MmSetPageProtect(AddressSpace->Process, PAddress, Region->Protect); + MmSetPageProtect(Process, PAddress, Region->Protect); return(STATUS_SUCCESS); } @@ -1358,12 +1360,12 @@ /* * Delete the old entry. */ - MmDeleteVirtualMapping(AddressSpace->Process, Address, FALSE, NULL, NULL); + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); /* * Set the PTE to point to the new page */ - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, Region->Protect, &NewPage, @@ -1388,8 +1390,8 @@ /* * Unshare the old page. */ - MmDeleteRmap(OldPage, AddressSpace->Process, PAddress); - MmInsertRmap(NewPage, AddressSpace->Process, PAddress); + MmDeleteRmap(OldPage, Process, PAddress); + MmInsertRmap(NewPage, Process, PAddress); MmLockSectionSegment(Segment); MmUnsharePageEntrySectionSegment(Section, Segment, Offset, FALSE, FALSE); MmUnlockSectionSegment(Segment); @@ -1462,7 +1464,8 @@ PBCB Bcb = NULL; BOOLEAN DirectMapped; BOOLEAN IsImageSection; - + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + Address = (PVOID)PAGE_ROUND_DOWN(Address); /* @@ -1505,7 +1508,7 @@ { DPRINT1("Trying to page out from physical memory section address 0x%X " "process %d\n", Address, - AddressSpace->Process ? AddressSpace->Process->UniqueProcessId : 0); + Process ? Process->UniqueProcessId : 0); KEBUGCHECK(0); } @@ -1513,13 +1516,13 @@ * Get the section segment entry and the physical address. */ Entry = MmGetPageEntrySectionSegment(Context.Segment, Context.Offset); - if (!MmIsPagePresent(AddressSpace->Process, Address)) + if (!MmIsPagePresent(Process, Address)) { DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n", - AddressSpace->Process ? AddressSpace->Process->UniqueProcessId : 0, Address); + Process ? Process->UniqueProcessId : 0, Address); KEBUGCHECK(0); } - Page = MmGetPfnForProcess(AddressSpace->Process, Address); + Page = MmGetPfnForProcess(Process, Address); SwapEntry = MmGetSavedSwapEntryPage(Page); /* @@ -1650,7 +1653,7 @@ { MmSetSavedSwapEntryPage(Page, 0); MmLockAddressSpace(AddressSpace); - Status = MmCreatePageFileMapping(AddressSpace->Process, + Status = MmCreatePageFileMapping(Process, Address, SwapEntry); MmUnlockAddressSpace(AddressSpace); @@ -1679,14 +1682,14 @@ */ if (Context.Private) { - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, MemoryArea->Protect, &Page, 1); - MmSetDirtyPage(AddressSpace->Process, Address); + MmSetDirtyPage(Process, Address); MmInsertRmap(Page, - AddressSpace->Process, + Process, Address); } else @@ -1696,14 +1699,14 @@ * set it back into the section segment entry so we don't loose * our copy. Otherwise it will be handled by the cache manager. */ - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, MemoryArea->Protect, &Page, 1); - MmSetDirtyPage(AddressSpace->Process, Address); + MmSetDirtyPage(Process, Address); MmInsertRmap(Page, - AddressSpace->Process, + Process, Address); Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); @@ -1730,26 +1733,26 @@ MmLockAddressSpace(AddressSpace); if (Context.Private) { - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, MemoryArea->Protect, &Page, 1); - MmSetDirtyPage(AddressSpace->Process, Address); + MmSetDirtyPage(Process, Address); MmInsertRmap(Page, - AddressSpace->Process, + Process, Address); } else { - Status = MmCreateVirtualMapping(AddressSpace->Process, + Status = MmCreateVirtualMapping(Process, Address, MemoryArea->Protect, &Page, 1); - MmSetDirtyPage(AddressSpace->Process, Address); + MmSetDirtyPage(Process, Address); MmInsertRmap(Page, - AddressSpace->Process, + Process, Address); Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); @@ -1778,7 +1781,7 @@ if (Context.Private) { MmLockAddressSpace(AddressSpace); - Status = MmCreatePageFileMapping(AddressSpace->Process, + Status = MmCreatePageFileMapping(Process, Address, SwapEntry); MmUnlockAddressSpace(AddressSpace); @@ -1817,6 +1820,7 @@ PBCB Bcb = NULL; BOOLEAN DirectMapped; BOOLEAN IsImageSection; + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); Address = (PVOID)PAGE_ROUND_DOWN(Address); @@ -1857,7 +1861,7 @@ { DPRINT1("Trying to write back page from physical memory mapped at %X " "process %d\n", Address, - AddressSpace->Process ? AddressSpace->Process->UniqueProcessId : 0); + Process ? Process->UniqueProcessId : 0); KEBUGCHECK(0); } @@ -1865,13 +1869,13 @@ * Get the section segment entry and the physical address. */ Entry = MmGetPageEntrySectionSegment(Segment, Offset); - if (!MmIsPagePresent(AddressSpace->Process, Address)) + if (!MmIsPagePresent(Process, Address)) { DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n", - AddressSpace->Process ? AddressSpace->Process->UniqueProcessId : 0, Address); + Process ? Process->UniqueProcessId : 0, Address); KEBUGCHECK(0); } - Page = MmGetPfnForProcess(AddressSpace->Process, Address); + Page = MmGetPfnForProcess(Process, Address); SwapEntry = MmGetSavedSwapEntryPage(Page); /* @@ -1958,6 +1962,7 @@ PMM_SECTION_SEGMENT Segment; BOOLEAN DoCOW = FALSE; ULONG i; + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); Segment = MemoryArea->Data.SectionData.Segment; @@ -1979,7 +1984,7 @@ * If we doing COW for this segment then check if the page is * already private. */ - if (DoCOW && MmIsPagePresent(AddressSpace->Process, Address)) + if (DoCOW && MmIsPagePresent(Process, Address)) { ULONG Offset; ULONG Entry; @@ -1988,7 +1993,7 @@ Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; Entry = MmGetPageEntrySectionSegment(Segment, Offset); - Page = MmGetPfnForProcess(AddressSpace->Process, Address); + Page = MmGetPfnForProcess(Process, Address); Protect = PAGE_READONLY; if (Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || @@ -1999,9 +2004,9 @@ } } - if (MmIsPagePresent(AddressSpace->Process, Address)) + if (MmIsPagePresent(Process, Address)) { - MmSetPageProtect(AddressSpace->Process, Address, + MmSetPageProtect(Process, Address, Protect); } } @@ -3836,8 +3841,10 @@ PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PMADDRESS_SPACE AddressSpace; + PEPROCESS Process; AddressSpace = (PMADDRESS_SPACE)Context; + Process = MmGetAddressSpaceOwner(AddressSpace); Address = (PVOID)PAGE_ROUND_DOWN(Address); @@ -3918,12 +3925,12 @@ MmFreeSwapPage(SavedSwapEntry); MmSetSavedSwapEntryPage(Page, 0); } - MmDeleteRmap(Page, AddressSpace->Process, Address); + MmDeleteRmap(Page, Process, Address); MmReleasePageMemoryConsumer(MC_USER, Page); } else { - MmDeleteRmap(Page, AddressSpace->Process, Address); + MmDeleteRmap(Page, Process, Address); MmUnsharePageEntrySectionSegment(Section, Segment, Offset, Dirty, FALSE); } }

1 0

[ros-arm-bringup] 34872: - Remove MiGetUserPageDirectoryCount from the ARM Mm since this function is now useless after our cleanups.
by ros-arm-bringup＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: ros-arm-bringup Date: Sun Jul 27 18:48:19 2008 New Revision: 34872 URL: http://svn.reactos.org/svn/reactos?rev=34872&view=rev Log: - Remove MiGetUserPageDirectoryCount from the ARM Mm since this function is now useless after our cleanups. Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sun Jul 27 18:48:19 2008 @@ -740,16 +740,6 @@ return Pte.u.Hard.L2.Small.BaseAddress; } -ULONG -NTAPI -MiGetUserPageDirectoryCount(VOID) -{ - // - // Return the index - // - return MiGetPdeOffset(MmSystemRangeStart); -} - BOOLEAN NTAPI MmIsDirtyPage(IN PEPROCESS Process,

1 0

[tkreuzer] 34871: - fix bzip2 include to make ip compile - comment out some stuff in SEH asm code to make it compile, it's useless code anyway - add some hack exports to ntoskrnl - use private ntoskrnl rbuild File
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 18:32:41 2008 New Revision: 34871 URL: http://svn.reactos.org/svn/reactos?rev=34871&view=rev Log: - fix bzip2 include to make ip compile - comment out some stuff in SEH asm code to make it compile, it's useless code anyway - add some hack exports to ntoskrnl - use private ntoskrnl rbuild File Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/lib/3rdparty/bzip2/bzlib.h branches/ros-amd64-bringup/reactos/lib/pseh/amd64/framebased.S branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sun Jul 27 18:32:41 2008 @@ -108,6 +108,14 @@  </directory> </directory> + <directory name="network"> + <directory name="ndis"> + <xi:include href="drivers/network/ndis/ndis.rbuild" /> + </directory> + <directory name="tcpip"> + <xi:include href="drivers/network/tcpip/tcpip.rbuild" /> + </directory> + </directory> <directory name="storage"> <directory name="ide"> <directory name="atapi"> Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/bzip2/bzlib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/bzip2/bzlib.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/bzip2/bzlib.h [iso-8859-1] Sun Jul 27 18:32:41 2008 @@ -112,7 +112,9 @@ #ifdef _WIN32 # include <stdio.h> -# define WINAPI __stdcall +# ifndef WINAPI +# define WINAPI __stdcall +# endif # ifdef small /* windows.h define small to char */ # undef small Modified: branches/ros-amd64-bringup/reactos/lib/pseh/amd64/framebased.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/p… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/pseh/amd64/framebased.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/pseh/amd64/framebased.S [iso-8859-1] Sun Jul 27 18:32:41 2008 @@ -59,9 +59,9 @@ push 0 // ReturnValue push 0 // ExceptionRecord - push .RestoreRegisters // TargetIp +// push .RestoreRegisters // TargetIp push rbx // TargetFrame - call [__SEHRtlUnwind] +// call [__SEHRtlUnwind] .RestoreRegisters: pop rdi Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] Sun Jul 27 18:32:41 2008 @@ -5,6 +5,14 @@ EXPORTS ; KeQuerySystemTime +KfAcquireSpinLock +KfReleaseSpinLock +KeRaiseIrql +KefAcquireSpinLockAtDpcLevel +KefReleaseSpinLockFromDpcLevel +KeInitializeSpinLock +KeGetCurrentProcessorNumber +RtlConvertUlongToLargeInteger ; ; original: CcCanIWrite

1 0

[tkreuzer] 34870: tcpip: - fix some pointer to ULONG casts
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 18:26:26 2008 New Revision: 34870 URL: http://svn.reactos.org/svn/reactos?rev=34870&view=rev Log: tcpip: - fix some pointer to ULONG casts Modified: branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sun Jul 27 18:26:26 2008 @@ -662,7 +662,7 @@ AddressInfo = (PTDI_ADDRESS_INFO)MmGetSystemAddressForMdl(Irp->MdlAddress); - switch ((ULONG)IrpSp->FileObject->FsContext2) { + switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; break; @@ -713,7 +713,7 @@ AddressInfo = (PTDI_CONNECTION_INFORMATION) MmGetSystemAddressForMdl(Irp->MdlAddress); - switch ((ULONG)IrpSp->FileObject->FsContext2) { + switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; break; @@ -1007,12 +1007,16 @@ (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send))); if( (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send) ) + { + ULONG DataUsed = 0; Status = (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send)( Request.Handle.AddressHandle, DgramInfo->SendDatagramInformation, DataBuffer, BufferSize, - &Irp->IoStatus.Information); + &DataUsed); + Irp->IoStatus.Information = DataUsed; + } else Status = STATUS_UNSUCCESSFUL; @@ -1279,7 +1283,7 @@ TranContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; - switch ((ULONG)IrpSp->FileObject->FsContext2) { + switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: Request.Handle.AddressHandle = TranContext->Handle.AddressHandle; break; @@ -1454,7 +1458,7 @@ TranContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; Info = (PTCP_REQUEST_SET_INFORMATION_EX)Irp->AssociatedIrp.SystemBuffer; - switch ((ULONG)IrpSp->FileObject->FsContext2) { + switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: Request.Handle.AddressHandle = TranContext->Handle.AddressHandle; break;

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008