Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[ros-arm-bringup] 32364: One would expect that a function called "MmIsUsablePage" would return whether a not a page is usable. In other words, we are making sure that the page is free/available, so that we may make use of it. Apparently not so -- MmIsUsable page returned if a page was NOT usable, but was instead "already used". The caller's wish was to ensure he was correctly using a used page, not to check if he could start using a usable page. This would just be an annoying gramatical/logic er

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Feb 14 23:30:31 2008 New Revision: 32364 URL: http://svn.reactos.org/svn/reactos?rev=32364&view=rev Log: One would expect that a function called "MmIsUsablePage" would return whether a not a page is usable. In other words, we are making sure that the page is free/available, so that we may make use of it. Apparently not so -- MmIsUsable page returned if a page was NOT usable, but was instead "already used". The caller's wish was to ensure he was correctly using a used page, not to check if he could start using a usable page. This would just be an annoying gramatical/logic error (but makes "sense" in the way it's used), if it weren't for the fact that MmIsUsablePage also returned TRUE for BIOS pages (which meant, "yes, you are correctly using/overwriting memory we spent time ensuring to mark as reserved/BIOS"). Renamed the function to MmIsPageInUse, and only return TRUE if the page is in use. Like the name says. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.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 (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Feb 14 23:30:31 2008 @@ -1145,7 +1145,7 @@ BOOLEAN NTAPI -MmIsUsablePage(PFN_TYPE Page); +MmIsPageInUse(PFN_TYPE Page); VOID NTAPI 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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 23:30:31 2008 @@ -640,23 +640,17 @@ BOOLEAN NTAPI -MmIsUsablePage(PFN_TYPE Pfn) -{ - - DPRINT("MmIsUsablePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); +MmIsPageInUse(PFN_TYPE Pfn) +{ + + DPRINT("MmIsPageInUse(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); if (Pfn == 0 || Pfn >= MmPageArraySize) { KEBUGCHECK(0); } - - if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED && - MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_BIOS) - { - return(FALSE); - } - - return(TRUE); + + return (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_USED); } VOID Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Thu Feb 14 23:30:31 2008 @@ -1941,18 +1941,10 @@ for (i = 0; i < PageCount; i++) { - if (!MmIsUsablePage(Pages[i])) - { - /* Is this an attempt to map KUSER_SHARED_DATA? */ - if ((Address == (PVOID)0x7FFE0000) && (PageCount == 1) && (Pages[0] == 2)) - { - // allow - } - else - { - DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); - KEBUGCHECK(0); - } + if (!MmIsPageInUse(Pages[i])) + { + DPRINT1("Page at address %x not in use\n", PFN_TO_PTE(Pages[i])); + KEBUGCHECK(0); } }

16 years, 8 months

[fireball] 32363: - Load drivers database (AppPatch/drvmain.sdb), so Windows could use it if needed.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 14 23:27:59 2008 New Revision: 32363 URL: http://svn.reactos.org/svn/reactos?rev=32363&view=rev Log: - Load drivers database (AppPatch/drvmain.sdb), so Windows could use it if needed. Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h Thu Feb 14 23:27:59 2008 @@ -68,6 +68,10 @@ IN PCCH DirectoryPath, IN PLDR_DATA_TABLE_ENTRY ScanDTE); +// winldr.c +PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, + TYPE_OF_MEMORY MemoryType); + // wlmemory.c BOOLEAN WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Thu Feb 14 23:27:59 2008 @@ -76,6 +76,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, PCHAR Options, PCHAR SystemPath, + PCHAR BootPath, WORD VersionToBoot) { /* Examples of correct options and paths */ @@ -87,6 +88,7 @@ CHAR HalPath[] = "\\"; CHAR SystemRoot[256]; CHAR ArcBoot[256]; + CHAR MiscFiles[256]; ULONG i, PathSeparator; PLOADER_PARAMETER_EXTENSION Extension; @@ -192,6 +194,12 @@ Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8; Extension->MinorVersion = VersionToBoot & 0xFF; Extension->Profile.Status = 2; + + /* Load drivers database */ + strcpy(MiscFiles, BootPath); + strcat(MiscFiles, "AppPatch\\drvmain.sdb"); + Extension->DrvDBImage = PaToVa(WinLdrLoadModule(MiscFiles, + &Extension->DrvDBSize, LoaderRegistryData)); LoaderBlock->Extension = PaToVa(Extension); } @@ -352,6 +360,61 @@ return TRUE; } + +PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, + TYPE_OF_MEMORY MemoryType) +{ + PFILE FileHandle; + PVOID PhysicalBase; + ULONG FileSize; + BOOLEAN Status; + + //CHAR ProgressString[256]; + + /* Inform user we are loading files */ + //sprintf(ProgressString, "Loading %s...", FileName); + //UiDrawProgressBarCenter(1, 100, ProgressString); + + DbgPrint((DPRINT_WINDOWS, "Loading module %s\n", ModuleName)); + *Size = 0; + + /* Open the image file */ + FileHandle = FsOpenFile(ModuleName); + + if (FileHandle == NULL) + { + /* In case of errors, we just return, without complaining to the user */ + return NULL; + } + + /* Get this file's size */ + FileSize = FsGetFileSize(FileHandle); + *Size = FileSize; + + /* Allocate memory */ + PhysicalBase = MmAllocateMemoryWithType(FileSize, MemoryType); + if (PhysicalBase == NULL) + { + FsCloseFile(FileHandle); + return NULL; + } + + /* Load whole file */ + Status = FsReadFile(FileHandle, FileSize, NULL, PhysicalBase); + if (!Status) + { + FsCloseFile(FileHandle); + return NULL; + } + + DbgPrint((DPRINT_WINDOWS, "Loaded %s at 0x%x with size 0x%x\n", ModuleName, PhysicalBase, FileSize)); + + /* We are done with the file - close it */ + FsCloseFile(FileHandle); + + return PhysicalBase; +} + VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion) @@ -487,7 +550,7 @@ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath, OperatingSystemVersion); + WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath, BootPath, OperatingSystemVersion); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint;

16 years, 8 months

[ros-arm-bringup] 32362: Fix a couple of off-by-one bugs we recently introduced -- PFNs are one of the only indexes which are actually 0-based, so you really want to loop from 0 to the last page, inclusive (unlike most loops where you would stop *before* the last element index).

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Feb 14 23:20:44 2008 New Revision: 32362 URL: http://svn.reactos.org/svn/reactos?rev=32362&view=rev Log: Fix a couple of off-by-one bugs we recently introduced -- PFNs are one of the only indexes which are actually 0-based, so you really want to loop from 0 to the last page, inclusive (unlike most loops where you would stop *before* the last element index). Modified: trunk/reactos/ntoskrnl/mm/freelist.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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 23:20:44 2008 @@ -354,7 +354,7 @@ KernelPageEnd = LastPhysKernelAddress / PAGE_SIZE; /* Loop every page on the system */ - for (i = 0; i < MmPageArraySize; i++) + for (i = 0; i <= MmPageArraySize; i++) { /* Check if it's part of RAM */ if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, i)) @@ -417,7 +417,7 @@ MmPageArray[i].MapCount = 1; MmStats.NrSystemPages++; } - else if (i > (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1)) + else if (i >= (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount)) { /* These are pages we allocated above to hold the PFN DB */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED;

16 years, 8 months

