Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[akhaldi] 48995: [CMAKE] - Improve mciwave and mmdrv.
by akhaldi＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: akhaldi Date: Tue Oct 5 12:43:23 2010 New Revision: 48995 URL: http://svn.reactos.org/svn/reactos?rev=48995&view=rev Log: [CMAKE] - Improve mciwave and mmdrv. Modified: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave… ============================================================================== --- branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] Tue Oct 5 12:43:23 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) add_definitions(-D_DLL -D__USE_CRTIMP) @@ -11,14 +9,11 @@ add_library(mciwave SHARED mciwave.c) -set_target_properties(mciwave PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(mciwave 0) target_link_libraries(mciwave ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def - wine - -lwinmm - mingw_common - -luser32 - -lmsvcrt) + wine) -add_dependencies(mciwave mciwave_def psdk) +add_importlibs(mciwave winmm user32 msvcrt kernel32 ntdll) +add_dependencies(mciwave mciwave_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mmdrv/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] Tue Oct 5 12:43:23 2010 @@ -1,8 +1,7 @@ - +set_unicode() add_definitions(-DNDEBUG) -add_definitions(-DUNICODE -D_UNICODE) spec2def(mmdrv ${CMAKE_CURRENT_SOURCE_DIR}/mmdrv.spec ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) @@ -15,12 +14,9 @@ wave.c wave_io.c) -set_target_properties(mmdrv PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(mmdrv 0) -target_link_libraries(mmdrv - ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def - -lwinmm - -luser32 - -lkernel32) +target_link_libraries(mmdrv ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) -add_dependencies(mmdrv mmdrv_def psdk) +add_importlibs(mmdrv winmm user32 kernel32 ntdll) +add_dependencies(mmdrv mmdrv_def psdk buildno_header)

1 0

[fireball] 48994: [HEAP] - Move on to using a real HEAP_LOCK structure for a heap lock. - Implement kernel-mode counterparts of this lock too. Right now these don't introduce much of a difference, ...
by fireball＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: fireball Date: Tue Oct 5 12:42:55 2010 New Revision: 48994 URL: http://svn.reactos.org/svn/reactos?rev=48994&view=rev Log: [HEAP] - Move on to using a real HEAP_LOCK structure for a heap lock. - Implement kernel-mode counterparts of this lock too. Right now these don't introduce much of a difference, but they are going to be properly used by the new heap manager code. Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/include/ndk/rtltypes.h trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Tue Oct 5 12:42:55 2010 @@ -113,33 +113,33 @@ NTSTATUS NTAPI RtlDeleteHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - return RtlDeleteCriticalSection(CriticalSection); + PHEAP_LOCK Lock) +{ + return RtlDeleteCriticalSection(&Lock->CriticalSection); } NTSTATUS NTAPI RtlEnterHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - return RtlEnterCriticalSection(CriticalSection); + PHEAP_LOCK Lock) +{ + return RtlEnterCriticalSection(&Lock->CriticalSection); } NTSTATUS NTAPI RtlInitializeHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - return RtlInitializeCriticalSection(CriticalSection); + PHEAP_LOCK Lock) +{ + return RtlInitializeCriticalSection(&Lock->CriticalSection); } NTSTATUS NTAPI RtlLeaveHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - return RtlLeaveCriticalSection(CriticalSection ); + PHEAP_LOCK Lock) +{ + return RtlLeaveCriticalSection(&Lock->CriticalSection); } PVOID Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Tue Oct 5 12:42:55 2010 @@ -1038,6 +1038,21 @@ } RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION; #endif + +// +// RTL Private Heap Structures +// +typedef struct _HEAP_LOCK +{ + union + { + RTL_CRITICAL_SECTION CriticalSection; +#ifndef NTOS_MODE_USER + ERESOURCE Resource; +#endif + UCHAR Padding[0x68]; /* Max ERESOURCE size for x64 build. Needed because RTL is built only once */ + }; +} HEAP_LOCK, *PHEAP_LOCK; // // RTL Range List Structures Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Tue Oct 5 12:42:55 2010 @@ -157,36 +157,35 @@ NTSTATUS NTAPI RtlDeleteHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - ASSERT(FALSE); + PHEAP_LOCK Lock) +{ + ExDeleteResource(&Lock->Resource); return STATUS_SUCCESS; } NTSTATUS NTAPI RtlEnterHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - ASSERT(FALSE); + PHEAP_LOCK Lock) +{ + return ExAcquireResourceExclusive(&Lock->Resource, TRUE); +} + +NTSTATUS +NTAPI +RtlInitializeHeapLock( + PHEAP_LOCK Lock) +{ + ExInitializeResource(&Lock->Resource); return STATUS_SUCCESS; } NTSTATUS NTAPI -RtlInitializeHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - ASSERT(FALSE); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI RtlLeaveHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - ASSERT(FALSE); + PHEAP_LOCK Lock) +{ + ExReleaseResource(&Lock->Resource); return STATUS_SUCCESS; }

