Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[jimtabor] 48930: [Win32k] - Return the correct complexity, pass all user32 wine test_winregion tests.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Sep 29 05:23:15 2010 New Revision: 48930 URL: http://svn.reactos.org/svn/reactos?rev=48930&view=rev Log: [Win32k] - Return the correct complexity, pass all user32 wine test_winregion tests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Sep 29 05:23:15 2010 @@ -4225,7 +4225,7 @@ if((pRgn = RGNOBJAPI_Lock(hRgn, NULL))) { - Ret = pRgn->rdh.iType; + Ret = REGION_Complexity(pRgn); RGNOBJAPI_Unlock(pRgn); } else @@ -4264,7 +4264,7 @@ if((pRgn = RGNOBJAPI_Lock(VisRgn, NULL))) { - Ret = pRgn->rdh.iType; + Ret = REGION_Complexity(pRgn); *Rect = pRgn->rdh.rcBound; RGNOBJAPI_Unlock(pRgn); }

14 years

[jimtabor] 48929: [Win32k] - Fix future wine sync user32 win test for get process default layout with null parameter.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Sep 29 02:29:33 2010 New Revision: 48929 URL: http://svn.reactos.org/svn/reactos?rev=48929&view=rev Log: [Win32k] - Fix future wine sync user32 win test for get process default layout with null parameter. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Sep 29 02:29:33 2010 @@ -347,6 +347,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + SetLastNtError(_SEH2_GetExceptionCode()); Ret = FALSE; } _SEH2_END;

14 years

[cgutman] 48928: [ACPI] - Fix ACPI warnings - Based on a patch by Love Nystrom

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Sep 29 02:16:18 2010 New Revision: 48928 URL: http://svn.reactos.org/svn/reactos?rev=48928&view=rev Log: [ACPI] - Fix ACPI warnings - Based on a patch by Love Nystrom Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/bus/acpi/busmgr/utils.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Wed Sep 29 02:16:18 2010 @@ -1298,7 +1298,7 @@ * ---- * Fix for the system root bus device -- the only root-level device. */ - if ((parent == ACPI_ROOT_OBJECT) && (type == ACPI_BUS_TYPE_DEVICE)) { + if (((ACPI_HANDLE)parent == ACPI_ROOT_OBJECT) && (type == ACPI_BUS_TYPE_DEVICE)) { hid = ACPI_BUS_HID; sprintf(device->pnp.device_name, "%s", ACPI_BUS_DEVICE_NAME); sprintf(device->pnp.device_class, "%s", ACPI_BUS_CLASS); Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Wed Sep 29 02:16:18 2010 @@ -61,7 +61,7 @@ static int acpi_power_add (struct acpi_device *device); static int acpi_power_remove (struct acpi_device *device, int type); -static int acpi_power_resume(struct acpi_device *device); +static int acpi_power_resume(struct acpi_device *device, int state); static struct acpi_driver acpi_power_driver = { .name = ACPI_POWER_DRIVER_NAME, @@ -128,7 +128,7 @@ int *state) { ACPI_STATUS status = AE_OK; - unsigned long sta = 0; + unsigned long long sta = 0; char node_name[5]; ACPI_BUFFER buffer = { sizeof(node_name), node_name }; @@ -632,9 +632,9 @@ return_VALUE(0); } -static int acpi_power_resume(struct acpi_device *device) -{ - int result = 0, state; +static int acpi_power_resume(struct acpi_device *device, int state) +{ + int result = 0; struct acpi_power_resource *resource = NULL; struct acpi_power_reference *ref; Modified: trunk/reactos/drivers/bus/acpi/busmgr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] Wed Sep 29 02:16:18 2010 @@ -166,7 +166,7 @@ } head = buffer->Pointer; - tail = buffer->Pointer + tail_offset; + tail = ((PUCHAR)buffer->Pointer) + tail_offset; /* * Extract package data.

14 years

