Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[cgutman] 56052: [NTOSKRNL] - Assert that the PFN lock is held during MmReferencePage - Assert that the PFN lock is not held during MmFreeMemoryArea
by cgutman＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: cgutman Date: Mon Mar 5 19:54:00 2012 New Revision: 56052 URL: http://svn.reactos.org/svn/reactos?rev=56052&view=rev Log: [NTOSKRNL] - Assert that the PFN lock is held during MmReferencePage - Assert that the PFN lock is not held during MmFreeMemoryArea Modified: trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/marea.c 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] Mon Mar 5 19:54:00 2012 @@ -493,10 +493,9 @@ DPRINT("MmReferencePage(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); - if (Pfn == 0 || Pfn > MmHighestPhysicalPage) - { - return; - } + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + ASSERT(Pfn != 0); + ASSERT(Pfn <= MmHighestPhysicalPage); Page = MiGetPfnEntry(Pfn); ASSERT(Page); Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=56… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Mon Mar 5 19:54:00 2012 @@ -747,6 +747,7 @@ } #if (_MI_PAGING_LEVELS == 2) /* Remove page table reference */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); if((SwapEntry || Page) && ((PVOID)Address < MmSystemRangeStart)) { ASSERT(AddressSpace != MmGetKernelAddressSpace());

1 0

[cgutman] 56051: [NEWCC] - Check that the memory area is not being deleted before using it
by cgutman＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: cgutman Date: Mon Mar 5 19:48:24 2012 New Revision: 56051 URL: http://svn.reactos.org/svn/reactos?rev=56051&view=rev Log: [NEWCC] - Check that the memory area is not being deleted before using it Modified: trunk/reactos/ntoskrnl/cache/section/data.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Mon Mar 5 19:48:24 2012 @@ -113,7 +113,7 @@ MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); MmUnlockAddressSpace(AddressSpace); - if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) + if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW || MemoryArea->DeleteInProgress) { return STATUS_NOT_MAPPED_DATA; } @@ -188,7 +188,7 @@ MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); - if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_CACHE) + if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_CACHE || MemoryArea->DeleteInProgress) { MmUnlockAddressSpace(AddressSpace); DPRINT("STATUS_NOT_MAPPED_DATA\n"); @@ -698,7 +698,7 @@ PMM_SECTION_SEGMENT Segment; MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); - if (MemoryArea == NULL) + if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { ASSERT(MemoryArea); return(STATUS_UNSUCCESSFUL);

1 0

[cgutman] 56050: [NTOSKRNL] - Fix incorrect placement of the PDE freeing code which caused a deadlock to occur if a low memory condition was indicated by ARM3
by cgutman＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: cgutman Date: Mon Mar 5 19:40:44 2012 New Revision: 56050 URL: http://svn.reactos.org/svn/reactos?rev=56050&view=rev Log: [NTOSKRNL] - Fix incorrect placement of the PDE freeing code which caused a deadlock to occur if a low memory condition was indicated by ARM3 Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Mon Mar 5 19:40:44 2012 @@ -245,33 +245,6 @@ NTAPI MmRebalanceMemoryConsumers(VOID) { -#if (_MI_PAGING_LEVELS == 2) - if(!MiIsBalancerThread()) - { - /* Clean up the unused PDEs */ - ULONG_PTR Address; - PEPROCESS Process = PsGetCurrentProcess(); - - /* Acquire PFN lock */ - KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - PMMPDE pointerPde; - for(Address = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS; - Address < (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; - Address += (PAGE_SIZE * PTE_COUNT)) - { - if(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0) - { - pointerPde = MiAddressToPde(Address); - if(pointerPde->u.Hard.Valid) - MiDeletePte(pointerPde, MiPdeToPte(pointerPde), Process, NULL); - ASSERT(pointerPde->u.Hard.Valid == 0); - } - } - /* Release lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } -#endif - if (MiBalancerThreadHandle != NULL && !MiIsBalancerThread()) { @@ -405,8 +378,34 @@ if (Status == STATUS_WAIT_0 || Status == STATUS_WAIT_1) { - ULONG InitialTarget = 0; - + ULONG InitialTarget = 0; + +#if (_MI_PAGING_LEVELS == 2) + if(!MiIsBalancerThread()) + { + /* Clean up the unused PDEs */ + ULONG_PTR Address; + PEPROCESS Process = PsGetCurrentProcess(); + + /* Acquire PFN lock */ + KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + PMMPDE pointerPde; + for(Address = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS; + Address < (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; + Address += (PAGE_SIZE * PTE_COUNT)) + { + if(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0) + { + pointerPde = MiAddressToPde(Address); + if(pointerPde->u.Hard.Valid) + MiDeletePte(pointerPde, MiPdeToPte(pointerPde), Process, NULL); + ASSERT(pointerPde->u.Hard.Valid == 0); + } + } + /* Release lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } +#endif do { ULONG OldTarget = InitialTarget;