1 0

[sir_richard] 48993: [NTOS]: Add the tiny little bit of code required to correctly handle user-mode faults on ARM3 mapped sections in certain limited scenarios.
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 08:14:02 2010 New Revision: 48993 URL: http://svn.reactos.org/svn/reactos?rev=48993&view=rev Log: [NTOS]: Add the tiny little bit of code required to correctly handle user-mode faults on ARM3 mapped sections in certain limited scenarios. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Oct 5 08:14:02 2010 @@ -27,6 +27,7 @@ OUT PMMVAD *ProtoVad) { PMMVAD Vad; + PMMPTE PointerPte; /* No prototype/section support for now */ *ProtoVad = NULL; @@ -50,15 +51,33 @@ *ProtectCode = MM_NOACCESS; return NULL; } - - /* This must be a TEB/PEB VAD */ - ASSERT(Vad->u.VadFlags.PrivateMemory == TRUE); - ASSERT(Vad->u.VadFlags.MemCommit == TRUE); + + /* This must be a VM VAD */ ASSERT(Vad->u.VadFlags.VadType == VadNone); - /* Return the protection on it */ - *ProtectCode = Vad->u.VadFlags.Protection; - return NULL; + /* Check if it's a section, or just an allocation */ + if (Vad->u.VadFlags.PrivateMemory == TRUE) + { + /* This must be a TEB/PEB VAD */ + ASSERT(Vad->u.VadFlags.MemCommit == TRUE); + *ProtectCode = Vad->u.VadFlags.Protection; + return NULL; + } + else + { + /* Return the proto VAD */ + ASSERT(Vad->u2.VadFlags2.ExtendableFile == 0); + *ProtoVad = Vad; + + /* Get the prototype PTE for this page */ + PointerPte = (((ULONG_PTR)VirtualAddress >> PAGE_SHIFT) - Vad->StartingVpn) + Vad->FirstPrototypePte; + ASSERT(PointerPte <= Vad->LastContiguousPte); + ASSERT(PointerPte != NULL); + + /* Return the Prototype PTE and the protection for the page mapping */ + *ProtectCode = Vad->u.VadFlags.Protection; + return PointerPte; + } } NTSTATUS @@ -482,8 +501,8 @@ } else { + /* Resolve the fault -- this will release the PFN lock */ ASSERT(PointerPte->u.Hard.Valid == 0); - /* Resolve the fault -- this will release the PFN lock */ Status = MiResolveProtoPteFault(StoreInstruction, Address, PointerPte, @@ -505,15 +524,14 @@ } else { - /* We currently only handle the shared user data PTE path */ + /* We currently only handle very limited paths */ ASSERT(PointerPte->u.Soft.Prototype == 1); ASSERT(PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED); - ASSERT(Vad == NULL); /* Lock the PFN database */ LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - /* For the shared data page, this should be true */ + /* For our current usage, this should be true */ ASSERT(SuperProtoPte->u.Hard.Valid == 1); ASSERT(TempPte.u.Hard.Valid == 0); @@ -972,8 +990,9 @@ } else { - /* The only "prototype PTE" we support is the shared user data path */ - ASSERT(ProtectionCode == MM_READONLY); + /* No guard page support yet */ + ASSERT((ProtectionCode & MM_DECOMMIT) == 0); + ASSERT(ProtectionCode != 0x100); /* Write the prototype PTE */ TempPte = PrototypePte; @@ -991,7 +1010,7 @@ Vad); ASSERT(Status == STATUS_PAGE_FAULT_TRANSITION); ASSERT(PointerPte->u.Hard.Valid == 1); - ASSERT(PointerPte->u.Hard.PageFrameNumber == MmSharedUserDataPte->u.Hard.PageFrameNumber); + ASSERT(PointerPte->u.Hard.PageFrameNumber != 0); } /* Release the working set */