[ros-arm-bringup] 32361: Stop lying that the PCR, KUSER_SHARED_DATA, and PDEs are "BIOS" pages, they're USED pages. Stop initializing fields to 0 if we've already cleared the entire array! Stop setting arbitrary values for MapCount and ReferenceCount -- both the KPCR, KUSER_SHARED_DATA and PDE are mapped! Stop saying Video ROM has a reference count, it's the same as BIOS memory, except the MiIsPfnRam function doesn't detect it and we have a hack for it.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Feb 14 23:03:33 2008 New Revision: 32361 URL: http://svn.reactos.org/svn/reactos?rev=32361&view=rev Log: Stop lying that the PCR, KUSER_SHARED_DATA, and PDEs are "BIOS" pages, they're USED pages. Stop initializing fields to 0 if we've already cleared the entire array! Stop setting arbitrary values for MapCount and ReferenceCount -- both the KPCR, KUSER_SHARED_DATA and PDE are mapped! Stop saying Video ROM has a reference count, it's the same as BIOS memory, except the MiIsPfnRam function doesn't detect it and we have a hack for it. Modified: trunk/reactos/ntoskrnl/mm/freelist.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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 23:03:33 2008 @@ -363,37 +363,37 @@ if (i == 0) { /* Page 0 is reserved for the IVT */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 0; + MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].MapCount = 1; MmStats.NrReservedPages++; } else if (i == 1) { /* Page 1 is reserved for the PCR */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 1; + MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].MapCount = 1; MmStats.NrReservedPages++; } else if (i == 2) { /* Page 2 is reserved for the KUSER_SHARED_DATA */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 1; + MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].MapCount = 1; MmStats.NrReservedPages++; } else if ((i >= PdePageStart) && (i < PdePageEnd)) { /* These pages contain the initial FreeLDR PDEs */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 1; + MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].MapCount = 1; MmStats.NrReservedPages++; } else if ((i >= VideoPageStart) && (i < VideoPageEnd)) @@ -405,16 +405,13 @@ * (which we'll assume to be "free" a couple of lines below) */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Zero = 0; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 1; MmStats.NrReservedPages++; } else if ((i >= KernelPageStart) && (i < KernelPageEnd)) { /* These are pages beloning to the kernel */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Zero = 0; MmPageArray[i].Flags.Consumer = MC_NPPOOL; MmPageArray[i].ReferenceCount = 2; MmPageArray[i].MapCount = 1; @@ -424,7 +421,6 @@ { /* These are pages we allocated above to hold the PFN DB */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Zero = 0; MmPageArray[i].Flags.Consumer = MC_NPPOOL; MmPageArray[i].ReferenceCount = 2; MmPageArray[i].MapCount = 1; @@ -439,8 +435,6 @@ * Descriptor List, why bother, right? */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_FREE; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 0; InsertTailList(&FreeUnzeroedPageListHead, &MmPageArray[i].ListEntry); UnzeroedPageCount++; @@ -452,8 +446,6 @@ /* These are pages reserved by the BIOS/ROMs */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 0; MmStats.NrReservedPages++; } }

16 years, 8 months

[ros-arm-bringup] 32360: Prepare for getting rid of the Freelist hacks and use memory descriptors instead, by detecting the highest free memory descriptor, and allocating the page array PTEs from there (gets rid of the "LastPage" variable).

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Feb 14 22:24:02 2008 New Revision: 32360 URL: http://svn.reactos.org/svn/reactos?rev=32360&view=rev Log: Prepare for getting rid of the Freelist hacks and use memory descriptors instead, by detecting the highest free memory descriptor, and allocating the page array PTEs from there (gets rid of the "LastPage" variable). Modified: trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 22:24:02 2008 @@ -280,21 +280,22 @@ PVOID INIT_FUNCTION NTAPI -MmInitializePageList(ULONG_PTR FirstPhysKernelAddress, - ULONG_PTR LastPhysKernelAddress, - ULONG MemorySizeInPages, - ULONG_PTR LastKernelAddress, - PADDRESS_RANGE BIOSMemoryMap, - ULONG AddressRangeCount) +MmInitializePageList(IN ULONG_PTR FirstPhysKernelAddress, + IN ULONG_PTR LastPhysKernelAddress, + IN ULONG HighestPage, + IN ULONG_PTR LastKernelAddress, + IN PADDRESS_RANGE BIOSMemoryMap, + IN ULONG AddressRangeCount) { ULONG i; ULONG Reserved; NTSTATUS Status; - PFN_TYPE LastPage, Pfn = 0; + PFN_TYPE Pfn = 0; ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; ULONG PdePageStart, PdePageEnd; ULONG VideoPageStart, VideoPageEnd; ULONG KernelPageStart, KernelPageEnd; + extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; /* Initialize the page lists */ KeInitializeSpinLock(&PageListLock); @@ -303,7 +304,7 @@ InitializeListHead(&FreeZeroedPageListHead); /* Set the size and start of the PFN Database */ - MmPageArraySize = MemorySizeInPages; + MmPageArraySize = HighestPage; MmPageArray = (PHYSICAL_PAGE *)LastKernelAddress; Reserved = PAGE_ROUND_UP((MmPageArraySize * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; @@ -311,10 +312,6 @@ LastKernelAddress = ((ULONG_PTR)LastKernelAddress + (Reserved * PAGE_SIZE)); LastPhysKernelAddress = (ULONG_PTR)LastPhysKernelAddress + (Reserved * PAGE_SIZE); - /* Find the highest usable page */ - LastPage = MmPageArraySize; - while (TRUE) if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, --LastPage)) break; - /* Loop every page required to hold the PFN database */ for (i = 0; i < Reserved; i++) { @@ -324,7 +321,8 @@ if (!MmIsPagePresent(NULL, Address)) { /* Use one of our highest usable pages */ - Pfn = LastPage--; + Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; + MiFreeDescriptor->PageCount--; /* Set the PFN */ Status = MmCreateVirtualMappingForKernel(Address, @@ -422,7 +420,7 @@ MmPageArray[i].MapCount = 1; MmStats.NrSystemPages++; } - else if (i > LastPage) + else if (i > (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1)) { /* These are pages we allocated above to hold the PFN DB */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Feb 14 22:24:02 2008 @@ -50,6 +50,7 @@ PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; +PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern KMUTANT MmSystemLoadLock; BOOLEAN MiDbgEnableMdDump = #ifdef _ARM_ @@ -207,6 +208,7 @@ { PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR Md; + ULONG FreePages = 0; for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; @@ -240,6 +242,21 @@ /* Update the highest page */ MmHighestPhysicalPage = Md->BasePage + Md->PageCount - 1; } + + /* Check if this is free memory */ + if ((Md->MemoryType == LoaderFree) || + (Md->MemoryType == LoaderLoadedProgram) || + (Md->MemoryType == LoaderFirmwareTemporary) || + (Md->MemoryType == LoaderOsloaderStack)) + { + /* Check if this is the largest memory descriptor */ + if (Md->PageCount > FreePages) + { + /* For now, it is */ + FreePages = Md->PageCount; + MiFreeDescriptor = Md; + } + } } } }

16 years, 8 months

[ros-arm-bringup] 32359: We were looping the memory descriptors in order to find the number of pages that are available to the system, that is to say, your RAM, minus pages that the BIOS said belong to it. This part is good. Next up, we were creating the page array for these pages, up to the highest entry, which we called, the number of pages on the system. This is the problem. Suppose we had 1000 pages somewhere in low memory that were used by the BIOS, we'd now call the total pages RAM - 1000

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Feb 14 21:33:38 2008 New Revision: 32359 URL: http://svn.reactos.org/svn/reactos?rev=32359&view=rev Log: We were looping the memory descriptors in order to find the number of pages that are available to the system, that is to say, your RAM, minus pages that the BIOS said belong to it. This part is good. Next up, we were creating the page array for these pages, up to the highest entry, which we called, the number of pages on the system. This is the problem. Suppose we had 1000 pages somewhere in low memory that were used by the BIOS, we'd now call the total pages RAM - 1000 (correct). However, we'd also set the highest page array entry to RAM - 1000, which is wrong, because esssentially this eats up 10MB of memory, since the top 10MB (which are FREE, usable memory) are never entered into the database. So really, what we want to do is differentiate the TOTAL amount of usable RAM, versus the HIGHEST page that is usable (which is actually what should be the highest entry in the page array). This will reclaim the lost RAM ReactOS has been eating up all these days. But it gets better: eventually, someone noticed ReactOS was eating memory, and added 1MB more to the "total", making the highest entry "1mb higher". This ...kind of... fixes the problem above by giving you one more MB, but what if ReactOS was only eating up 150KB, as was more the case? Then ReactOS would believe that the other 850KB of memory are "Free physical memory", when actually, they're pages that don't even exist. Wow! Fixed these bugs. Modified: trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 21:33:38 2008 @@ -290,7 +290,7 @@ ULONG i; ULONG Reserved; NTSTATUS Status; - PFN_TYPE LastPage, Pfn; + PFN_TYPE LastPage, Pfn = 0; ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; ULONG PdePageStart, PdePageEnd; ULONG VideoPageStart, VideoPageEnd; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Feb 14 21:33:38 2008 @@ -49,7 +49,7 @@ PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; -ULONG MmNumberOfPhysicalPages; +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; extern KMUTANT MmSystemLoadLock; BOOLEAN MiDbgEnableMdDump = #ifdef _ARM_ @@ -201,13 +201,12 @@ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); } -ULONG +VOID NTAPI MiCountFreePagesInLoaderBlock(PLOADER_PARAMETER_BLOCK LoaderBlock) { PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR Md; - ULONG TotalPages = 0; for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; @@ -215,19 +214,51 @@ { Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - if (Md->MemoryType == LoaderBad || - Md->MemoryType == LoaderFirmwarePermanent || - Md->MemoryType == LoaderSpecialMemory || - Md->MemoryType == LoaderBBTMemory) + /* Skip invisible memory */ + if ((Md->MemoryType != LoaderFirmwarePermanent) && + (Md->MemoryType != LoaderSpecialMemory) && + (Md->MemoryType != LoaderHALCachedMemory) && + (Md->MemoryType != LoaderBBTMemory)) { - /* Don't count these blocks */ - continue; + /* Check if BURNMEM was used */ + if (Md->MemoryType != LoaderBad) + { + /* Count this in the total of pages */ + MmNumberOfPhysicalPages += Md->PageCount; + } + + /* Check if this is the new lowest page */ + if (Md->BasePage < MmLowestPhysicalPage) + { + /* Update the lowest page */ + MmLowestPhysicalPage = Md->BasePage; + } + + /* Check if this is the new highest page */ + if ((Md->BasePage + Md->PageCount) > MmHighestPhysicalPage) + { + /* Update the highest page */ + MmHighestPhysicalPage = Md->BasePage + Md->PageCount - 1; + } } - - TotalPages += Md->PageCount; - } - - return TotalPages; + } +} + +VOID +NTAPI +MiDbgDumpBiosMap(IN PADDRESS_RANGE BIOSMemoryMap, + IN ULONG AddressRangeCount) +{ + ULONG i; + + DPRINT1("Base\t\tLength\t\tType\n"); + for (i = 0; i < AddressRangeCount; i++) + { + DPRINT1("%08lX\t%08lX\t%d\n", + BIOSMemoryMap[i].BaseAddrLow, + BIOSMemoryMap[i].LengthLow, + BIOSMemoryMap[i].Type); + } } VOID @@ -269,8 +300,7 @@ Md->MemoryType == LoaderHalCode) { if (Md->BasePage+Md->PageCount > LastKrnlPhysAddr) - LastKrnlPhysAddr = Md->BasePage+Md->PageCount; - + LastKrnlPhysAddr = Md->BasePage+Md->PageCount; } } @@ -293,6 +323,7 @@ /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); + if (MiDbgEnableMdDump) MiDbgDumpBiosMap(BIOSMemoryMap, AddressRangeCount); /* Set the page directory */ PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); @@ -322,19 +353,9 @@ RtlZeroMemory(&MmStats, sizeof(MmStats)); /* Count RAM */ - MmStats.NrTotalPages = MiCountFreePagesInLoaderBlock(KeLoaderBlock); - MmNumberOfPhysicalPages = MmStats.NrTotalPages; - if (!MmStats.NrTotalPages) - { - DbgPrint("Memory not detected, default to 8 MB\n"); - MmStats.NrTotalPages = 2048; - } - else - { - /* HACK: add 1MB for standard memory (not extended). Why? */ - DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024); - MmStats.NrTotalPages += 256; - } + MiCountFreePagesInLoaderBlock(KeLoaderBlock); + MmStats.NrTotalPages = MmNumberOfPhysicalPages; + DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024); /* Initialize the kernel address space */ MmInitializeKernelAddressSpace(); @@ -343,7 +364,7 @@ /* Initialize the page list */ LastKernelAddress = (ULONG_PTR)MmInitializePageList(FirstKrnlPhysAddr, LastKrnlPhysAddr, - MmStats.NrTotalPages, + MmHighestPhysicalPage, PAGE_ROUND_UP(LastKernelAddress), BIOSMemoryMap, AddressRangeCount);