1 0

[cgutman] 56049: [NEWCC] - Hold the PFN lock when referencing pages
by cgutman＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: cgutman Date: Mon Mar 5 19:29:39 2012 New Revision: 56049 URL: http://svn.reactos.org/svn/reactos?rev=56049&view=rev Log: [NEWCC] - Hold the PFN lock when referencing pages Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Mon Mar 5 19:29:39 2012 @@ -104,8 +104,12 @@ PMEMORY_AREA MemoryArea; PMM_SECTION_SEGMENT Segment; LARGE_INTEGER FileOffset = *FileOffsetPtr, End, FirstMapped; + KIRQL OldIrql; + DPRINT("MiZeroFillSection(Address %x,Offset %x,Length %x)\n", Address, FileOffset.LowPart, Length); + AddressSpace = MmGetKernelAddressSpace(); + MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); MmUnlockAddressSpace(AddressSpace); @@ -140,7 +144,10 @@ MmSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_PFN_SSE(Page)); Address = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmReferencePage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MmCreateVirtualMapping(NULL, Address, PAGE_READWRITE, &Page, 1); MmInsertRmap(Page, NULL, Address); } @@ -175,6 +182,7 @@ LARGE_INTEGER FileOffset; PFN_NUMBER Page; PPFN_NUMBER Pages; + KIRQL OldIrql; DPRINT("MiFlushMappedSection(%x,%08x,%x,%d,%s:%d)\n", BaseAddress, BaseOffset->LowPart, FileSize, WriteData, File, Line); @@ -222,7 +230,9 @@ (MmIsDirtyPageRmap(Page) || IS_DIRTY_SSE(Entry)) && FileOffset.QuadPart < FileSize->QuadPart) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmReferencePage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); Pages[(PageAddress - BeginningAddress) >> PAGE_SHIFT] = Entry; } else Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Mon Mar 5 19:29:39 2012 @@ -73,6 +73,7 @@ ULONG Entry; ULONG Attributes; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + KIRQL OldIrql; DPRINT("Not Present: %p %p (%p-%p)\n", AddressSpace, Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); @@ -175,7 +176,9 @@ KeBugCheck(CACHE_MANAGER); } + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmReferencePage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); Status = MmCreateVirtualMapping(Process, Address, Attributes, &Page, 1); if (NT_SUCCESS(Status))

1 0

[jgardou] 56048: [CABINET] - Really use random temporary file name
by jgardou＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: jgardou Date: Mon Mar 5 19:18:19 2012 New Revision: 56048 URL: http://svn.reactos.org/svn/reactos?rev=56048&view=rev Log: [CABINET] - Really use random temporary file name Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Mon Mar 5 19:18:19 2012 @@ -115,7 +115,7 @@ } -ULONG CCFDATAStorage::Create(const char* FileName) +ULONG CCFDATAStorage::Create() /* * FUNCTION: Creates the file * ARGUMENTS: @@ -124,13 +124,16 @@ * Status of operation */ { +#if defined(_WIN32) + char tmpPath[MAX_PATH]; +#endif ASSERT(!FileCreated); #if defined(_WIN32) - if (GetTempPath(MAX_PATH, FullName) == 0) + if (GetTempPath(MAX_PATH, tmpPath) == 0) return CAB_STATUS_CANNOT_CREATE; - - strcat(FullName, FileName); + if(GetTempFileName(tmpPath, "cab", 0, FullName) == 0) + return CAB_STATUS_CANNOT_CREATE; /* Create file, overwrite if it already exists */ FileHandle = CreateFile(FullName, // Create this file @@ -1529,7 +1532,7 @@ return CAB_STATUS_NOMEMORY; } - Status = ScratchFile->Create("~CAB.tmp"); + Status = ScratchFile->Create(); CreateNewFolder = false;