1 0

[sir_richard] 48992: [NTOS]: Delete deprecated handling of MEMORY_AREA_IO_MAPPING. Delete all MEMORY_AREA definitions except the ones for SEGMENT_VIEW and VIRTUAL_MEMORY. All other memory is now ow...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 05:07:13 2010 New Revision: 48992 URL: http://svn.reactos.org/svn/reactos?rev=48992&view=rev Log: [NTOS]: Delete deprecated handling of MEMORY_AREA_IO_MAPPING. Delete all MEMORY_AREA definitions except the ones for SEGMENT_VIEW and VIRTUAL_MEMORY. All other memory is now owned by ARM3! [NTOS]: Delete WriteCopyView flag from MEMORY_AREA (unused, and was taking up 4 bytes due to alignment), and add a Vad pointer (takes up 4 bytes -- no actual size change). [NTOS]: For VM and Section MEMORY_AREAs mapped in user-mode, build a "fake" VAD and insert it into the VAD Root of the Process. This means there is now a consistent view between ARM3 and RosMm in terms of user-mode address space layout, which will come in handy later. [NTOS]: Destroy the MEMORY_AREA's VAD when the MEMORY_AREA itself is deleted. Watch out for the scenario explained in a previous check-in, where the VAD was caught by the MmCleanProcessAddressSpace vad-cleanup-loop. [NTOS]: Implement MiInsertVad to restore the old functionality of MiInsertNode when the current parent and insertion result is not yet known. It obtains the information and calls MiInsertNode. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/marea.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] Tue Oct 5 05:07:13 2010 @@ -76,20 +76,8 @@ #define MI_STATIC_MEMORY_AREAS (13) #endif -#define MEMORY_AREA_INVALID (0) #define MEMORY_AREA_SECTION_VIEW (1) -#define MEMORY_AREA_CONTINUOUS_MEMORY (2) -#define MEMORY_AREA_NO_CACHE (3) -#define MEMORY_AREA_IO_MAPPING (4) -#define MEMORY_AREA_SYSTEM (5) -#define MEMORY_AREA_MDL_MAPPING (7) #define MEMORY_AREA_VIRTUAL_MEMORY (8) -#define MEMORY_AREA_CACHE_SEGMENT (9) -#define MEMORY_AREA_SHARED_DATA (10) -#define MEMORY_AREA_KERNEL_STACK (11) -#define MEMORY_AREA_PAGED_POOL (12) -#define MEMORY_AREA_NO_ACCESS (13) -#define MEMORY_AREA_PEB_OR_TEB (14) #define MEMORY_AREA_OWNED_BY_ARM3 (15) #define MEMORY_AREA_STATIC (0x80000000) @@ -278,6 +266,7 @@ ULONG Flags; BOOLEAN DeleteInProgress; ULONG PageOpCount; + PVOID Vad; union { struct @@ -285,7 +274,6 @@ ROS_SECTION_OBJECT* Section; ULONG ViewOffset; PMM_SECTION_SEGMENT Segment; - BOOLEAN WriteCopyView; LIST_ENTRY RegionListHead; } SectionData; struct Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Tue Oct 5 05:07:13 2010 @@ -93,14 +93,34 @@ VOID NTAPI -MiInsertNode( - IN PMM_AVL_TABLE Table, - IN PMMADDRESS_NODE NewNode, - PMMADDRESS_NODE Parent, - TABLE_SEARCH_RESULT Result) +MiInsertNode(IN PMM_AVL_TABLE Table, + IN PMMADDRESS_NODE NewNode, + IN PMMADDRESS_NODE Parent, + IN TABLE_SEARCH_RESULT Result) { /* Insert it into the tree */ RtlpInsertAvlTreeNode(Table, NewNode, Parent, Result); +} + +VOID +NTAPI +MiInsertVad(IN PMMVAD Vad, + IN PEPROCESS Process) +{ + TABLE_SEARCH_RESULT Result; + PMMADDRESS_NODE Parent = NULL; + + /* Validate the VAD and set it as the current hint */ + ASSERT(Vad->EndingVpn >= Vad->StartingVpn); + Process->VadRoot.NodeHint = Vad; + + /* Find the parent VAD and where this child should be inserted */ + Result = RtlpFindAvlTableNodeOrParent(&Process->VadRoot, (PVOID)Vad->StartingVpn, &Parent); + ASSERT(Result != TableFoundNode); + ASSERT((Parent != NULL) || (Result == TableEmptyTree)); + + /* Do the actual insert operation */ + MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); } VOID @@ -163,13 +183,12 @@ TABLE_SEARCH_RESULT NTAPI -MiFindEmptyAddressRangeDownTree( - IN SIZE_T Length, - IN ULONG_PTR BoundaryAddress, - IN ULONG_PTR Alignment, - IN PMM_AVL_TABLE Table, - OUT PULONG_PTR Base, - OUT PMMADDRESS_NODE *Parent) +MiFindEmptyAddressRangeDownTree(IN SIZE_T Length, + IN ULONG_PTR BoundaryAddress, + IN ULONG_PTR Alignment, + IN PMM_AVL_TABLE Table, + OUT PULONG_PTR Base, + OUT PMMADDRESS_NODE *Parent) { PMMADDRESS_NODE Node, LowestNode, Child; ULONG LowVpn, HighVpn; @@ -180,7 +199,7 @@ ASSERT(BoundaryAddress <= ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); /* Compute page length, make sure the boundary address is valid */ - Length = PAGE_ROUND_UP(Length); + Length = ROUND_TO_PAGES(Length); PageCount = Length >> PAGE_SHIFT; if ((BoundaryAddress + 1) < Length) return STATUS_NO_MEMORY; Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Tue Oct 5 05:07:13 2010 @@ -407,6 +407,11 @@ } } +VOID +NTAPI +MiInsertVad(IN PMMVAD Vad, +IN PEPROCESS Process); + static VOID MmInsertMemoryArea( PMMSUPPORT AddressSpace, @@ -417,6 +422,26 @@ ULONG Depth = 0; MmVerifyMemoryAreas(AddressSpace); + + /* Build a lame VAD if this is a user-space allocation */ + if ((marea->EndingAddress < MmSystemRangeStart) && (marea->Type != MEMORY_AREA_OWNED_BY_ARM3)) + { + ASSERT(marea->Type == MEMORY_AREA_VIRTUAL_MEMORY || marea->Type == MEMORY_AREA_SECTION_VIEW); + PMMVAD Vad; + Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake'); + ASSERT(Vad); + RtlZeroMemory(Vad, sizeof(MMVAD)); + Vad->StartingVpn = PAGE_ROUND_DOWN(marea->StartingAddress) >> PAGE_SHIFT; + Vad->EndingVpn = PAGE_ROUND_DOWN((ULONG_PTR)marea->EndingAddress - 1) >> PAGE_SHIFT; + Vad->u.VadFlags.Spare = 1; + Vad->u.VadFlags.PrivateMemory = 1; + MiInsertVad(Vad, MmGetAddressSpaceOwner(AddressSpace)); + marea->Vad = Vad; + } + else + { + marea->Vad = NULL; + } if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) { @@ -702,6 +727,10 @@ } } +VOID +NTAPI +MiRemoveNode(IN PMMADDRESS_NODE Node, +IN PMM_AVL_TABLE Table); /** * @name MmFreeMemoryArea @@ -749,12 +778,6 @@ Address < (ULONG_PTR)EndAddress; Address += PAGE_SIZE) { - if (MemoryArea->Type == MEMORY_AREA_IO_MAPPING) - { - MmRawDeleteVirtualMapping((PVOID)Address); - } - else - { BOOLEAN Dirty = FALSE; SWAPENTRY SwapEntry = 0; PFN_NUMBER Page = 0; @@ -772,13 +795,28 @@ FreePage(FreePageContext, MemoryArea, (PVOID)Address, Page, SwapEntry, (BOOLEAN)Dirty); } - } } if (Process != NULL && Process != CurrentProcess) { KeDetachProcess(); + } + + if (MemoryArea->Vad) + { + ASSERT(MemoryArea->EndingAddress < MmSystemRangeStart); + ASSERT(MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY || MemoryArea->Type == MEMORY_AREA_SECTION_VIEW); + + /* MmCleanProcessAddressSpace might have removed it (and this would be MmDeleteProcessAdressSpace) */ + ASSERT(((PMMVAD)MemoryArea->Vad)->u.VadFlags.Spare != 0); + if (((PMMVAD)MemoryArea->Vad)->u.VadFlags.Spare == 1) + { + MiRemoveNode(MemoryArea->Vad, &Process->VadRoot); + } + + ExFreePool(MemoryArea->Vad); + MemoryArea->Vad = NULL; } }