[sir_richard] 48927: [NTOS]: Add MiRemoveZeroPageSafe helper function, when a zero page is required, but the inline zeroing of MiRemoveZeroPage is not. This function will only try grabbing a zero p...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Sep 29 01:10:28 2010 New Revision: 48927 URL: http://svn.reactos.org/svn/reactos?rev=48927&view=rev Log: [NTOS]: Add MiRemoveZeroPageSafe helper function, when a zero page is required, but the inline zeroing of MiRemoveZeroPage is not. This function will only try grabbing a zero page if one exists, otherwise a free page will be grabbed and zeroed with custom code of the caller's choosing. [NTOS]: Add concept of process color and system color. Compute correct color to use whenever requesting a page. [NTOS]: Uncondtionally enable the color code when inserting/removing pages. For now, when requesting a page, colors are still ignored, and the global PFN lists are scanned instead. If there are no regressions, we are one patch away from that. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c trunk/reactos/ntoskrnl/mm/freelist.c 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] Wed Sep 29 01:10:28 2010 @@ -217,6 +217,13 @@ // Special IRQL value (found in assertions) // #define MM_NOIRQL (KIRQL)0xFFFFFFFF + +// +// Returns the color of a page +// +#define MI_GET_PAGE_COLOR(x) ((x) & MmSecondaryColorMask) +#define MI_GET_NEXT_COLOR(x) (MI_GET_PAGE_COLOR(++MmSystemPageColor)) +#define MI_GET_NEXT_PROCESS_COLOR(x) (MI_GET_PAGE_COLOR(++(x)->NextPageColor)) // // FIXFIX: These should go in ex.h after the pool merge @@ -455,9 +462,8 @@ extern LIST_ENTRY MmProcessList; extern BOOLEAN MmZeroingPageThreadActive; extern KEVENT MmZeroingPageEvent; - -#define MI_PFN_TO_PFNENTRY(x) (&MmPfnDatabase[1][x]) -#define MI_PFNENTRY_TO_PFN(x) (x - MmPfnDatabase[1]) +extern ULONG MmSystemPageColor; +extern ULONG MmProcessColorSeed; // // Figures out the hardware bits for a PTE @@ -1093,4 +1099,19 @@ IN PMMADDRESS_NODE Node ); +// +// MiRemoveZeroPage will use inline code to zero out the page manually if only +// free pages are available. In some scenarios, we don't/can't run that piece of +// code and would rather only have a real zero page. If we can't have a zero page, +// then we'd like to have our own code to grab a free page and zero it out, by +// using MiRemoveAnyPage. This macro implements this. +// +PFN_NUMBER +FORCEINLINE +MiRemoveZeroPageSafe(IN ULONG Color) +{ + if (MmFreePagesByColor[ZeroedPageList][Color].Flink != LIST_HEAD) return MiRemoveZeroPage(Color); + return 0; +} + /* EOF */ 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] Wed Sep 29 01:10:28 2010 @@ -179,9 +179,10 @@ IN PEPROCESS Process, IN KIRQL OldIrql) { - PFN_NUMBER PageFrameNumber; + PFN_NUMBER PageFrameNumber = 0; MMPTE TempPte; BOOLEAN NeedZero = FALSE; + ULONG Color; DPRINT("ARM3 Demand Zero Page Fault Handler for address: %p in process: %p\n", Address, Process); @@ -196,9 +197,17 @@ /* No forking yet */ ASSERT(Process->ForkInProgress == NULL); + /* Get process color */ + Color = MI_GET_NEXT_PROCESS_COLOR(Process); + /* We'll need a zero page */ NeedZero = TRUE; } + else + { + /* Get the next system page color */ + Color = MI_GET_NEXT_COLOR(); + } // // Lock the PFN database @@ -206,9 +215,21 @@ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); ASSERT(PointerPte->u.Hard.Valid == 0); - /* Get a page */ - PageFrameNumber = MiRemoveAnyPage(0); - DPRINT("New pool page: %lx\n", PageFrameNumber); + /* Do we need a zero page? */ + if (NeedZero) + { + /* Try to get one, if we couldn't grab a free page and zero it */ + PageFrameNumber = MiRemoveZeroPageSafe(Color); + if (PageFrameNumber) NeedZero = FALSE; + } + + /* Did we get a page? */ + if (!PageFrameNumber) + { + /* We either failed to find a zero page, or this is a system request */ + PageFrameNumber = MiRemoveAnyPage(Color); + DPRINT("New pool page: %lx\n", PageFrameNumber); + } /* Initialize it */ MiInitializePfn(PageFrameNumber, PointerPte, TRUE); @@ -463,6 +484,7 @@ ULONG ProtectionCode; PMMVAD Vad; PFN_NUMBER PageFrameIndex; + ULONG Color; DPRINT("ARM3 FAULT AT: %p\n", Address); // @@ -756,19 +778,25 @@ /* Lock the PFN database since we're going to grab a page */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* Grab a page out of there. Later we should grab a colored zero page */ - PageFrameIndex = MiRemoveAnyPage(0); - ASSERT(PageFrameIndex); - - /* Release the lock since we need to do some zeroing */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - /* Zero out the page, since it's for user-mode */ - MiZeroPfn(PageFrameIndex); - - /* Grab the lock again so we can initialize the PFN entry */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Try to get a zero page */ + Color = MI_GET_NEXT_PROCESS_COLOR(CurrentProcess); + PageFrameIndex = MiRemoveZeroPageSafe(Color); + if (!PageFrameIndex) + { + /* Grab a page out of there. Later we should grab a colored zero page */ + PageFrameIndex = MiRemoveAnyPage(Color); + ASSERT(PageFrameIndex); + + /* Release the lock since we need to do some zeroing */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Zero out the page, since it's for user-mode */ + MiZeroPfn(PageFrameIndex); + + /* Grab the lock again so we can initialize the PFN entry */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + } /* Initialize the PFN entry now */ MiInitializePfn(PageFrameIndex, PointerPte, 1); Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Wed Sep 29 01:10:28 2010 @@ -30,12 +30,11 @@ #define ASSERT_LIST_INVARIANT(x) #endif -#define ARM3_COLORS 1 - /* GLOBALS ********************************************************************/ BOOLEAN MmDynamicPfn; BOOLEAN MmMirroring; +ULONG MmSystemPageColor; MMPFNLIST MmZeroedPageListHead = {0, ZeroedPageList, LIST_HEAD, LIST_HEAD}; MMPFNLIST MmFreePageListHead = {0, FreePageList, LIST_HEAD, LIST_HEAD}; @@ -80,11 +79,9 @@ PFN_NUMBER OldFlink, OldBlink; PMMPFNLIST ListHead; MMLISTS ListName; -#ifdef ARM3_COLORS ULONG Color; PMMCOLOR_TABLES ColorTable; PMMPFN Pfn1; -#endif /* Make sure the PFN lock is held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -131,7 +128,7 @@ /* Set the list head's backlink instead */ ListHead->Flink = OldFlink; } -#ifdef ARM3_COLORS + /* Get the page color */ OldBlink = MiGetPfnEntryIndex(Entry); Color = OldBlink & MmSecondaryColorMask; @@ -185,7 +182,7 @@ /* ReactOS Hack */ Entry->OriginalPte.u.Long = 0; -#endif + /* We are not on a list anymore */ Entry->u1.Flink = Entry->u2.Blink = 0; ASSERT_LIST_INVARIANT(ListHead); @@ -219,9 +216,8 @@ MMLISTS ListName; PFN_NUMBER OldFlink, OldBlink; ULONG OldColor, OldCache; -#ifdef ARM3_COLORS PMMCOLOR_TABLES ColorTable; -#endif + /* Make sure PFN lock is held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(Color < MmSecondaryColors); @@ -280,7 +276,7 @@ Pfn1->u3.e2.ShortFlags = 0; Pfn1->u3.e1.PageColor = OldColor; Pfn1->u3.e1.CacheAttribute = OldCache; -#ifdef ARM3_COLORS + /* Get the first page on the color list */ ASSERT(Color < MmSecondaryColors); ColorTable = &MmFreePagesByColor[ListName][Color]; @@ -306,7 +302,7 @@ /* ReactOS Hack */ Pfn1->OriginalPte.u.Long = 0; -#endif + /* See if we hit any thresholds */ if (MmAvailablePages == MmHighMemoryThreshold) { @@ -340,9 +336,8 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(MmAvailablePages != 0); ASSERT(Color < MmSecondaryColors); - +#if 0 /* Check the colored free list */ -#if 0 // Enable when using ARM3 database */ PageIndex = MmFreePagesByColor[FreePageList][Color].Flink; if (PageIndex == LIST_HEAD) { @@ -368,11 +363,10 @@ ASSERT(MmZeroedPageListHead.Total == 0); } } -#if 0 // Enable when using ARM3 database */ +#if 0 } } #endif - /* Remove the page from its list */ PageIndex = MiRemovePageByColor(PageIndex, Color); @@ -403,7 +397,7 @@ ASSERT(Color < MmSecondaryColors); /* Check the colored zero list */ -#if 0 // Enable when using ARM3 database */ +#if 0 PageIndex = MmFreePagesByColor[ZeroedPageList][Color].Flink; if (PageIndex == LIST_HEAD) { @@ -414,9 +408,10 @@ Color = PageIndex & MmSecondaryColorMask; if (PageIndex == LIST_HEAD) { + /* This means there's no zero pages, we have to look for free ones */ ASSERT(MmZeroedPageListHead.Total == 0); Zero = TRUE; -#if 0 // Enable when using ARM3 database */ +#if 0 /* Check the colored free list */ PageIndex = MmFreePagesByColor[ZeroedPageList][Color].Flink; if (PageIndex == LIST_HEAD) @@ -432,13 +427,14 @@ /* FIXME: Should check the standby list */ ASSERT(MmZeroedPageListHead.Total == 0); } -#if 0 // Enable when using ARM3 database */ +#if 0 } #endif } -#if 0 // Enable when using ARM3 database */ +#if 0 } #endif + /* Sanity checks */ Pfn1 = MiGetPfnEntry(PageIndex); ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) || @@ -468,11 +464,10 @@ PMMPFNLIST ListHead; PFN_NUMBER LastPage; PMMPFN Pfn1; -#ifdef ARM3_COLORS ULONG Color; PMMPFN Blink; PMMCOLOR_TABLES ColorTable; -#endif + /* Make sure the page index is valid */ ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); ASSERT((PageFrameIndex != 0) && @@ -537,7 +532,7 @@ /* Otherwise check if we reached the high threshold and signal the event */ KeSetEvent(MiHighMemoryEvent, 0, FALSE); } -#ifdef ARM3_COLORS + /* Get the page color */ Color = PageFrameIndex & MmSecondaryColorMask; @@ -571,7 +566,7 @@ /* And increase the count in the colored list */ ColorTable->Count++; -#endif + /* Notify zero page thread if enough pages are on the free list now */ if ((ListHead->Total >= 8) && !(MmZeroingPageThreadActive)) { @@ -590,10 +585,9 @@ PFN_NUMBER Flink; PMMPFN Pfn1, Pfn2; MMLISTS ListName; -#ifdef ARM3_COLORS PMMCOLOR_TABLES ColorHead; ULONG Color; -#endif + /* For free pages, use MiInsertPageInFreeList */ ASSERT(ListHead != &MmFreePageListHead); @@ -657,7 +651,7 @@ KeSetEvent(MiHighMemoryEvent, 0, FALSE); } -#ifdef ARM3_COLORS + /* Sanity checks */ ASSERT(ListName == ZeroedPageList); ASSERT(Pfn1->u4.InPageError == 0); @@ -695,7 +689,6 @@ /* One more paged on the colored list */ ColorHead->Count++; -#endif } VOID @@ -783,7 +776,7 @@ /* Grab a page */ ASSERT_LIST_INVARIANT(&MmFreePageListHead); ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); - PageFrameIndex = MiRemoveAnyPage(0); + PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); /* Write the software PTE */ MI_WRITE_INVALID_PTE(PointerPte, TempPte); Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Wed Sep 29 01:10:28 2010 @@ -473,7 +473,7 @@ ASSERT(PointerPte->u.Hard.Valid == 0); /* Request a page */ - PageFrameNumber = MiRemoveAnyPage(0); + PageFrameNumber = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); TempPte.u.Hard.PageFrameNumber = PageFrameNumber; #if (_MI_PAGING_LEVELS >= 3) @@ -768,7 +768,7 @@ do { /* Allocate a page */ - PageFrameNumber = MiRemoveAnyPage(0); + PageFrameNumber = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); /* Get the PFN entry for it and fill it out */ Pfn1 = MiGetPfnEntry(PageFrameNumber); 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] Wed Sep 29 01:10:28 2010 @@ -16,7 +16,9 @@ #define MODULE_INVOLVED_IN_ARM3 #include "../ARM3/miarm.h" -extern MM_SYSTEMSIZE MmSystemSize; +/* GLOBALS ********************************************************************/ + +ULONG MmProcessColorSeed = 0x12345678; /* PRIVATE FUNCTIONS **********************************************************/ @@ -357,7 +359,7 @@ PointerPte++; /* Get a page and write the current invalid PTE */ - PageFrameIndex = MiRemoveAnyPage(0); + PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); MI_WRITE_INVALID_PTE(PointerPte, InvalidPte); /* Initialize the PFN entry for this page */ @@ -444,7 +446,7 @@ while (LimitPte >= NewLimitPte) { /* Get a page and write the current invalid PTE */ - PageFrameIndex = MiRemoveAnyPage(0); + PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); MI_WRITE_INVALID_PTE(LimitPte, InvalidPte); /* Initialize the PFN entry for this page */ @@ -1058,9 +1060,10 @@ MMPTE TempPte, PdePte; ULONG PdeOffset; PMMPTE SystemTable; - - /* No page colors yet */ - Process->NextPageColor = 0; + ULONG Color; + + /* Choose a process color */ + Process->NextPageColor = RtlRandom(&MmProcessColorSeed); /* Setup the hyperspace lock */ KeInitializeSpinLock(&Process->HyperSpaceLock); @@ -1068,16 +1071,37 @@ /* Lock PFN database */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - /* Get a page for the PDE */ - PdeIndex = MiRemoveAnyPage(0); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - MiZeroPhysicalPage(PdeIndex); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* Get a page for hyperspace */ - HyperIndex = MiRemoveAnyPage(0); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - MiZeroPhysicalPage(HyperIndex); + /* Get a zero page for the PDE, if possible */ + Color = MI_GET_NEXT_PROCESS_COLOR(Process); + PdeIndex = MiRemoveZeroPageSafe(Color); + if (!PdeIndex) + { + /* No zero pages, grab a free one */ + PdeIndex = MiRemoveAnyPage(Color); + + /* Zero it outside the PFN lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiZeroPhysicalPage(PdeIndex); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + } + + /* Get a zero page for hyperspace, if possible */ + Color = MI_GET_NEXT_PROCESS_COLOR(Process); + HyperIndex = MiRemoveZeroPageSafe(Color); + if (!HyperIndex) + { + /* No zero pages, grab a free one */ + HyperIndex = MiRemoveAnyPage(Color); + + /* Zero it outside the PFN lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiZeroPhysicalPage(HyperIndex); + } + else + { + /* Release the PFN lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } /* Switch to phase 1 initialization */ ASSERT(Process->AddressSpaceInitialized == 0); @@ -1112,7 +1136,6 @@ /* Copy all the kernel mappings */ PdeOffset = MiGetPdeOffset(MmSystemRangeStart); - RtlCopyMemory(&SystemTable[PdeOffset], MiAddressToPde(MmSystemRangeStart), PAGE_SIZE - PdeOffset * sizeof(MMPTE)); Modified: trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/zeropage.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] Wed Sep 29 01:10:28 2010 @@ -69,8 +69,11 @@ } PageIndex = MmFreePageListHead.Flink; + ASSERT(PageIndex != LIST_HEAD); Pfn1 = MiGetPfnEntry(PageIndex); - FreePage = MiRemoveAnyPage(0); // FIXME: Use real color + FreePage = MiRemoveAnyPage(MI_GET_PAGE_COLOR(PageIndex)); + + /* The first global free page should also be the first on its own list */ if (FreePage != PageIndex) { KeBugCheckEx(PFN_LIST_CORRUPT, 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] Wed Sep 29 01:10:28 2010 @@ -604,11 +604,11 @@ if (Type != MC_SYSTEM) { - PfnOffset = MiRemoveZeroPage(0); + PfnOffset = MiRemoveZeroPage(MI_GET_NEXT_COLOR()); } else { - PfnOffset = MiRemoveAnyPage(0); + PfnOffset = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); } if (!PfnOffset)