16 years, 8 months

[ros-arm-bringup] 32358: Why divide up the page array into chunks of 128 pages? Why have a nested loop to initialize system memory in chunks of 128 pages? Why zero the array entries in chunks of 128? The page array is now initialized by simply iterating every page on the system, and filling out its entry in the array. Moved out the division calculations even one more step out of the loop -- now they're really calculated once, instead of 1000 times (an improvement over the 400000 times they were

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Feb 14 19:59:14 2008 New Revision: 32358 URL: http://svn.reactos.org/svn/reactos?rev=32358&view=rev Log: Why divide up the page array into chunks of 128 pages? Why have a nested loop to initialize system memory in chunks of 128 pages? Why zero the array entries in chunks of 128? The page array is now initialized by simply iterating every page on the system, and filling out its entry in the array. Moved out the division calculations even one more step out of the loop -- now they're really calculated once, instead of 1000 times (an improvement over the 400000 times they were calculated previously). Modified: trunk/reactos/ntoskrnl/mm/freelist.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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 19:59:14 2008 @@ -292,7 +292,10 @@ NTSTATUS Status; PFN_TYPE LastPage, Pfn; ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; - + ULONG PdePageStart, PdePageEnd; + ULONG VideoPageStart, VideoPageEnd; + ULONG KernelPageStart, KernelPageEnd; + /* Initialize the page lists */ KeInitializeSpinLock(&PageListLock); InitializeListHead(&UserPageListHead); @@ -341,133 +344,119 @@ } } - /* Now loop every PFN database page again */ - for (i = 0; i < Reserved; i++) - { - PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); - ULONG j, start, end; - ULONG PdePageStart, PdePageEnd; - ULONG VideoPageStart, VideoPageEnd; - ULONG KernelPageStart, KernelPageEnd; - - /* Clear the page array entry */ - memset(Address, 0, PAGE_SIZE); - - /* Do the next page'ss worth of entries */ - start = ((ULONG_PTR)Address - (ULONG_PTR)MmPageArray) / sizeof(PHYSICAL_PAGE); - end = ((ULONG_PTR)Address - (ULONG_PTR)MmPageArray + PAGE_SIZE) / sizeof(PHYSICAL_PAGE); - - /* We'll be applying a bunch of hacks -- precompute some static values */ - PdePageStart = PdeStart / PAGE_SIZE; - PdePageEnd = MmFreeLdrPageDirectoryEnd / PAGE_SIZE; - VideoPageStart = 0xA0000 / PAGE_SIZE; - VideoPageEnd = 0x100000 / PAGE_SIZE; - KernelPageStart = FirstPhysKernelAddress / PAGE_SIZE; - KernelPageEnd = LastPhysKernelAddress / PAGE_SIZE; - - /* Loop each page in this chunk */ - for (j = start; j < end; j++) + /* Clear the PFN database */ + RtlZeroMemory(MmPageArray, MmPageArraySize * sizeof(PHYSICAL_PAGE)); + + /* We'll be applying a bunch of hacks -- precompute some static values */ + PdePageStart = PdeStart / PAGE_SIZE; + PdePageEnd = MmFreeLdrPageDirectoryEnd / PAGE_SIZE; + VideoPageStart = 0xA0000 / PAGE_SIZE; + VideoPageEnd = 0x100000 / PAGE_SIZE; + KernelPageStart = FirstPhysKernelAddress / PAGE_SIZE; + KernelPageEnd = LastPhysKernelAddress / PAGE_SIZE; + + /* Loop every page on the system */ + for (i = 0; i < MmPageArraySize; i++) + { + /* Check if it's part of RAM */ + if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, i)) { - /* Check if it's part of RAM */ - if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, j)) - { - /* Apply assumptions that all computers are built the same way */ - if (j == 0) - { - /* Page 0 is reserved for the IVT */ - MmPageArray[0].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[0].Flags.Consumer = MC_NPPOOL; - MmPageArray[0].Flags.Zero = 0; - MmPageArray[0].ReferenceCount = 0; - MmStats.NrReservedPages++; - } - else if (j == 1) - { - /* Page 1 is reserved for the PCR */ - MmPageArray[1].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[1].Flags.Consumer = MC_NPPOOL; - MmPageArray[1].Flags.Zero = 0; - MmPageArray[1].ReferenceCount = 1; - MmStats.NrReservedPages++; - } - else if (j == 2) - { - /* Page 2 is reserved for the KUSER_SHARED_DATA */ - MmPageArray[2].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[2].Flags.Consumer = MC_NPPOOL; - MmPageArray[2].Flags.Zero = 0; - MmPageArray[2].ReferenceCount = 1; - MmStats.NrReservedPages++; - } - else if ((j >= PdePageStart) && (j < PdePageEnd)) - { - /* These pages contain the initial FreeLDR PDEs */ - MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[j].Flags.Zero = 0; - MmPageArray[j].Flags.Consumer = MC_NPPOOL; - MmPageArray[j].ReferenceCount = 1; - MmStats.NrReservedPages++; - } - else if ((j >= VideoPageStart) && (j < VideoPageEnd)) - { - /* - * These pages are usually for the Video ROM BIOS. - * Supposedly anyway. We'll simply ignore the fact that - * many systems have this area somewhere else entirely - * (which we'll assume to be "free" a couple of lines below) - */ - MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[j].Flags.Zero = 0; - MmPageArray[j].Flags.Consumer = MC_NPPOOL; - MmPageArray[j].ReferenceCount = 1; - MmStats.NrReservedPages++; - } - else if ((j >= KernelPageStart) && (j < KernelPageEnd)) - { - /* These are pages beloning to the kernel */ - MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[j].Flags.Zero = 0; - MmPageArray[j].Flags.Consumer = MC_NPPOOL; - MmPageArray[j].ReferenceCount = 2; - MmPageArray[j].MapCount = 1; - MmStats.NrSystemPages++; - } - else if (j > LastPage) - { - /* These are pages we allocated above to hold the PFN DB */ - MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[j].Flags.Zero = 0; - MmPageArray[j].Flags.Consumer = MC_NPPOOL; - MmPageArray[j].ReferenceCount = 2; - MmPageArray[j].MapCount = 1; - MmStats.NrSystemPages++; - } - else - { - /* - * These are supposedly free pages. - * By the way, not all of them are, some contain vital - * FreeLDR data, but since we choose to ignore the Memory - * Descriptor List, why bother, right? - */ - MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_FREE; - MmPageArray[j].Flags.Zero = 0; - MmPageArray[j].ReferenceCount = 0; - InsertTailList(&FreeUnzeroedPageListHead, - &MmPageArray[j].ListEntry); - UnzeroedPageCount++; - MmStats.NrFreePages++; - } + /* Apply assumptions that all computers are built the same way */ + if (i == 0) + { + /* Page 0 is reserved for the IVT */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Consumer = MC_NPPOOL; + MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].ReferenceCount = 0; + MmStats.NrReservedPages++; + } + else if (i == 1) + { + /* Page 1 is reserved for the PCR */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Consumer = MC_NPPOOL; + MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].ReferenceCount = 1; + MmStats.NrReservedPages++; + } + else if (i == 2) + { + /* Page 2 is reserved for the KUSER_SHARED_DATA */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Consumer = MC_NPPOOL; + MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].ReferenceCount = 1; + MmStats.NrReservedPages++; + } + else if ((i >= PdePageStart) && (i < PdePageEnd)) + { + /* These pages contain the initial FreeLDR PDEs */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].Flags.Consumer = MC_NPPOOL; + MmPageArray[i].ReferenceCount = 1; + MmStats.NrReservedPages++; + } + else if ((i >= VideoPageStart) && (i < VideoPageEnd)) + { + /* + * These pages are usually for the Video ROM BIOS. + * Supposedly anyway. We'll simply ignore the fact that + * many systems have this area somewhere else entirely + * (which we'll assume to be "free" a couple of lines below) + */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].Flags.Consumer = MC_NPPOOL; + MmPageArray[i].ReferenceCount = 1; + MmStats.NrReservedPages++; + } + else if ((i >= KernelPageStart) && (i < KernelPageEnd)) + { + /* These are pages beloning to the kernel */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; + MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].Flags.Consumer = MC_NPPOOL; + MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].MapCount = 1; + MmStats.NrSystemPages++; + } + else if (i > LastPage) + { + /* These are pages we allocated above to hold the PFN DB */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; + MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].Flags.Consumer = MC_NPPOOL; + MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].MapCount = 1; + MmStats.NrSystemPages++; } else { - /* These are pages reserved by the BIOS/ROMs */ - MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[j].Flags.Consumer = MC_NPPOOL; - MmPageArray[j].Flags.Zero = 0; - MmPageArray[j].ReferenceCount = 0; - MmStats.NrReservedPages++; - } + /* + * These are supposedly free pages. + * By the way, not all of them are, some contain vital + * FreeLDR data, but since we choose to ignore the Memory + * Descriptor List, why bother, right? + */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_FREE; + MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].ReferenceCount = 0; + InsertTailList(&FreeUnzeroedPageListHead, + &MmPageArray[i].ListEntry); + UnzeroedPageCount++; + MmStats.NrFreePages++; + } + } + else + { + /* These are pages reserved by the BIOS/ROMs */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Consumer = MC_NPPOOL; + MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].ReferenceCount = 0; + MmStats.NrReservedPages++; } }