1 0

[cgutman] 56047: [NEWCC] - Don't allow a locked page to be paged out
by cgutman＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: cgutman Date: Mon Mar 5 19:15:15 2012 New Revision: 56047 URL: http://svn.reactos.org/svn/reactos?rev=56047&view=rev Log: [NEWCC] - Don't allow a locked page to be paged out Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Mon Mar 5 19:15:15 2012 @@ -113,6 +113,13 @@ BOOLEAN WriteZero = FALSE, WritePage = FALSE; SWAPENTRY Swap = MmGetSavedSwapEntryPage(Page); + /* Bail early if the reference count isn't where we need it */ + if (MmGetReferenceCountPage(Page) != 1) + { + DPRINT1("Cannot page out locked page %x with ref count %d\n", Page, MmGetReferenceCountPage(Page)); + return STATUS_UNSUCCESSFUL; + } + MmLockSectionSegment(Segment); (void)InterlockedIncrementUL(&Segment->ReferenceCount); @@ -158,9 +165,6 @@ { DPRINT("Removing page %x for real\n", Page); MmSetSavedSwapEntryPage(Page, 0); - if (MmGetReferenceCountPage(Page) != 1) { - DPRINT1("ALERT: Page %x about to be evicted with ref count %d\n", Page, MmGetReferenceCountPage(Page)); - } MmReleasePageMemoryConsumer(MC_CACHE, Page); }

1 0

[rharabien] 56046: [HIDPARSER] - Fix scan-codes for PrintScreen and PauseBreak
by rharabien＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: rharabien Date: Mon Mar 5 19:07:01 2012 New Revision: 56046 URL: http://svn.reactos.org/svn/reactos?rev=56046&view=rev Log: [HIDPARSER] - Fix scan-codes for PrintScreen and PauseBreak Modified: trunk/reactos/lib/drivers/hidparser/api.c Modified: trunk/reactos/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/api.… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] Mon Mar 5 19:07:01 2012 @@ -17,7 +17,7 @@ /* 1 */ 0x0032, 0x0031, 0x0018, 0x0019, 0x0010, 0x0013, 0x001f, 0x0014, 0x0016, 0x002f, 0x0011, 0x002d, 0x0015, 0x002c, 0x0002, 0x0003, /* 2 */ 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x001c, 0x0001, 0x000e, 0x000f, 0x0039, 0x000c, 0x000d, 0x001a, /* 3 */ 0x001b, 0x002b, 0x002b, 0x0027, 0x0028, 0x0029, 0x0033, 0x0034, 0x0035, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, -/* 4 */ 0x0041, 0x0042, 0x0043, 0x0044, 0x0057, 0x0058, 0x0063, 0x0046, 0x0077, 0xE052, 0xE047, 0xE049, 0xE053, 0xE04F, 0xE051, 0xE04D, +/* 4 */ 0x0041, 0x0042, 0x0043, 0x0044, 0x0057, 0x0058, 0xE037, 0x0046, 0x0045, 0xE052, 0xE047, 0xE049, 0xE053, 0xE04F, 0xE051, 0xE04D, /* 5 */ 0xE04B, 0xE050, 0xE048, 0x0045, 0xE035, 0x0037, 0x004a, 0x004e, 0xE01C, 0x004f, 0x0050, 0x0051, 0x004b, 0x004c, 0x004d, 0x0047, /* 6 */ 0x0048, 0x0049, 0x0052, 0x0053, 0x0056, 0xE05D, 0xE05E, 0x0075, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, /* 7 */ 0x00bf, 0x00c0, 0x00c1, 0x00c2, 0x0086, 0x008a, 0x0082, 0x0084, 0x0080, 0x0081, 0x0083, 0x0089, 0x0085, 0x0087, 0x0088, 0x0071, @@ -723,6 +723,8 @@ IN PVOID InsertCodesContext) { ULONG ScanCode; + CHAR FakeShift[] = {0xE0, 0x2A, 0x00}; + CHAR FakeCtrl[] = {0xE1, 0x1D, 0x00}; // // get scan code @@ -737,7 +739,7 @@ return HIDPARSER_STATUS_I8042_TRANS_UNKNOWN; } - if ((ScanCode & 0xE000) == 0xE000) + if (ScanCode & 0xFF00) { // // swap scan code @@ -745,11 +747,29 @@ ScanCode = NTOHS(ScanCode); } + if (Usage == 0x46 && KeyAction == HidP_Keyboard_Make) + { + // Print Screen generates additional FakeShift + HidParser_DispatchKey(FakeShift, KeyAction, InsertCodesProcedure, InsertCodesContext); + } + + if (Usage == 0x48) + { + // Pause/Break generates additional FakeCtrl. Note: it's always before key press/release. + HidParser_DispatchKey(FakeCtrl, KeyAction, InsertCodesProcedure, InsertCodesContext); + } + // // FIXME: translate modifier states // HidParser_DispatchKey((PCHAR)&ScanCode, KeyAction, InsertCodesProcedure, InsertCodesContext); + if (Usage == 0x46 && KeyAction == HidP_Keyboard_Break) + { + // Print Screen generates additional FakeShift + HidParser_DispatchKey(FakeShift, KeyAction, InsertCodesProcedure, InsertCodesContext); + } + // // done //