14 years

[sir_richard] 48926: [NTOS]: Fix straggling bugs in color table algorithms. [NTOS]: Enable color tables! Right now pages are merely entering and exiting the tables, the tables themselves are never ...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Sep 29 00:13:09 2010 New Revision: 48926 URL: http://svn.reactos.org/svn/reactos?rev=48926&view=rev Log: [NTOS]: Fix straggling bugs in color table algorithms. [NTOS]: Enable color tables! Right now pages are merely entering and exiting the tables, the tables themselves are never used for allocations. This will change with further commits. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c 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] Wed Sep 29 00:13:09 2010 @@ -194,10 +194,24 @@ #define MM_SYSLDR_BOOT_LOADED (PVOID)0xFFFFFFFF #define MM_SYSLDR_SINGLE_ENTRY 0x1 +#if defined(_M_IX86) || defined(_M_ARM) // // PFN List Sentinel // #define LIST_HEAD 0xFFFFFFFF + +// +// Because GCC cannot automatically downcast 0xFFFFFFFF to lesser-width bits, +// we need a manual definition suited to the number of bits in the PteFrame. +// This is used as a LIST_HEAD for the colored list +// +#define COLORED_LIST_HEAD ((1 << 25) - 1) // 0x1FFFFFF +#elif defined(_M_AMD64) +#define LIST_HEAD 0xFFFFFFFFFFFFFFFFLL +#define COLORED_LIST_HEAD ((1 << 57) - 1) // 0x1FFFFFFFFFFFFFFLL +#else +#error Define these please! +#endif // // Special IRQL value (found in assertions) Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Wed Sep 29 00:13:09 2010 @@ -30,6 +30,8 @@ #define ASSERT_LIST_INVARIANT(x) #endif +#define ARM3_COLORS 1 + /* GLOBALS ********************************************************************/ BOOLEAN MmDynamicPfn; @@ -133,11 +135,9 @@ /* Get the page color */ OldBlink = MiGetPfnEntryIndex(Entry); Color = OldBlink & MmSecondaryColorMask; - DPRINT1("Color: %lx\n", Color); /* Get the first page on the color list */ ColorTable = &MmFreePagesByColor[ListName][Color]; - DPRINT1("Color table: %p %lx\n", ColorTable, ColorTable->Flink); /* Check if this was was actually the head */ OldFlink = ColorTable->Flink; @@ -148,7 +148,7 @@ if (ColorTable->Flink != LIST_HEAD) { /* And make the previous link point to the head now */ - MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = -1; + MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; } else { @@ -159,7 +159,7 @@ else { /* This page shouldn't be pointing back to the head */ - ASSERT(Entry->u4.PteFrame != -1); + ASSERT(Entry->u4.PteFrame != COLORED_LIST_HEAD); /* Make the back link point to whoever the next page is */ Pfn1 = MiGetPfnEntry(Entry->u4.PteFrame); @@ -170,7 +170,7 @@ { /* Make the back link point to the head */ Pfn1 = MiGetPfnEntry(Entry->OriginalPte.u.Long); - Pfn1->u4.PteFrame = -1; + Pfn1->u4.PteFrame = Entry->u4.PteFrame; } else { @@ -182,6 +182,9 @@ /* One less colored page */ ASSERT(ColorTable->Count >= 1); ColorTable->Count--; + + /* ReactOS Hack */ + Entry->OriginalPte.u.Long = 0; #endif /* We are not on a list anymore */ Entry->u1.Flink = Entry->u2.Blink = 0; @@ -284,8 +287,6 @@ ASSERT(ColorTable->Count >= 1); /* Set the forward link to whoever we were pointing to */ - DPRINT1("Has RMAP: %lx (link: %lx)\n", Pfn1->u3.e1.ParityError, Pfn1->OriginalPte.u.Long); - DPRINT1("Color table: %p %lx\n", ColorTable, ColorTable->Flink); ColorTable->Flink = Pfn1->OriginalPte.u.Long; /* Get the first page on the color list */ @@ -297,11 +298,14 @@ else { /* The list is empty, so we are the first page */ - MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = -1; + MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; } /* One less page */ ColorTable->Count--; + + /* ReactOS Hack */ + Pfn1->OriginalPte.u.Long = 0; #endif /* See if we hit any thresholds */ if (MmAvailablePages == MmHighMemoryThreshold) @@ -536,16 +540,13 @@ #ifdef ARM3_COLORS /* Get the page color */ Color = PageFrameIndex & MmSecondaryColorMask; - DPRINT1("Color: %lx\n", Color); /* Get the first page on the color list */ ColorTable = &MmFreePagesByColor[FreePageList][Color]; - DPRINT1("Color table: %p %lx\n", ColorTable, ColorTable->Flink); - DPRINT1("Has RMAP: %lx (link: %lx)\n", Pfn1->u3.e1.ParityError, Pfn1->OriginalPte.u.Long); if (ColorTable->Flink == LIST_HEAD) { /* The list is empty, so we are the first page */ - Pfn1->u4.PteFrame = -1; + Pfn1->u4.PteFrame = COLORED_LIST_HEAD; ColorTable->Flink = PageFrameIndex; } else @@ -557,7 +558,6 @@ Pfn1->u4.PteFrame = MiGetPfnEntryIndex(Blink); /* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ - DPRINT1("Has RMAP: %lx (link: %lx)\n", Blink->u3.e1.ParityError, Blink->OriginalPte.u.Long); ASSERT(Blink->u3.e1.ParityError == FALSE); Blink->OriginalPte.u.Long = PageFrameIndex; } @@ -663,7 +663,6 @@ /* Get the page color */ Color = PageFrameIndex & MmSecondaryColorMask; - DPRINT1("Color: %lx\n", Color); /* Get the list for this color */ ColorHead = &MmFreePagesByColor[ZeroedPageList][Color]; @@ -676,7 +675,7 @@ /* Make this page point back to the list, and point forwards to the old head */ Pfn1->OriginalPte.u.Long = Flink; - Pfn1->u4.PteFrame = -1; + Pfn1->u4.PteFrame = COLORED_LIST_HEAD; /* Set the new head */ ColorHead->Flink = PageFrameIndex; @@ -849,7 +848,7 @@ * ways we shouldn't be seeing RMAP entries at this point */ ASSERT(Pfn1->OriginalPte.u.Soft.Prototype == 0); - ASSERT(Pfn1->OriginalPte.u.Long == 0); + ASSERT(Pfn1->u3.e1.ParityError == FALSE); /* Mark the page temporarily as valid, we're going to make it free soon */ Pfn1->u3.e1.PageLocation = ActiveAndValid;