1 0

[sir_richard] 48991: [NTOS]: Add a _64K macro definition so we can stop typing out 65536 all the time.
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 05:01:15 2010 New Revision: 48991 URL: http://svn.reactos.org/svn/reactos?rev=48991&view=rev Log: [NTOS]: Add a _64K macro definition so we can stop typing out 65536 all the time. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Tue Oct 5 05:01:15 2010 @@ -55,6 +55,9 @@ #define _1KB (1024u) #define _1MB (1024 * _1KB) #define _1GB (1024 * _1MB) + +/* Everyone loves 64K */ +#define _64K (64 * _1KB) /* Area mapped by a PDE */ #define PDE_MAPPED_VA (PTE_COUNT * PAGE_SIZE) @@ -248,7 +251,7 @@ // // System views are binned into 64K chunks // -#define MI_SYSTEM_VIEW_BUCKET_SIZE 65536 +#define MI_SYSTEM_VIEW_BUCKET_SIZE _64K // // FIXFIX: These should go in ex.h after the pool merge @@ -1140,6 +1143,23 @@ OUT PMMADDRESS_NODE *Parent ); +NTSTATUS +NTAPI +MiFindEmptyAddressRangeInTree( + IN SIZE_T Length, + IN ULONG_PTR Alignment, + IN PMM_AVL_TABLE Table, + OUT PMMADDRESS_NODE *PreviousVad, + OUT PULONG_PTR Base +); + +VOID +NTAPI +MiInsertVad( + IN PMMVAD Vad, + IN PEPROCESS Process +); + VOID NTAPI MiInsertNode(