16 years, 8 months

[ros-arm-bringup] 32357: Don't loop the page array list THREE times to set it up, ONCE is plenty enough! Remove the incomprehensible PFN allocation being done for the pages holding the page list array. We now: 1) Find the highest usable RAM page 2) Allocate the PTEs to hold the array from that point on and lower. Don't do expensive divisions for every single page on the system being looped! Precompute the values ONCE. Don't set the reference count for the KPCR and KUSER_SHARED_DATA to 0, these a

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Feb 14 19:40:32 2008 New Revision: 32357 URL: http://svn.reactos.org/svn/reactos?rev=32357&view=rev Log: Don't loop the page array list THREE times to set it up, ONCE is plenty enough! Remove the incomprehensible PFN allocation being done for the pages holding the page list array. We now: 1) Find the highest usable RAM page 2) Allocate the PTEs to hold the array from that point on and lower. Don't do expensive divisions for every single page on the system being looped! Precompute the values ONCE. Don't set the reference count for the KPCR and KUSER_SHARED_DATA to 0, these are LIVE pages! Removed the hack which pre-initializes the balancer -- this isn't needed anymore since the initial PTEs are allocated always from RAM now. Add some comments about the assumptions being made in this code regarding all PCs having the same kind of memory maps. Modified: trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 19:40:32 2008 @@ -290,55 +290,40 @@ ULONG i; ULONG Reserved; NTSTATUS Status; - PFN_TYPE LastPage; - PFN_TYPE FirstUninitializedPage; + PFN_TYPE LastPage, Pfn; ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; + /* Initialize the page lists */ KeInitializeSpinLock(&PageListLock); InitializeListHead(&UserPageListHead); InitializeListHead(&FreeUnzeroedPageListHead); InitializeListHead(&FreeZeroedPageListHead); - LastKernelAddress = PAGE_ROUND_UP(LastKernelAddress); - LastPhysKernelAddress = (ULONG_PTR)PAGE_ROUND_UP(LastPhysKernelAddress); - + /* Set the size and start of the PFN Database */ MmPageArraySize = MemorySizeInPages; MmPageArray = (PHYSICAL_PAGE *)LastKernelAddress; - Reserved = PAGE_ROUND_UP((MmPageArraySize * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; + + /* Update the last kernel address pointers */ LastKernelAddress = ((ULONG_PTR)LastKernelAddress + (Reserved * PAGE_SIZE)); LastPhysKernelAddress = (ULONG_PTR)LastPhysKernelAddress + (Reserved * PAGE_SIZE); - /* Preinitialize the Balancer because we need some pages for pte's */ - MmInitializeBalancer(MemorySizeInPages, 0); - - FirstUninitializedPage = (ULONG_PTR)LastPhysKernelAddress / PAGE_SIZE; + /* Find the highest usable page */ LastPage = MmPageArraySize; + while (TRUE) if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, --LastPage)) break; + + /* Loop every page required to hold the PFN database */ for (i = 0; i < Reserved; i++) { PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); - ULONG j, start, end; - + + /* Check if FreeLDR has already allocated it for us */ if (!MmIsPagePresent(NULL, Address)) { - PFN_TYPE Pfn; - Pfn = 0; - while (Pfn == 0 && LastPage > FirstUninitializedPage) - { - /* Allocate the page from the upper end of the RAM */ - if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, --LastPage)) - { - Pfn = LastPage; - } - } - if (Pfn == 0) - { - Pfn = MmAllocPage(MC_NPPOOL, 0); - if (Pfn == 0) - { - KEBUGCHECK(0); - } - } + /* Use one of our highest usable pages */ + Pfn = LastPage--; + + /* Set the PFN */ Status = MmCreateVirtualMappingForKernel(Address, PAGE_READWRITE, &Pfn, @@ -351,24 +336,45 @@ } else { - /* Setting the page protection is necessary to set the global bit on IA32 */ + /* Setting the page protection is necessary to set the global bit */ MmSetPageProtect(NULL, Address, PAGE_READWRITE); } + } + + /* Now loop every PFN database page again */ + for (i = 0; i < Reserved; i++) + { + PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); + ULONG j, start, end; + ULONG PdePageStart, PdePageEnd; + ULONG VideoPageStart, VideoPageEnd; + ULONG KernelPageStart, KernelPageEnd; + /* Clear the page array entry */ memset(Address, 0, PAGE_SIZE); + /* Do the next page'ss worth of entries */ start = ((ULONG_PTR)Address - (ULONG_PTR)MmPageArray) / sizeof(PHYSICAL_PAGE); end = ((ULONG_PTR)Address - (ULONG_PTR)MmPageArray + PAGE_SIZE) / sizeof(PHYSICAL_PAGE); - for (j = start; j < end && j < LastPage; j++) + /* We'll be applying a bunch of hacks -- precompute some static values */ + PdePageStart = PdeStart / PAGE_SIZE; + PdePageEnd = MmFreeLdrPageDirectoryEnd / PAGE_SIZE; + VideoPageStart = 0xA0000 / PAGE_SIZE; + VideoPageEnd = 0x100000 / PAGE_SIZE; + KernelPageStart = FirstPhysKernelAddress / PAGE_SIZE; + KernelPageEnd = LastPhysKernelAddress / PAGE_SIZE; + + /* Loop each page in this chunk */ + for (j = start; j < end; j++) { + /* Check if it's part of RAM */ if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, j)) { + /* Apply assumptions that all computers are built the same way */ if (j == 0) { - /* - * Page zero is reserved for the IVT - */ + /* Page 0 is reserved for the IVT */ MmPageArray[0].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[0].Flags.Consumer = MC_NPPOOL; MmPageArray[0].Flags.Zero = 0; @@ -377,58 +383,73 @@ } else if (j == 1) { - - /* - * Page one is reserved for the initial KPCR - */ + /* Page 1 is reserved for the PCR */ MmPageArray[1].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[1].Flags.Consumer = MC_NPPOOL; MmPageArray[1].Flags.Zero = 0; - MmPageArray[1].ReferenceCount = 0; + MmPageArray[1].ReferenceCount = 1; MmStats.NrReservedPages++; } else if (j == 2) { - /* - * Page two is reserved for the KUSER_SHARED_DATA - */ + /* Page 2 is reserved for the KUSER_SHARED_DATA */ MmPageArray[2].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[2].Flags.Consumer = MC_NPPOOL; MmPageArray[2].Flags.Zero = 0; - MmPageArray[2].ReferenceCount = 0; + MmPageArray[2].ReferenceCount = 1; MmStats.NrReservedPages++; } - /* Protect the Page Directory. This will be changed in r3 */ - else if (j >= (PdeStart / PAGE_SIZE) && j < (MmFreeLdrPageDirectoryEnd / PAGE_SIZE)) + else if ((j >= PdePageStart) && (j < PdePageEnd)) { + /* These pages contain the initial FreeLDR PDEs */ MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[j].Flags.Zero = 0; MmPageArray[j].Flags.Consumer = MC_NPPOOL; MmPageArray[j].ReferenceCount = 1; MmStats.NrReservedPages++; } - else if (j >= 0xa0000 / PAGE_SIZE && j < 0x100000 / PAGE_SIZE) + else if ((j >= VideoPageStart) && (j < VideoPageEnd)) { + /* + * These pages are usually for the Video ROM BIOS. + * Supposedly anyway. We'll simply ignore the fact that + * many systems have this area somewhere else entirely + * (which we'll assume to be "free" a couple of lines below) + */ MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[j].Flags.Zero = 0; MmPageArray[j].Flags.Consumer = MC_NPPOOL; MmPageArray[j].ReferenceCount = 1; MmStats.NrReservedPages++; } - else if (j >= (ULONG)FirstPhysKernelAddress/PAGE_SIZE && - j < (ULONG)LastPhysKernelAddress/PAGE_SIZE) + else if ((j >= KernelPageStart) && (j < KernelPageEnd)) { + /* These are pages beloning to the kernel */ MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[j].Flags.Zero = 0; MmPageArray[j].Flags.Consumer = MC_NPPOOL; - /* Reference count 2, because we're having ReferenceCount track - MapCount as well. */ + MmPageArray[j].ReferenceCount = 2; + MmPageArray[j].MapCount = 1; + MmStats.NrSystemPages++; + } + else if (j > LastPage) + { + /* These are pages we allocated above to hold the PFN DB */ + MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_USED; + MmPageArray[j].Flags.Zero = 0; + MmPageArray[j].Flags.Consumer = MC_NPPOOL; MmPageArray[j].ReferenceCount = 2; MmPageArray[j].MapCount = 1; MmStats.NrSystemPages++; } else { + /* + * These are supposedly free pages. + * By the way, not all of them are, some contain vital + * FreeLDR data, but since we choose to ignore the Memory + * Descriptor List, why bother, right? + */ MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_FREE; MmPageArray[j].Flags.Zero = 0; MmPageArray[j].ReferenceCount = 0; @@ -440,36 +461,13 @@ } else { + /* These are pages reserved by the BIOS/ROMs */ MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[j].Flags.Consumer = MC_NPPOOL; MmPageArray[j].Flags.Zero = 0; MmPageArray[j].ReferenceCount = 0; MmStats.NrReservedPages++; } - } - FirstUninitializedPage = j; - - } - - /* Add the pages from the upper end to the list */ - for (i = LastPage; i < MmPageArraySize; i++) - { - if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, i)) - { - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 2; - MmPageArray[i].MapCount = 1; - MmStats.NrSystemPages++; - } - else - { - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 0; - MmStats.NrReservedPages++; } } Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Feb 14 19:40:32 2008 @@ -307,7 +307,7 @@ FirstKrnlPhysAddr = (ULONG_PTR)LdrEntry->DllBase - KSEG0_BASE; /* Get the last kernel address */ - LastKrnlPhysAddr = MiGetLastKernelAddress(); + LastKrnlPhysAddr = PAGE_ROUND_UP(MiGetLastKernelAddress()); LastKernelAddress = LastKrnlPhysAddr | KSEG0_BASE; /* Set memory limits */