14 years

[sir_richard] 48925: [NTOS]: Write missing color code in certain PFN functions, and fix existing code where needed. Add some debugging. For now, turned off until testing succeeds. [NTOS]: Redocumen...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Sep 28 22:41:46 2010 New Revision: 48925 URL: http://svn.reactos.org/svn/reactos?rev=48925&view=rev Log: [NTOS]: Write missing color code in certain PFN functions, and fix existing code where needed. Add some debugging. For now, turned off until testing succeeds. [NTOS]: Redocument which MMPFN fields are violated by ReactOS-internal values. This has gotten much better than before. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.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 Sep 28 22:41:46 2010 @@ -306,30 +306,30 @@ USHORT Modified:1; USHORT ReadInProgress:1; // StartOfAllocation USHORT WriteInProgress:1; // EndOfAllocation - USHORT PrototypePte:1; // Zero - USHORT PageColor:4; // LockCount - USHORT PageLocation:3; // Consumer + USHORT PrototypePte:1; + USHORT PageColor:4; + USHORT PageLocation:3; USHORT RemovalRequested:1; - USHORT CacheAttribute:2; // Type + USHORT CacheAttribute:2; USHORT Rom:1; - USHORT ParityError:1; + USHORT ParityError:1; // HasRmap } MMPFNENTRY; typedef struct _MMPFN { union { - PFN_NUMBER Flink; // ListEntry.Flink - ULONG WsIndex; + PFN_NUMBER Flink; + ULONG WsIndex; // SavedSwapEntry PKEVENT Event; NTSTATUS ReadStatus; SINGLE_LIST_ENTRY NextStackPfn; } u1; - PMMPTE PteAddress; // ListEntry.Blink + PMMPTE PteAddress; union { PFN_NUMBER Blink; - ULONG_PTR ShareCount; // MapCount + ULONG_PTR ShareCount; } u2; union { @@ -351,7 +351,7 @@ }; union { - ULONG_PTR EntireFrame; // SavedSwapEntry + ULONG_PTR EntireFrame; struct { ULONG_PTR PteFrame:25; 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 Sep 28 22:41:46 2010 @@ -933,12 +933,6 @@ IN PMMPFN Entry ); -PMMPFN -NTAPI -MiRemoveHeadList( - IN PMMPFNLIST ListHead -); - PFN_NUMBER NTAPI MiAllocatePfn( Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Sep 28 22:41:46 2010 @@ -78,6 +78,11 @@ PFN_NUMBER OldFlink, OldBlink; PMMPFNLIST ListHead; MMLISTS ListName; +#ifdef ARM3_COLORS + ULONG Color; + PMMCOLOR_TABLES ColorTable; + PMMPFN Pfn1; +#endif /* Make sure the PFN lock is held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -124,13 +129,64 @@ /* Set the list head's backlink instead */ ListHead->Flink = OldFlink; } - +#ifdef ARM3_COLORS + /* Get the page color */ + OldBlink = MiGetPfnEntryIndex(Entry); + Color = OldBlink & MmSecondaryColorMask; + DPRINT1("Color: %lx\n", Color); + + /* Get the first page on the color list */ + ColorTable = &MmFreePagesByColor[ListName][Color]; + DPRINT1("Color table: %p %lx\n", ColorTable, ColorTable->Flink); + + /* Check if this was was actually the head */ + OldFlink = ColorTable->Flink; + if (OldFlink == OldBlink) + { + /* Make the table point to the next page this page was linking to */ + ColorTable->Flink = Entry->OriginalPte.u.Long; + if (ColorTable->Flink != LIST_HEAD) + { + /* And make the previous link point to the head now */ + MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = -1; + } + else + { + /* And if that page was the head, loop the list back around */ + ColorTable->Blink = (PVOID)LIST_HEAD; + } + } + else + { + /* This page shouldn't be pointing back to the head */ + ASSERT(Entry->u4.PteFrame != -1); + + /* Make the back link point to whoever the next page is */ + Pfn1 = MiGetPfnEntry(Entry->u4.PteFrame); + Pfn1->OriginalPte.u.Long = Entry->OriginalPte.u.Long; + + /* Check if this page was pointing to the head */ + if (Entry->OriginalPte.u.Long != LIST_HEAD) + { + /* Make the back link point to the head */ + Pfn1 = MiGetPfnEntry(Entry->OriginalPte.u.Long); + Pfn1->u4.PteFrame = -1; + } + else + { + /* Then the table is directly back pointing to this page now */ + ColorTable->Blink = Pfn1; + } + } + + /* One less colored page */ + ASSERT(ColorTable->Count >= 1); + ColorTable->Count--; +#endif /* We are not on a list anymore */ Entry->u1.Flink = Entry->u2.Blink = 0; ASSERT_LIST_INVARIANT(ListHead); - /* FIXME: Deal with color list */ - /* See if we hit any thresholds */ if (MmAvailablePages == MmHighMemoryThreshold) { @@ -160,9 +216,9 @@ MMLISTS ListName; PFN_NUMBER OldFlink, OldBlink; ULONG OldColor, OldCache; -#if 0 +#ifdef ARM3_COLORS PMMCOLOR_TABLES ColorTable; -#endif +#endif /* Make sure PFN lock is held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(Color < MmSecondaryColors); @@ -221,18 +277,22 @@ Pfn1->u3.e2.ShortFlags = 0; Pfn1->u3.e1.PageColor = OldColor; Pfn1->u3.e1.CacheAttribute = OldCache; - -#if 0 // When switching to ARM3 +#ifdef ARM3_COLORS /* Get the first page on the color list */ + ASSERT(Color < MmSecondaryColors); ColorTable = &MmFreePagesByColor[ListName][Color]; ASSERT(ColorTable->Count >= 1); /* Set the forward link to whoever we were pointing to */ + DPRINT1("Has RMAP: %lx (link: %lx)\n", Pfn1->u3.e1.ParityError, Pfn1->OriginalPte.u.Long); + DPRINT1("Color table: %p %lx\n", ColorTable, ColorTable->Flink); ColorTable->Flink = Pfn1->OriginalPte.u.Long; + + /* Get the first page on the color list */ if (ColorTable->Flink == LIST_HEAD) { /* This is the beginning of the list, so set the sentinel value */ - ColorTable->Blink = LIST_HEAD; + ColorTable->Blink = (PVOID)LIST_HEAD; } else { @@ -240,8 +300,8 @@ MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = -1; } - /* One more page */ - ColorTable->Total++; + /* One less page */ + ColorTable->Count--; #endif /* See if we hit any thresholds */ if (MmAvailablePages == MmHighMemoryThreshold) @@ -404,7 +464,7 @@ PMMPFNLIST ListHead; PFN_NUMBER LastPage; PMMPFN Pfn1; -#if 0 +#ifdef ARM3_COLORS ULONG Color; PMMPFN Blink; PMMCOLOR_TABLES ColorTable; @@ -473,13 +533,15 @@ /* Otherwise check if we reached the high threshold and signal the event */ KeSetEvent(MiHighMemoryEvent, 0, FALSE); } - -#if 0 // When using ARM3 PFN +#ifdef ARM3_COLORS /* Get the page color */ Color = PageFrameIndex & MmSecondaryColorMask; + DPRINT1("Color: %lx\n", Color); /* Get the first page on the color list */ ColorTable = &MmFreePagesByColor[FreePageList][Color]; + DPRINT1("Color table: %p %lx\n", ColorTable, ColorTable->Flink); + DPRINT1("Has RMAP: %lx (link: %lx)\n", Pfn1->u3.e1.ParityError, Pfn1->OriginalPte.u.Long); if (ColorTable->Flink == LIST_HEAD) { /* The list is empty, so we are the first page */ @@ -492,18 +554,24 @@ Blink = (PMMPFN)ColorTable->Blink; /* Make it link to us */ - Pfn1->u4.PteFrame = MI_PFNENTRY_TO_PFN(Blink); + Pfn1->u4.PteFrame = MiGetPfnEntryIndex(Blink); + + /* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ + DPRINT1("Has RMAP: %lx (link: %lx)\n", Blink->u3.e1.ParityError, Blink->OriginalPte.u.Long); + ASSERT(Blink->u3.e1.ParityError == FALSE); Blink->OriginalPte.u.Long = PageFrameIndex; } /* Now initialize our own list pointers */ ColorTable->Blink = Pfn1; + + /* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ + ASSERT(Pfn1->u3.e1.ParityError == FALSE); Pfn1->OriginalPte.u.Long = LIST_HEAD; /* And increase the count in the colored list */ ColorTable->Count++; #endif - /* Notify zero page thread if enough pages are on the free list now */ if ((ListHead->Total >= 8) && !(MmZeroingPageThreadActive)) { @@ -522,7 +590,10 @@ PFN_NUMBER Flink; PMMPFN Pfn1, Pfn2; MMLISTS ListName; - +#ifdef ARM3_COLORS + PMMCOLOR_TABLES ColorHead; + ULONG Color; +#endif /* For free pages, use MiInsertPageInFreeList */ ASSERT(ListHead != &MmFreePageListHead); @@ -585,8 +656,47 @@ /* Otherwise check if we reached the high threshold and signal the event */ KeSetEvent(MiHighMemoryEvent, 0, FALSE); } - - /* FIXME: Color code handling */ + +#ifdef ARM3_COLORS + ASSERT(ListName == ZeroedPageList); + ASSERT(Pfn1->u4.InPageError == 0); + + /* Get the page color */ + Color = PageFrameIndex & MmSecondaryColorMask; + DPRINT1("Color: %lx\n", Color); + + /* Get the list for this color */ + ColorHead = &MmFreePagesByColor[ZeroedPageList][Color]; + + /* Get the old head */ + Flink = ColorHead->Flink; + + /* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ + ASSERT(Pfn1->u3.e1.ParityError == FALSE); + + /* Make this page point back to the list, and point forwards to the old head */ + Pfn1->OriginalPte.u.Long = Flink; + Pfn1->u4.PteFrame = -1; + + /* Set the new head */ + ColorHead->Flink = PageFrameIndex; + + /* Was the head empty? */ + if (Flink != LIST_HEAD) + { + /* No, so make the old head point to this page */ + Pfn2 = MiGetPfnEntry(Flink); + Pfn2->u4.PteFrame = PageFrameIndex; + } + else + { + /* Yes, make it loop back to this page */ + ColorHead->Blink = (PVOID)Pfn1; + } + + /* One more paged on the colored list */ + ColorHead->Count++; +#endif } VOID