1 0

[sir_richard] 48990: [NTOS]: Use the Spare flag in the VAD as a ReactOS/MemoryArea specific flag to signify that this VAD is associated with a MEMORY_AREA and should be unlinked at process exit, bu...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 05:00:19 2010 New Revision: 48990 URL: http://svn.reactos.org/svn/reactos?rev=48990&view=rev Log: [NTOS]: Use the Spare flag in the VAD as a ReactOS/MemoryArea specific flag to signify that this VAD is associated with a MEMORY_AREA and should be unlinked at process exit, but not freed. This is because MemoryAreas themselves are cleaned up later, and in the future their associated VADs (not yet in Trunk) will also be parsed. In the process death scenario, those VADs will be freed, but not unlinked (since it would already have been unlinked). 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] Tue Oct 5 05:00:19 2010 @@ -125,7 +125,7 @@ /* Build the rest of the VAD now */ Vad->StartingVpn = (*Base) >> PAGE_SHIFT; - Vad->EndingVpn = ((*Base) + Size - 1) >> PAGE_SHIFT; + Vad->EndingVpn = ((*Base) + Size - 1) >> PAGE_SHIFT; Vad->u3.Secured.StartVpn = *Base; Vad->u3.Secured.EndVpn = (Vad->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1); Vad->u1.Parent = NULL; @@ -1195,6 +1195,14 @@ /* Release the working set */ MiUnlockProcessWorkingSet(Process, Thread); + /* Skip ARM3 fake VADs, they'll be freed by MmDeleteProcessAddresSpace */ + if (Vad->u.VadFlags.Spare == 1) + { + /* Set a flag so MmDeleteMemoryArea knows to free, but not to remove */ + Vad->u.VadFlags.Spare = 2; + continue; + } + /* Free the VAD memory */ ExFreePool(Vad); }

1 0

[sir_richard] 48989: [NTOS]: Nobody uses MEMORY_AREA_SYSTEM anymore, call these MEMORY_AREA_OWNED_BY_ARM3 for now. We'll have to sync this code with x86 later anyway.
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 04:58:26 2010 New Revision: 48989 URL: http://svn.reactos.org/svn/reactos?rev=48989&view=rev Log: [NTOS]: Nobody uses MEMORY_AREA_SYSTEM anymore, call these MEMORY_AREA_OWNED_BY_ARM3 for now. We'll have to sync this code with x86 later anyway. 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] Tue Oct 5 04:58:26 2010 @@ -870,7 +870,7 @@ BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PTE_BASE; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, + MEMORY_AREA_OWNED_BY_ARM3, &BaseAddress, 0x1000000, PAGE_READWRITE, @@ -885,7 +885,7 @@ // BaseAddress = (PVOID)PDE_BASE; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, + MEMORY_AREA_OWNED_BY_ARM3, &BaseAddress, 0x100000, PAGE_READWRITE, @@ -900,7 +900,7 @@ // BaseAddress = (PVOID)HYPER_SPACE; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, + MEMORY_AREA_OWNED_BY_ARM3, &BaseAddress, PAGE_SIZE, PAGE_READWRITE,