16 years, 8 months

[ros-arm-bringup] 32356: The Memory Manager design dictated that every page must be on a linked list, so that it can be removed from that list when dereferenced, and inserted on the free list. This wasn't optimal, because the UsedPageListHead was actually not used for anything else than working set and user-page LRU. Nevertheless, every single page on the system would be on a list (such as the non-pool memory list), even if those lists were ignored. Those lists are all gone now, replaced by the

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Feb 14 18:36:12 2008 New Revision: 32356 URL: http://svn.reactos.org/svn/reactos?rev=32356&view=rev Log: The Memory Manager design dictated that every page must be on a linked list, so that it can be removed from that list when dereferenced, and inserted on the free list. This wasn't optimal, because the UsedPageListHead was actually not used for anything else than working set and user-page LRU. Nevertheless, every single page on the system would be on a list (such as the non-pool memory list), even if those lists were ignored. Those lists are all gone now, replaced by the UsedPageListHead. Likewise, the BIOS page list has also been removed. Modified: trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.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 (original) +++ trunk/reactos/ntoskrnl/mm/balance.c Thu Feb 14 18:36:12 2008 @@ -263,7 +263,7 @@ { KEBUGCHECK(NO_PAGES_AVAILABLE); } - MmTransferOwnershipPage(Page, Consumer); + MmSetLRULastPage(Page); *AllocatedPage = Page; (void)InterlockedDecrementUL(&MiPagesRequired); return(STATUS_SUCCESS); 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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 18:36:12 2008 @@ -56,10 +56,9 @@ ULONG MmPageArraySize; static KSPIN_LOCK PageListLock; -static LIST_ENTRY UsedPageListHeads[MC_MAXIMUM]; +static LIST_ENTRY UserPageListHead; static LIST_ENTRY FreeZeroedPageListHead; static LIST_ENTRY FreeUnzeroedPageListHead; -static LIST_ENTRY BiosPageListHead; static KEVENT ZeroPageThreadEvent; static BOOLEAN ZeroPageThreadShouldTerminate = FALSE; @@ -68,36 +67,6 @@ /* FUNCTIONS *************************************************************/ -VOID -NTAPI -MmTransferOwnershipPage(PFN_TYPE Pfn, ULONG NewConsumer) -{ - KIRQL oldIrql; - - KeAcquireSpinLock(&PageListLock, &oldIrql); - if (MmPageArray[Pfn].MapCount != 0) - { - DPRINT1("Transfering mapped page.\n"); - KEBUGCHECK(0); - } - if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) - { - DPRINT1("Type: %d\n", MmPageArray[Pfn].Flags.Type); - KEBUGCHECK(0); - } - if (MmPageArray[Pfn].ReferenceCount != 1) - { - DPRINT1("ReferenceCount: %d\n", MmPageArray[Pfn].ReferenceCount); - KEBUGCHECK(0); - } - RemoveEntryList(&MmPageArray[Pfn].ListEntry); - InsertTailList(&UsedPageListHeads[NewConsumer], - &MmPageArray[Pfn].ListEntry); - MmPageArray[Pfn].Flags.Consumer = NewConsumer; - KeReleaseSpinLock(&PageListLock, oldIrql); - MiZeroPage(Pfn); -} - PFN_TYPE NTAPI MmGetLRUFirstUserPage(VOID) @@ -107,8 +76,8 @@ KIRQL oldIrql; KeAcquireSpinLock(&PageListLock, &oldIrql); - NextListEntry = UsedPageListHeads[MC_USER].Flink; - if (NextListEntry == &UsedPageListHeads[MC_USER]) + NextListEntry = UserPageListHead.Flink; + if (NextListEntry == &UserPageListHead) { KeReleaseSpinLock(&PageListLock, oldIrql); return 0; @@ -130,7 +99,7 @@ MmPageArray[Pfn].Flags.Consumer == MC_USER) { RemoveEntryList(&MmPageArray[Pfn].ListEntry); - InsertTailList(&UsedPageListHeads[MC_USER], + InsertTailList(&UserPageListHead, &MmPageArray[Pfn].ListEntry); } KeReleaseSpinLock(&PageListLock, oldIrql); @@ -148,13 +117,13 @@ if (MmPageArray[PreviousPfn].Flags.Type != MM_PHYSICAL_PAGE_USED || MmPageArray[PreviousPfn].Flags.Consumer != MC_USER) { - NextListEntry = UsedPageListHeads[MC_USER].Flink; + NextListEntry = UserPageListHead.Flink; } else { NextListEntry = MmPageArray[PreviousPfn].ListEntry.Flink; } - if (NextListEntry == &UsedPageListHeads[MC_USER]) + if (NextListEntry == &UserPageListHead) { KeReleaseSpinLock(&PageListLock, oldIrql); return 0; @@ -245,8 +214,6 @@ MmPageArray[i].LockCount = 0; MmPageArray[i].MapCount = 0; MmPageArray[i].SavedSwapEntry = 0; - InsertTailList(&UsedPageListHeads[MC_NPPOOL], - &MmPageArray[i].ListEntry); } KeReleaseSpinLock(&PageListLock, oldIrql); for (i = start; i < (start + length); i++) @@ -328,10 +295,9 @@ ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; KeInitializeSpinLock(&PageListLock); - for (i = 0; i < MC_MAXIMUM; i++) InitializeListHead(&UsedPageListHeads[i]); + InitializeListHead(&UserPageListHead); InitializeListHead(&FreeUnzeroedPageListHead); InitializeListHead(&FreeZeroedPageListHead); - InitializeListHead(&BiosPageListHead); LastKernelAddress = PAGE_ROUND_UP(LastKernelAddress); LastPhysKernelAddress = (ULONG_PTR)PAGE_ROUND_UP(LastPhysKernelAddress); @@ -340,7 +306,6 @@ MmPageArray = (PHYSICAL_PAGE *)LastKernelAddress; Reserved = PAGE_ROUND_UP((MmPageArraySize * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; - DPRINT("Reserved %d\n", Reserved); LastKernelAddress = ((ULONG_PTR)LastKernelAddress + (Reserved * PAGE_SIZE)); LastPhysKernelAddress = (ULONG_PTR)LastPhysKernelAddress + (Reserved * PAGE_SIZE); @@ -353,6 +318,7 @@ { PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); ULONG j, start, end; + if (!MmIsPagePresent(NULL, Address)) { PFN_TYPE Pfn; @@ -388,6 +354,7 @@ /* Setting the page protection is necessary to set the global bit on IA32 */ MmSetPageProtect(NULL, Address, PAGE_READWRITE); } + memset(Address, 0, PAGE_SIZE); start = ((ULONG_PTR)Address - (ULONG_PTR)MmPageArray) / sizeof(PHYSICAL_PAGE); @@ -406,8 +373,6 @@ MmPageArray[0].Flags.Consumer = MC_NPPOOL; MmPageArray[0].Flags.Zero = 0; MmPageArray[0].ReferenceCount = 0; - InsertTailList(&BiosPageListHead, - &MmPageArray[0].ListEntry); MmStats.NrReservedPages++; } else if (j == 1) @@ -420,8 +385,6 @@ MmPageArray[1].Flags.Consumer = MC_NPPOOL; MmPageArray[1].Flags.Zero = 0; MmPageArray[1].ReferenceCount = 0; - InsertTailList(&BiosPageListHead, - &MmPageArray[1].ListEntry); MmStats.NrReservedPages++; } else if (j == 2) @@ -433,8 +396,6 @@ MmPageArray[2].Flags.Consumer = MC_NPPOOL; MmPageArray[2].Flags.Zero = 0; MmPageArray[2].ReferenceCount = 0; - InsertTailList(&BiosPageListHead, - &MmPageArray[2].ListEntry); MmStats.NrReservedPages++; } /* Protect the Page Directory. This will be changed in r3 */ @@ -444,8 +405,6 @@ MmPageArray[j].Flags.Zero = 0; MmPageArray[j].Flags.Consumer = MC_NPPOOL; MmPageArray[j].ReferenceCount = 1; - InsertTailList(&BiosPageListHead, - &MmPageArray[j].ListEntry); MmStats.NrReservedPages++; } else if (j >= 0xa0000 / PAGE_SIZE && j < 0x100000 / PAGE_SIZE) @@ -454,8 +413,6 @@ MmPageArray[j].Flags.Zero = 0; MmPageArray[j].Flags.Consumer = MC_NPPOOL; MmPageArray[j].ReferenceCount = 1; - InsertTailList(&BiosPageListHead, - &MmPageArray[j].ListEntry); MmStats.NrReservedPages++; } else if (j >= (ULONG)FirstPhysKernelAddress/PAGE_SIZE && @@ -468,8 +425,6 @@ MapCount as well. */ MmPageArray[j].ReferenceCount = 2; MmPageArray[j].MapCount = 1; - InsertTailList(&UsedPageListHeads[MC_NPPOOL], - &MmPageArray[j].ListEntry); MmStats.NrSystemPages++; } else @@ -489,8 +444,6 @@ MmPageArray[j].Flags.Consumer = MC_NPPOOL; MmPageArray[j].Flags.Zero = 0; MmPageArray[j].ReferenceCount = 0; - InsertTailList(&BiosPageListHead, - &MmPageArray[j].ListEntry); MmStats.NrReservedPages++; } } @@ -508,8 +461,6 @@ MmPageArray[i].Flags.Consumer = MC_NPPOOL; MmPageArray[i].ReferenceCount = 2; MmPageArray[i].MapCount = 1; - InsertTailList(&UsedPageListHeads[MC_NPPOOL], - &MmPageArray[i].ListEntry); MmStats.NrSystemPages++; } else @@ -518,8 +469,6 @@ MmPageArray[i].Flags.Consumer = MC_NPPOOL; MmPageArray[i].Flags.Zero = 0; MmPageArray[i].ReferenceCount = 0; - InsertTailList(&BiosPageListHead, - &MmPageArray[i].ListEntry); MmStats.NrReservedPages++; } } @@ -764,7 +713,7 @@ { MmStats.NrFreePages++; MmStats.NrSystemPages--; - RemoveEntryList(&MmPageArray[Pfn].ListEntry); + if (MmPageArray[Pfn].Flags.Consumer == MC_USER) RemoveEntryList(&MmPageArray[Pfn].ListEntry); if (MmPageArray[Pfn].RmapListHead != NULL) { DPRINT1("Freeing page with rmap entries.\n"); @@ -953,7 +902,6 @@ PageDescriptor->LockCount = 0; PageDescriptor->MapCount = 0; PageDescriptor->SavedSwapEntry = SavedSwapEntry; - InsertTailList(&UsedPageListHeads[Consumer], ListEntry); MmStats.NrSystemPages++; MmStats.NrFreePages--; @@ -961,6 +909,7 @@ KeReleaseSpinLock(&PageListLock, oldIrql); PfnOffset = PageDescriptor - MmPageArray; + MmSetLRULastPage(PfnOffset); if (NeedClear) { MiZeroPage(PfnOffset); @@ -1053,7 +1002,6 @@ PageDescriptor->LockCount = 0; PageDescriptor->MapCount = 0; PageDescriptor->SavedSwapEntry = 0; /* FIXME: Do we need swap entries? */ - InsertTailList(&UsedPageListHeads[Consumer], &PageDescriptor->ListEntry); MmStats.NrSystemPages++; MmStats.NrFreePages--; @@ -1061,6 +1009,7 @@ /* Remember the page */ pfn = PageDescriptor - MmPageArray; Pages[NumberOfPagesFound++] = pfn; + MmSetLRULastPage(pfn); } } else @@ -1087,8 +1036,6 @@ PageDescriptor->LockCount = 0; PageDescriptor->MapCount = 0; PageDescriptor->SavedSwapEntry = 0; /* FIXME: Do we need swap entries? */ - RemoveEntryList(&PageDescriptor->ListEntry); - InsertTailList(&UsedPageListHeads[Consumer], &PageDescriptor->ListEntry); if (!PageDescriptor->Flags.Zero) UnzeroedPageCount--; @@ -1097,6 +1044,7 @@ /* Remember the page */ Pages[NumberOfPagesFound++] = pfn; + MmSetLRULastPage(pfn); if (NumberOfPagesFound == NumberOfPages) break; }