14 years

[akhaldi] 48924: [FONTS] - Update RedHat Liberation Fonts to 1.06 - Update Tahoma Fonts To Wine HEAD - Update DejaVu Fonts Documentation To 2.31 See issue #5632, 5633, 5634 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 28 17:19:52 2010 New Revision: 48924 URL: http://svn.reactos.org/svn/reactos?rev=48924&view=rev Log: [FONTS] - Update RedHat Liberation Fonts to 1.06 - Update Tahoma Fonts To Wine HEAD - Update DejaVu Fonts Documentation To 2.31 See issue #5632,5633,5634 for more details. Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/media/fonts/LiberationMono-Bold.ttf trunk/reactos/media/fonts/LiberationMono-BoldItalic.ttf trunk/reactos/media/fonts/LiberationMono-Italic.ttf trunk/reactos/media/fonts/LiberationMono-Regular.ttf trunk/reactos/media/fonts/LiberationSans-Bold.ttf trunk/reactos/media/fonts/LiberationSans-BoldItalic.ttf trunk/reactos/media/fonts/LiberationSans-Italic.ttf trunk/reactos/media/fonts/LiberationSans-Regular.ttf trunk/reactos/media/fonts/LiberationSerif-Bold.ttf trunk/reactos/media/fonts/LiberationSerif-BoldItalic.ttf trunk/reactos/media/fonts/LiberationSerif-Italic.ttf trunk/reactos/media/fonts/LiberationSerif-Regular.ttf trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt trunk/reactos/media/fonts/doc/DejaVu_LICENSE.txt trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt trunk/reactos/media/fonts/doc/DejaVu_README.txt trunk/reactos/media/fonts/doc/DejaVu_langcover.txt trunk/reactos/media/fonts/doc/DejaVu_status.txt trunk/reactos/media/fonts/doc/DejaVu_unicover.txt trunk/reactos/media/fonts/tahoma.ttf trunk/reactos/media/fonts/tahomabd.ttf [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… Modified: trunk/reactos/media/fonts/LiberationMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationMono… Modified: trunk/reactos/media/fonts/LiberationMono-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationMono… Modified: trunk/reactos/media/fonts/LiberationMono-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationMono… Modified: trunk/reactos/media/fonts/LiberationMono-Regular.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationMono… Modified: trunk/reactos/media/fonts/LiberationSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSans… Modified: trunk/reactos/media/fonts/LiberationSans-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSans… Modified: trunk/reactos/media/fonts/LiberationSans-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSans… Modified: trunk/reactos/media/fonts/LiberationSans-Regular.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSans… Modified: trunk/reactos/media/fonts/LiberationSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSeri… Modified: trunk/reactos/media/fonts/LiberationSerif-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSeri… Modified: trunk/reactos/media/fonts/LiberationSerif-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSeri… Modified: trunk/reactos/media/fonts/LiberationSerif-Regular.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSeri… Modified: trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_AUT… Modified: trunk/reactos/media/fonts/doc/DejaVu_LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_LIC… Modified: trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_NEW… Modified: trunk/reactos/media/fonts/doc/DejaVu_README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_REA… Modified: trunk/reactos/media/fonts/doc/DejaVu_langcover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_lan… Modified: trunk/reactos/media/fonts/doc/DejaVu_status.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_sta… Modified: trunk/reactos/media/fonts/doc/DejaVu_unicover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_uni… Modified: trunk/reactos/media/fonts/tahoma.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/tahoma.ttf?rev… Modified: trunk/reactos/media/fonts/tahomabd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/tahomabd.ttf?r…