1 0

[jgardou] 56045: [CABINET] - always close the cabinet after being done, even of case of failure.
by jgardou＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: jgardou Date: Mon Mar 5 18:51:05 2012 New Revision: 56045 URL: http://svn.reactos.org/svn/reactos?rev=56045&view=rev Log: [CABINET] - always close the cabinet after being done, even of case of failure. Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Mon Mar 5 18:51:05 2012 @@ -2105,7 +2105,7 @@ if (Status != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot create cabinet (%u).\n", (UINT)Status)); - goto cleanup; + goto cleanup2; } // Add each file in the criteria list @@ -2217,10 +2217,11 @@ goto cleanup; } +cleanup: CloseCabinet(); bRet = true; -cleanup: +cleanup2: DestroySearchCriteria(); return bRet; }

1 0

[cgutman] 56044: [NEWCC] - Revert 56043
by cgutman＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: cgutman Date: Mon Mar 5 18:50:12 2012 New Revision: 56044 URL: http://svn.reactos.org/svn/reactos?rev=56044&view=rev Log: [NEWCC] - Revert 56043 Modified: trunk/reactos/ntoskrnl/CMakeLists.txt Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Mar 5 18:50:12 2012 @@ -18,7 +18,9 @@ set_rc_compiler() -set(NEWCC TRUE) +if(NOT DEFINED NEWCC) + set(NEWCC FALSE) +endif(NOT DEFINED NEWCC) if(NEWCC) add_definitions(-DNEWCC)

1 0

[cgutman] 56043: [NEWCC] - Turn NewCC on temporarily for some testing - Patchbot is broken so I had to do it this way :(
by cgutman＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: cgutman Date: Mon Mar 5 18:42:40 2012 New Revision: 56043 URL: http://svn.reactos.org/svn/reactos?rev=56043&view=rev Log: [NEWCC] - Turn NewCC on temporarily for some testing - Patchbot is broken so I had to do it this way :( Modified: trunk/reactos/ntoskrnl/CMakeLists.txt Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Mar 5 18:42:40 2012 @@ -18,9 +18,7 @@ set_rc_compiler() -if(NOT DEFINED NEWCC) - set(NEWCC FALSE) -endif(NOT DEFINED NEWCC) +set(NEWCC TRUE) if(NEWCC) add_definitions(-DNEWCC)

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
36
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 March 2012