16 years, 8 months

[dreimer] 32355: Bug 3053: some slovak translations by Mario Kacmar - kario@szm.sk Bug 3066: Recent usetup polish translation update by Olaf Siejka - olaf_siejka@o2.pl

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Feb 14 14:30:14 2008 New Revision: 32355 URL: http://svn.reactos.org/svn/reactos?rev=32355&view=rev Log: Bug 3053: some slovak translations by Mario Kacmar - kario(a)szm.sk Bug 3066: Recent usetup polish translation update by Olaf Siejka - olaf_siejka(a)o2.pl Added: trunk/reactos/base/applications/cmdutils/find/lang/sk-SK.rc (with props) Modified: trunk/reactos/base/applications/cacls/lang/sk-SK.rc trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/control/lang/sk-SK.rc trunk/reactos/base/applications/logoff/lang/sk-SK.rc trunk/reactos/base/applications/shutdown/lang/sk-SK.rc trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/sk-SK.h Modified: trunk/reactos/base/applications/cacls/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/cacls/lang/sk-SK.rc Thu Feb 14 14:30:14 2008 @@ -1,44 +1,44 @@ -//Slovak language file by Mário Kaèmár aka Kario (kario(a)szm.sk) 16-01-2008 +//Slovak language file by M rio Kam r aka Kario (kario(a)szm.sk) 16-01-2008 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_HELP, "Zobrazí alebo zmení zoznamy prístupových práv (Access Control List) súborov.\n\n\ -CACLS názov_súboru [/T] [/E] [/C] [/G pouívate¾:povolenia [...]]\n\ - [/R pouívate¾ [...]] [/P pouívate¾:povolenia [...]]\n\ - [/D pouívate¾ [...]]\n\ - názov_súboru Zobrazí zoznamy ACL.\n\ - /T Zmení zoznamy ACL pecifikovaných súborov\n\ - v aktuálnom adresári a vo vetkých podadresároch.\n\ - /E Upraví zoznam ACL namiesto jeho nahradenia.\n\ - /C Pokraèovanie pri chybách odmietnutia prístupu.\n\ - /G pouívate¾:povolenia\n\ - Udelí pecifikovanému pouívate¾ovi prístupové práva.\n\ - Povolenia môu by: R èítanie\n\ - W zápis\n\ - C zmena (zápis)\n\ - F úplný prístup\n\ - /R pouívate¾ Odoberie pecifikovaným pouívate¾om prístupové práva\n\ - (platné iba s prepínaèom /E).\n\ - /P pouívate¾:povolenia\n\ - Nahradí pecifikovaným pouívate¾om prístupové práva.\n\ - Povolenia môu by: N iadne\n\ - R èítanie\n\ - W zápis\n\ - C zmena (zápis)\n\ - F úplný prístup\n\ - /D pouívate¾ Odoprie pecifikovanému pouívate¾ovi prístup.\n\ -Náhradné znaky sa dajú poui na pecifikovanie viacerých súborov v jednom\n\ -príkaze. Rovnako môete pecifikova aj viacerých pouívate¾ov v príkaze.\n\n\ +IDS_HELP, "Zobraz¡ alebo zmen¡ zoznamy pr¡stupovìch pr v (Access Control List) s£borov.\n\n\ +CACLS n zov_s£boru [/T] [/E] [/C] [/G pou§¡vate:povolenia [...]]\n\ + [/R pou§¡vate [...]] [/P pou§¡vate:povolenia [...]]\n\ + [/D pou§¡vate [...]]\n\ + n zov_s£boru Zobraz¡ zoznamy ACL.\n\ + /T Zmen¡ zoznamy ACL çpecifikovanìch s£borov\n\ + v aktu lnom adres ri a vo vçetkìch podadres roch.\n\ + /E Uprav¡ zoznam ACL namiesto jeho nahradenia.\n\ + /C Pokraovanie pri chyb ch odmietnutia pr¡stupu.\n\ + /G pou§¡vate:povolenia\n\ + Udel¡ çpecifikovanmu pou§¡vateovi pr¡stupov pr va.\n\ + Povolenia m§u by: R ¡tanie\n\ + W z pis\n\ + C zmena (z pis)\n\ + F £plnì pr¡stup\n\ + /R pou§¡vate Odoberie çpecifikovanìm pou§¡vateom pr¡stupov pr va\n\ + (platn iba s prep¡naom /E).\n\ + /P pou§¡vate:povolenia\n\ + Nahrad¡ çpecifikovanìm pou§¡vateom pr¡stupov pr va.\n\ + Povolenia m§u by: N §iadne\n\ + R ¡tanie\n\ + W z pis\n\ + C zmena (z pis)\n\ + F £plnì pr¡stup\n\ + /D pou§¡vate Odoprie çpecifikovanmu pou§¡vateovi pr¡stup.\n\ +N hradn znaky sa daj£ pou§i na çpecifikovanie viacerìch s£borov v jednom\n\ +pr¡kaze. Rovnako m§ete çpecifikova aj viacerìch pou§¡vateov v pr¡kaze.\n\n\ Skratky:\n\ - CI - Kontajnerové dedenie.\n\ - ACE bude zdedené po adresároch.\n\ - OI - Objektové dedenie.\n\ - ACE bude zdedené po súboroch.\n\ - IO - Iba zdedi.\n\ - ACE sa neaplikuje na aktuálny súbor alebo adresár.\n" + CI - Kontajnerov dedenie.\n\ + ACE bude zdeden po adres roch.\n\ + OI - Objektov dedenie.\n\ + ACE bude zdeden po s£boroch.\n\ + IO - Iba zdedi.\n\ + ACE sa neaplikuje na aktu lny s£bor alebo adres r.\n" IDS_ABBR_CI, "(CI)" IDS_ABBR_OI, "(OI)" @@ -50,7 +50,7 @@ IDS_ABBR_NONE, "N" IDS_ALLOW, "" IDS_DENY, "(DENY)" -IDS_SPECIAL_ACCESS, "(peciálny prístup:)" +IDS_SPECIAL_ACCESS, "(çpeci lny pr¡stup:)" IDS_GENERIC_READ, "GENERIC_READ" IDS_GENERIC_WRITE, "GENERIC_WRITE" IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" Added: trunk/reactos/base/applications/cmdutils/find/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/cmdutils/find/lang/sk-SK.rc Thu Feb 14 14:30:14 2008 @@ -1,0 +1,21 @@ +/* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 12-02-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Zobraz¡ vçetky riadky s£boru obsahuj£ce hadanì reazec.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"reazec\" [ s£bor... ]\n\ + /C Zobraz¡ poet riadkov, ktor obsahuj£ reazec.\n\ + /I Ignoruje vekos p¡smen.\n\ + /N ¬¡sluje zobrazen riadky, za¡na od 1.\n\ + /V Zobraz¡ vçetky riadky, ktor neobsahuj£ hadanì reazec." + +IDS_NO_SUCH_FILE, "FIND: S£bor %s sa nenaçiel.\n" + +IDS_CANNOT_OPEN, "FIND: S£bor %s sa ned otvori.\n" + +END Propchange: trunk/reactos/base/applications/cmdutils/find/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc Thu Feb 14 14:30:14 2008 @@ -13,4 +13,5 @@ #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/applications/control/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/control/lang/sk-SK.rc Thu Feb 14 14:30:14 2008 @@ -30,8 +30,8 @@ BEGIN IDS_WINDOW_TITLE "Ovládací panel" IDS_ABOUT "Jednoduchý ovládací panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rVydané pod GPL licenciou" - IDS_ABOUT_TITLE "È&o je Ovládací panel" - IDS_NO_ITEMS "No Items in ListView" + IDS_ABOUT_TITLE "Èo je Ovládací panel" + IDS_NO_ITEMS "iadne poloky v zozname" IDS_NAME "Názov" IDS_COMMENT "Komentár" //Comment END Modified: trunk/reactos/base/applications/logoff/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/logoff/lang/sk-SK.rc Thu Feb 14 14:30:14 2008 @@ -10,13 +10,13 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_USAGE, "Ukonèí sedenie.\n\n\ - /v\t\tZobrazí informácie o prebiehajúcich akciách.\n\ - /?\t\tUkáe túto informáciu.\n\n" +IDS_USAGE, "Ukon¡ sedenie.\n\n\ + /v\t\tZobraz¡ inform cie o prebiehaj£cich akci ch.\n\ + /?\t\tUk §e t£to inform ciu.\n\n" -IDS_LOGOFF_REMOTE, "Ukonèovanie sedenia na vzdialenom poèítaèi." -IDS_LOGOFF_LOCAL, "Ukonèovanie aktuálneho sedenia na tomto poèítaèi." +IDS_LOGOFF_REMOTE, "Ukonovanie sedenia na vzdialenom po¡tai." +IDS_LOGOFF_LOCAL, "Ukonovanie aktu lneho sedenia na tomto po¡tai." -IDS_ILLEGAL_PARAM, "Neplatný(é) parameter(e)\n" +IDS_ILLEGAL_PARAM, "Neplatnì() parameter(e)\n" END /* EOF */ Modified: trunk/reactos/base/applications/shutdown/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/shutdown/lang/sk-SK.rc Thu Feb 14 14:30:14 2008 @@ -11,13 +11,13 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_USAGE, "Pouitie: shutdown [-?] [-l | -s | -r] [-f]\n\n\ - iadne argumenty\tZobrazí sa táto správa\n\ - -?\t\t\tZobrazí túto správu\n\ - -l\t\t\tOdhlási pouívate¾a\n\ - -s\t\t\tVypne poèítaè\n\ - -r\t\t\tRetartuje poèítaè\n\ - -f\t\t\tDonúti spustené programy aby sa vypli bez upozornení.\n\ - \t\t\tAk nebol zadaný iadny iný parameter, tak aj odhlási\n\ - \t\t\tpouívate¾a." +IDS_USAGE, "Pou§itie: shutdown [-?] [-l | -s | -r] [-f]\n\n\ + ¦iadne argumenty\tZobraz¡ sa t to spr va\n\ + -?\t\t\tZobraz¡ t£to spr vu\n\ + -l\t\t\tOdhl si pou§¡vatea\n\ + -s\t\t\tVypne po¡ta\n\ + -r\t\t\tReçtartuje po¡ta\n\ + -f\t\t\tDon£ti spusten programy aby sa vypli bez upozornen¡.\n\ + \t\t\tAk nebol zadanì §iadny inì parameter, tak aj odhl si\n\ + \t\t\tpou§¡vatea." END Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Thu Feb 14 14:30:14 2008 @@ -1,5 +1,5 @@ /* - * translated by Caemyr (Jan,2008) + * translated by Caemyr (Jan-Feb, 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -425,7 +425,7 @@ { 6, 24, - " \"Akceptuj ustawienia sprz©tu\" i nacinij ENTER.", + "\"Akceptuj ustawienia sprz©tu\" i nacinij ENTER.", TEXT_NORMAL }, { @@ -522,7 +522,7 @@ { 8, 10, - "\x07 nacinij klawisz GàRA albo Dà by wybra odpowiedni typ komputera.", + "\x07 Nacinij klawisz GàRA albo Dà by wybra odpowiedni typ komputera.", TEXT_NORMAL }, { @@ -659,13 +659,13 @@ }, { 8, 10, - "\x07 Nacinij klawisz GàRA albo Dà by wybra odpowiedni typ komputera", + "\x07 Nacinij klawisz GàRA albo Dà by wybra rozdzielczo i liczb©", TEXT_NORMAL }, { 8, 11, - " a nast©pnie nacinij ENTER.", + " kolor¢w a nast©pnie nacinij ENTER.", TEXT_NORMAL }, { @@ -1092,7 +1092,7 @@ { 8, 11, - " klawiatury. Nast©pnie nacinij ENTER.", + " klawiatury. Nast©pnie nacinij ENTER.", TEXT_NORMAL }, { @@ -1589,25 +1589,25 @@ {STRING_CHOOSENEWPARTITION, "Wybrane: utworzenie nowej partycji na"}, {STRING_HDDSIZE, - "Please enter the size of the new partition in megabytes."}, + "Prosz© wprowadzi rozmiar nowej partycji, w megabajtach."}, {STRING_CREATEPARTITION, " ENTER = Utworzenie Partycji ESC = Anulowanie F3 = Wyjcie"}, {STRING_PARTFORMAT, - "This Partition will be formatted next."}, + "Nast©puj¥ca partycja zostanie sformatowana."}, {STRING_NONFORMATTEDPART, - "You chose to install ReactOS on a new or unformatted Partition."}, + "Mo¾esz zainstalowa ReactOS na nowej lub niesformatowanej partycji."}, {STRING_INSTALLONPART, - "Setup install ReactOS onto Partition"}, + "Instalator kopiuje pliki systemu na wybran¥ partycj©."}, {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, + "Instalator sprawdza wybran¥ partycj©."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3= Wyjcie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER, - "ENTER = Reboot computer"}, + "ENTER = Restart komputera"}, {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + "Instalator nie by w stanie odnale« sekji '%S'\nw pliku TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kopiowanie plik¢w: %S"}, + " \xB3 Kopiowanie plik¢w: %S"}, {STRING_SETUPCOPYINGFILES, "Instalator kopiuje pliki..."}, {STRING_PAGEDMEM, @@ -1615,39 +1615,39 @@ {STRING_NONPAGEDMEM, "Niestronicowanej"}, {STRING_FREEMEM, - "Dost©pnej"}, + " Dost©pnej"}, {STRING_REGHIVEUPDATE, - " Updating registry hives..."}, + " Uaktualnianie..."}, {STRING_IMPORTFILE, - " Importing %S..."}, + " Importowanie %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Updating display registry settings..."}, + " Zmiana ustawieä ekranu w rejestrze..."}, {STRING_LOCALESETTINGSUPDATE, - " Updating locale settings..."}, + " Zmiana wersji j©zykowej..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " Updating keyboard layout settings..."}, + " Zmiana ukadu klawiatury..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " Dodawanie informacji o stronie kodowej do rejestru..."}, {STRING_DONE, - " Done..."}, + " Ukoñczone..."}, {STRING_REBOOTCOMPUTER2, - " ENTER = Reboot computer"}, + " ENTER = Restart komputera"}, {STRING_CONSOLEFAIL1, - "Unable to open the console\n\n"}, + "Otwarcie konsoli nieudane\n\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + "Najcz©stsz¥ tego przyczyn¥ jest u¾ycie klawiatury USB,\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + "kt¢re nie s¥ w peni obsugiwane.\n"}, {STRING_FORMATTINGDISK, - "Setup is formatting your disk"}, + "Instalator formatuje tw¢j dysk"}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "Instalator sprawdza tw¢j dysk"}, {STRING_FORMATDISK1, - " Format partition as %S file system (quick format) "}, + " Sformatuj partycj© z systemem plik¢w %S (szybkie formatowanie) "}, {STRING_FORMATDISK2, - " Format partition as %S file system "}, + " Sformatuj partycj© z systemem plik¢w %S "}, {STRING_KEEPFORMAT, - " Keep current file system (no changes) "}, + " Zachowaj obecny system plik¢w (bez zmian) "}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Thu Feb 14 14:30:14 2008 @@ -979,7 +979,7 @@ { 6, 8, - "Inçtal tor inçtaluje zav dza operanho systmu", + "Inçtal tor je pripravenì nainçtalova zav dza operanho systmu", TEXT_NORMAL }, { @@ -1598,9 +1598,9 @@ {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3= Skoni ENTER = Pokraova"}, {STRING_REBOOTCOMPUTER, - "ENTER = Reboot computer"}, + "ENTER = Reçtart po¡taa"}, {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, @@ -1608,15 +1608,15 @@ {STRING_SETUPCOPYINGFILES, "Inçtal tor kop¡ruje s£bory..."}, {STRING_PAGEDMEM, - "Str nkovan pam"}, + "Str nkovan "}, //reazec "Str nkovan pam" sa nevmest¡ {STRING_NONPAGEDMEM, - "Nestr nkovan pam"}, + "Nestr nkovan "}, //reazec "Nestr nkovan pam" sa nevmest¡ {STRING_FREEMEM, "Von pam"}, {STRING_REGHIVEUPDATE, - " Updating registry hives..."}, + " Aktualizujem polo§ky registrov..."}, {STRING_IMPORTFILE, - " Importing %S..."}, + " Importujem %S..."}, {STRING_DISPLAYETTINGSUPDATE, " Updating display registry settings..."}, {STRING_LOCALESETTINGSUPDATE, @@ -1626,25 +1626,25 @@ {STRING_CODEPAGEINFOUPDATE, " Adding codepage information to registry..."}, {STRING_DONE, - " Done..."}, + " Hotovo..."}, {STRING_REBOOTCOMPUTER2, - " ENTER = Reboot computer"}, + " ENTER = Reçtart po¡taa"}, {STRING_CONSOLEFAIL1, "Unable to open the console\n\n"}, {STRING_CONSOLEFAIL2, "The most common cause of this is using an USB keyboard\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + "USB kl vesnica eçte nie je plne podporovan \n"}, {STRING_FORMATTINGDISK, - "Setup is formatting your disk"}, + "Inçtal tor form tuje V ç disk"}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "Inçtal tor kontroluje V ç disk"}, {STRING_FORMATDISK1, - " Format partition as %S file system (quick format) "}, + " Naform tova oblas ako systm s£borov %S (rìchly form t) "}, {STRING_FORMATDISK2, - " Format partition as %S file system "}, + " Naform tova oblas ako systm s£borov %S "}, {STRING_KEEPFORMAT, - " Keep current file system (no changes) "}, + " Ponecha s£asnì systm s£borov (bez zmeny) "}, {0, 0} };

16 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
46
Older →

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 February 2008