14 years

[akhaldi] 48923: [USETUP] - Update Estonian translation by anthrax11. See issue #5625 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 28 17:12:46 2010 New Revision: 48923 URL: http://svn.reactos.org/svn/reactos?rev=48923&view=rev Log: [USETUP] - Update Estonian translation by anthrax11. See issue #5625 for more details. Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Tue Sep 28 17:12:46 2010 @@ -985,13 +985,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Paigalda alglaadur kävakettale (MBR ja VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Paigalda alglaadur kävakettale (ainult VBR).", TEXT_STYLE_NORMAL }, {

14 years

[sir_richard] 48922: [NTOS]: Switch to using an ARM3, much more correct MmZeroPageThread. Stub support for discarding sections and listening to the Power Manager Idle Timer. [NTOS]: Use a synchroni...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Sep 28 16:47:25 2010 New Revision: 48922 URL: http://svn.reactos.org/svn/reactos?rev=48922&view=rev Log: [NTOS]: Switch to using an ARM3, much more correct MmZeroPageThread. Stub support for discarding sections and listening to the Power Manager Idle Timer. [NTOS]: Use a synchronization (auto-reset) instead of notification event for the zero page thread, this way we don't have to reset it manually and query its state. Instead, a boolean MmZeroingPageThreadActive is checked instead. [NTOS]: Once we switch to colored lists, major improvements can be done for speed. Added: trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c (with props) Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=489… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Tue Sep 28 16:47:25 2010 @@ -1951,5 +1951,5 @@ Phase1InitializationDiscard(Context); /* Jump into zero page thread */ - MmZeroPageThreadMain(NULL); + MmZeroPageThread(); } 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 Sep 28 16:47:25 2010 @@ -1164,10 +1164,10 @@ BOOLEAN ZeroPages ); -NTSTATUS -NTAPI -MmZeroPageThreadMain( - PVOID Context +VOID +NTAPI +MmZeroPageThread( + VOID ); /* hypermap.c *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Tue Sep 28 16:47:25 2010 @@ -145,8 +145,6 @@ } } -extern KEVENT ZeroPageThreadEvent; - NTSTATUS NTAPI MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -496,10 +494,7 @@ /* Initialize the color tables */ MiInitializeColorTables(); - - /* ReactOS Stuff */ - KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); - + /* Build the PFN Database */ MiInitializePfnDatabase(LoaderBlock); MmInitializeBalancer(MmAvailablePages, 0); 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 Sep 28 16:47:25 2010 @@ -439,6 +439,8 @@ extern PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; extern PMMPTE MmSharedUserDataPte; extern LIST_ENTRY MmProcessList; +extern BOOLEAN MmZeroingPageThreadActive; +extern KEVENT MmZeroingPageEvent; #define MI_PFN_TO_PFNENTRY(x) (&MmPfnDatabase[1][x]) #define MI_PFNENTRY_TO_PFN(x) (x - MmPfnDatabase[1]) Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Tue Sep 28 16:47:25 2010 @@ -1811,7 +1811,11 @@ /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); - + + /* Set the zero page event */ + KeInitializeEvent(&MmZeroingPageEvent, SynchronizationEvent, FALSE); + MmZeroingPageThreadActive = FALSE; + // // Count physical pages on the system // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Sep 28 16:47:25 2010 @@ -397,8 +397,6 @@ return PageIndex; } -extern KEVENT ZeroPageThreadEvent; - VOID NTAPI MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) @@ -507,10 +505,11 @@ #endif /* Notify zero page thread if enough pages are on the free list now */ - if ((MmFreePageListHead.Total > 8) && !(KeReadStateEvent(&ZeroPageThreadEvent))) - { - /* This is ReactOS-specific */ - KeSetEvent(&ZeroPageThreadEvent, IO_NO_INCREMENT, FALSE); + if ((ListHead->Total >= 8) && !(MmZeroingPageThreadActive)) + { + /* Set the event */ + MmZeroingPageThreadActive = TRUE; + KeSetEvent(&MmZeroingPageEvent, IO_NO_INCREMENT, FALSE); } } Added: trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/zeropage.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] Tue Sep 28 16:47:25 2010 @@ -1,0 +1,98 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/zeropage.c + * PURPOSE: ARM Memory Manager Zero Page Thread Support + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::ZEROPAGE" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +BOOLEAN MmZeroingPageThreadActive; +KEVENT MmZeroingPageEvent; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +MmZeroPageThread(VOID) +{ + PKTHREAD Thread = KeGetCurrentThread(); + //PVOID StartAddress, EndAddress; + PVOID WaitObjects[2]; + NTSTATUS Status; + KIRQL OldIrql; + PVOID ZeroAddress; + PFN_NUMBER PageIndex, FreePage; + PMMPFN Pfn1; + + /* FIXME: Get the discardable sections to free them */ +// MiFindInitializationCode(&StartAddress, &EndAddress); +// if (StartAddress) MiFreeInitializationCode(StartAddress, EndAddress); + + /* Set our priority to 0 */ + Thread->BasePriority = 0; + KeSetPriorityThread(Thread, 0); + + /* Setup the wait objects */ + WaitObjects[0] = &MmZeroingPageEvent; +// WaitObjects[1] = &PoSystemIdleTimer; FIXME: Implement idle timer + + while (TRUE) + { + Status = KeWaitForMultipleObjects(1, // 2 + WaitObjects, + WaitAny, + WrFreePage, + KernelMode, + FALSE, + NULL, + NULL); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + while (TRUE) + { + if (!MmFreePageListHead.Total) + { + MmZeroingPageThreadActive = FALSE; + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + break; + } + + PageIndex = MmFreePageListHead.Flink; + Pfn1 = MiGetPfnEntry(PageIndex); + FreePage = MiRemoveAnyPage(0); // FIXME: Use real color + if (FreePage != PageIndex) + { + KeBugCheckEx(PFN_LIST_CORRUPT, + 0x8F, + FreePage, + PageIndex, + 0); + } + + Pfn1->u1.Flink = LIST_HEAD; + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + ZeroAddress = MiMapPagesToZeroInHyperSpace(Pfn1, 1); + ASSERT(ZeroAddress); + RtlZeroMemory(ZeroAddress, PAGE_SIZE); + MiUnmapPagesInZeroSpace(ZeroAddress, 1); + + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + MiInsertPageInList(&MmZeroedPageListHead, PageIndex); + } + } +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Tue Sep 28 16:47:25 2010 @@ -48,8 +48,6 @@ SIZE_T MmPeakCommitment; SIZE_T MmtotalCommitLimitMaximum; -KEVENT ZeroPageThreadEvent; -static BOOLEAN ZeroPageThreadShouldTerminate = FALSE; static RTL_BITMAP MiUserPfnBitMap; /* FUNCTIONS *************************************************************/ @@ -625,72 +623,4 @@ return PfnOffset; } -NTSTATUS -NTAPI -MmZeroPageThreadMain(PVOID Ignored) -{ - NTSTATUS Status; - KIRQL oldIrql; - PMMPFN Pfn1; - PFN_NUMBER PageIndex, FreePage; - ULONG Count; - PVOID ZeroAddress; - - /* Free initial kernel memory */ - //MiFreeInitMemory(); - - /* Set our priority to 0 */ - KeGetCurrentThread()->BasePriority = 0; - KeSetPriorityThread(KeGetCurrentThread(), 0); - - while(1) - { - Status = KeWaitForSingleObject(&ZeroPageThreadEvent, - 0, - KernelMode, - FALSE, - NULL); - - if (ZeroPageThreadShouldTerminate) - { - DPRINT1("ZeroPageThread: Terminating\n"); - return STATUS_SUCCESS; - } - Count = 0; - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - while (MmFreePageListHead.Total) - { - PageIndex = MmFreePageListHead.Flink; - Pfn1 = MiGetPfnEntry(PageIndex); - FreePage = MiRemoveAnyPage(0); // FIXME: Use real color - if (FreePage != PageIndex) - { - KeBugCheckEx(PFN_LIST_CORRUPT, - 0x8F, - FreePage, - PageIndex, - 0); - } - - Pfn1->u1.Flink = LIST_HEAD; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - - ZeroAddress = MiMapPagesToZeroInHyperSpace(Pfn1, 1); - ASSERT(ZeroAddress); - RtlZeroMemory(ZeroAddress, PAGE_SIZE); - MiUnmapPagesInZeroSpace(ZeroAddress, 1); - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - MiInsertPageInList(&MmZeroedPageListHead, PageIndex); - Count++; - } - DPRINT("Zeroed %d pages.\n", Count); - KeResetEvent(&ZeroPageThreadEvent); - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - } - - return STATUS_SUCCESS; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Sep 28 16:47:25 2010 @@ -463,6 +463,7 @@ <file>syspte.c</file> <file>vadnode.c</file> <file>virtual.c</file> + <file>zeropage.c</file> </directory> <file>anonmem.c</file> <file>balance.c</file>