1 0

[sir_richard] 48988: [NTOS]: Nobody actually writes TRUE for WriteCopyView in the MEMORY_AREA data structure, so this field is useless (always false). Remove all instances of its use.
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 04:57:32 2010 New Revision: 48988 URL: http://svn.reactos.org/svn/reactos?rev=48988&view=rev Log: [NTOS]: Nobody actually writes TRUE for WriteCopyView in the MEMORY_AREA data structure, so this field is useless (always false). Remove all instances of its use. Modified: trunk/reactos/ntoskrnl/mm/section.c 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] Tue Oct 5 04:57:32 2010 @@ -839,7 +839,7 @@ /* * Check if this page needs to be mapped COW */ - if ((Segment->WriteCopy || MemoryArea->Data.SectionData.WriteCopyView) && + if ((Segment->WriteCopy) && (Region->Protect == PAGE_READWRITE || Region->Protect == PAGE_EXECUTE_READWRITE)) { @@ -1331,7 +1331,7 @@ /* * Check if we are doing COW */ - if (!((Segment->WriteCopy || MemoryArea->Data.SectionData.WriteCopyView) && + if (!((Segment->WriteCopy) && (Region->Protect == PAGE_READWRITE || Region->Protect == PAGE_EXECUTE_READWRITE))) { @@ -2015,7 +2015,7 @@ MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); Segment = MemoryArea->Data.SectionData.Segment; - if ((Segment->WriteCopy || MemoryArea->Data.SectionData.WriteCopyView) && + if ((Segment->WriteCopy) && (NewProtect == PAGE_READWRITE || NewProtect == PAGE_EXECUTE_READWRITE)) { DoCOW = TRUE; @@ -3518,7 +3518,6 @@ MArea->Data.SectionData.Segment = Segment; MArea->Data.SectionData.Section = Section; MArea->Data.SectionData.ViewOffset = ViewOffset; - MArea->Data.SectionData.WriteCopyView = FALSE; MmInitializeRegion(&MArea->Data.SectionData.RegionListHead, ViewSize, 0, Protect);

1 0

[sir_richard] 48987: [NTOS]: We don't support SEC_BASED for ARM3 sectios either, ASSERT that.
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 04:56:04 2010 New Revision: 48987 URL: http://svn.reactos.org/svn/reactos?rev=48987&view=rev Log: [NTOS]: We don't support SEC_BASED for ARM3 sectios either, ASSERT that. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Oct 5 04:56:04 2010 @@ -592,6 +592,7 @@ ASSERT(FileHandle == NULL); ASSERT(FileObject == NULL); ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); + ASSERT((AllocationAttributes & SEC_BASED) == 0); /* Make the same sanity checks that the Nt interface should've validated */ ASSERT((AllocationAttributes & ~(SEC_COMMIT | SEC_RESERVE | SEC_BASED |

1 0

[sir_richard] 48986: [NTOS]: Nobody reads/checks for MEMORY_AREA_CACHE_SEGMENT. Might as well just call this zero (no logical change).
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 04:53:32 2010 New Revision: 48986 URL: http://svn.reactos.org/svn/reactos?rev=48986&view=rev Log: [NTOS]: Nobody reads/checks for MEMORY_AREA_CACHE_SEGMENT. Might as well just call this zero (no logical change). Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=489… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Tue Oct 5 04:53:32 2010 @@ -685,7 +685,7 @@ MmLockAddressSpace(MmGetKernelAddressSpace()); current->BaseAddress = NULL; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_CACHE_SEGMENT, + 0, // nothing checks for cache_segment mareas, so set to 0 &current->BaseAddress, Bcb->CacheSegmentSize, PAGE_READWRITE,

1 0

← Newer
1
...
37
38
39
40
41
42
43
44
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 October 2010