14 years

[sir_richard] 48921: [NTOS]: The RMAP entry only has a valid process if the address is in user-space, otherwise process is NULL. Only attempt to acquire the process rundown lock if a process actual...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Sep 28 16:44:18 2010 New Revision: 48921 URL: http://svn.reactos.org/svn/reactos?rev=48921&view=rev Log: [NTOS]: The RMAP entry only has a valid process if the address is in user-space, otherwise process is NULL. Only attempt to acquire the process rundown lock if a process actually exists. Fixes crashes caused by 48905. Modified: trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=489… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Tue Sep 28 16:44:18 2010 @@ -75,12 +75,6 @@ } Process = entry->Process; - if (!ExAcquireRundownProtection(&Process->RundownProtect)) - { - ExReleaseFastMutex(&RmapListLock); - return STATUS_PROCESS_IS_TERMINATING; - } - Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { @@ -89,6 +83,12 @@ if (Address < MmSystemRangeStart) { + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + ExReleaseFastMutex(&RmapListLock); + return STATUS_PROCESS_IS_TERMINATING; + } + Status = ObReferenceObjectByPointer(Process, PROCESS_ALL_ACCESS, NULL, KernelMode); ExReleaseFastMutex(&RmapListLock); if (!NT_SUCCESS(Status)) @@ -109,9 +109,9 @@ if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { MmUnlockAddressSpace(AddressSpace); - ExReleaseRundownProtection(&Process->RundownProtect); if (Address < MmSystemRangeStart) { + ExReleaseRundownProtection(&Process->RundownProtect); ObDereferenceObject(Process); } return(STATUS_UNSUCCESSFUL); @@ -131,9 +131,9 @@ if (PageOp == NULL) { MmUnlockAddressSpace(AddressSpace); - ExReleaseRundownProtection(&Process->RundownProtect); if (Address < MmSystemRangeStart) { + ExReleaseRundownProtection(&Process->RundownProtect); ObDereferenceObject(Process); } return(STATUS_UNSUCCESSFUL); @@ -157,9 +157,9 @@ if (PageOp == NULL) { MmUnlockAddressSpace(AddressSpace); - ExReleaseRundownProtection(&Process->RundownProtect); if (Address < MmSystemRangeStart) { + ExReleaseRundownProtection(&Process->RundownProtect); ObDereferenceObject(Process); } return(STATUS_UNSUCCESSFUL); @@ -181,10 +181,9 @@ KeBugCheck(MEMORY_MANAGEMENT); } - ExReleaseRundownProtection(&Process->RundownProtect); - if (Address < MmSystemRangeStart) { + ExReleaseRundownProtection(&Process->RundownProtect); ObDereferenceObject(Process); } return(Status);

14 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2010