Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[ros-arm-bringup] 32354: Remove more dead code from MmInit1. This nugget was trying to free memory allocations between 0x80F50000 and 0x80600000? [FORMATTING] Make MmInitializePageList readable by human beings. Remove code in MmInitializePageList which was just repeating what MmInit1 had already done (why?). Remove alignment code which was duplicated (why??).
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Thu Feb 14 07:44:51 2008 New Revision: 32354 URL: http://svn.reactos.org/svn/reactos?rev=32354&view=rev Log: Remove more dead code from MmInit1. This nugget was trying to free memory allocations between 0x80F50000 and 0x80600000? [FORMATTING] Make MmInitializePageList readable by human beings. Remove code in MmInitializePageList which was just repeating what MmInit1 had already done (why?). Remove alignment code which was duplicated (why??). 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 07:44:51 2008 @@ -319,247 +319,216 @@ ULONG_PTR LastKernelAddress, PADDRESS_RANGE BIOSMemoryMap, ULONG AddressRangeCount) -/* - * FUNCTION: Initializes the page list with all pages free - * except those known to be reserved and those used by the kernel - * ARGUMENTS: - * FirstKernelAddress = First physical address used by the kernel - * LastKernelAddress = Last physical address used by the kernel - */ -{ - ULONG i; - ULONG Reserved; - NTSTATUS Status; - PFN_TYPE LastPage; - PFN_TYPE FirstUninitializedPage; - ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; - - DPRINT("MmInitializePageList(FirstPhysKernelAddress %x, " - "LastPhysKernelAddress %x, " - "MemorySizeInPages %x, LastKernelAddress %x)\n", - FirstPhysKernelAddress, - LastPhysKernelAddress, - MemorySizeInPages, - LastKernelAddress); - - for (i = 0; i < MC_MAXIMUM; i++) - { - InitializeListHead(&UsedPageListHeads[i]); - } - KeInitializeSpinLock(&PageListLock); - InitializeListHead(&FreeUnzeroedPageListHead); - InitializeListHead(&FreeZeroedPageListHead); - InitializeListHead(&BiosPageListHead); - - LastKernelAddress = PAGE_ROUND_UP(LastKernelAddress); - - MmPageArraySize = MemorySizeInPages; - Reserved = - PAGE_ROUND_UP((MmPageArraySize * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; - MmPageArray = (PHYSICAL_PAGE *)LastKernelAddress; - - DPRINT("Reserved %d\n", Reserved); - - LastKernelAddress = PAGE_ROUND_UP(LastKernelAddress); - LastKernelAddress = ((ULONG_PTR)LastKernelAddress + (Reserved * PAGE_SIZE)); - LastPhysKernelAddress = (ULONG_PTR)PAGE_ROUND_UP(LastPhysKernelAddress); - LastPhysKernelAddress = (ULONG_PTR)LastPhysKernelAddress + (Reserved * PAGE_SIZE); - - MmStats.NrTotalPages = 0; - MmStats.NrSystemPages = 0; - MmStats.NrUserPages = 0; - MmStats.NrReservedPages = 0; - MmStats.NrFreePages = 0; - MmStats.NrLockedPages = 0; - - /* Preinitialize the Balancer because we need some pages for pte's */ - MmInitializeBalancer(MemorySizeInPages, 0); - - FirstUninitializedPage = (ULONG_PTR)LastPhysKernelAddress / PAGE_SIZE; - LastPage = MmPageArraySize; - for (i = 0; i < Reserved; i++) - { - PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); - ULONG j, start, end; - 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); +{ + ULONG i; + ULONG Reserved; + NTSTATUS Status; + PFN_TYPE LastPage; + PFN_TYPE FirstUninitializedPage; + ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; + + KeInitializeSpinLock(&PageListLock); + for (i = 0; i < MC_MAXIMUM; i++) InitializeListHead(&UsedPageListHeads[i]); + InitializeListHead(&FreeUnzeroedPageListHead); + InitializeListHead(&FreeZeroedPageListHead); + InitializeListHead(&BiosPageListHead); + + LastKernelAddress = PAGE_ROUND_UP(LastKernelAddress); + LastPhysKernelAddress = (ULONG_PTR)PAGE_ROUND_UP(LastPhysKernelAddress); + + MmPageArraySize = MemorySizeInPages; + 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); + + /* Preinitialize the Balancer because we need some pages for pte's */ + MmInitializeBalancer(MemorySizeInPages, 0); + + FirstUninitializedPage = (ULONG_PTR)LastPhysKernelAddress / PAGE_SIZE; + LastPage = MmPageArraySize; + for (i = 0; i < Reserved; i++) + { + PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); + ULONG j, start, end; + 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) - { - KEBUGCHECK(0); - } - } - Status = MmCreateVirtualMappingForKernel(Address, - PAGE_READWRITE, - &Pfn, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KEBUGCHECK(0); - } - } - else - { - /* 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); - end = ((ULONG_PTR)Address - (ULONG_PTR)MmPageArray + PAGE_SIZE) / sizeof(PHYSICAL_PAGE); - - for (j = start; j < end && j < LastPage; j++) - { - if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, j)) - { - if (j == 0) - { - /* - * Page zero 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; - InsertTailList(&BiosPageListHead, - &MmPageArray[0].ListEntry); - MmStats.NrReservedPages++; - } - else if (j == 1) - { - - /* - * Page one is reserved for the initial KPCR - */ - MmPageArray[1].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - 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) - { - /* - * Page two 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; - InsertTailList(&BiosPageListHead, - &MmPageArray[2].ListEntry); - MmStats.NrReservedPages++; - } - /* Protect the Page Directory. This will be changed in r3 */ - else if (j >= (PdeStart / PAGE_SIZE) && j < (MmFreeLdrPageDirectoryEnd / PAGE_SIZE)) - { - MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - 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) - { - MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - 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 && - j < (ULONG)LastPhysKernelAddress/PAGE_SIZE) - { - 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; - InsertTailList(&UsedPageListHeads[MC_NPPOOL], - &MmPageArray[j].ListEntry); - MmStats.NrSystemPages++; - } - else - { - 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++; - } - } - else - { - MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[j].Flags.Consumer = MC_NPPOOL; - MmPageArray[j].Flags.Zero = 0; - MmPageArray[j].ReferenceCount = 0; + { + Pfn = MmAllocPage(MC_NPPOOL, 0); + if (Pfn == 0) + { + KEBUGCHECK(0); + } + } + Status = MmCreateVirtualMappingForKernel(Address, + PAGE_READWRITE, + &Pfn, + 1); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to create virtual mapping\n"); + KEBUGCHECK(0); + } + } + else + { + /* 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); + end = ((ULONG_PTR)Address - (ULONG_PTR)MmPageArray + PAGE_SIZE) / sizeof(PHYSICAL_PAGE); + + for (j = start; j < end && j < LastPage; j++) + { + if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, j)) + { + if (j == 0) + { + /* + * Page zero 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; + InsertTailList(&BiosPageListHead, + &MmPageArray[0].ListEntry); + MmStats.NrReservedPages++; + } + else if (j == 1) + { + + /* + * Page one is reserved for the initial KPCR + */ + MmPageArray[1].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + 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) + { + /* + * Page two 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; + InsertTailList(&BiosPageListHead, + &MmPageArray[2].ListEntry); + MmStats.NrReservedPages++; + } + /* Protect the Page Directory. This will be changed in r3 */ + else if (j >= (PdeStart / PAGE_SIZE) && j < (MmFreeLdrPageDirectoryEnd / PAGE_SIZE)) + { + MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + 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) + { + MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + 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 && + j < (ULONG)LastPhysKernelAddress/PAGE_SIZE) + { + 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; + InsertTailList(&UsedPageListHeads[MC_NPPOOL], + &MmPageArray[j].ListEntry); + MmStats.NrSystemPages++; + } + else + { + 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++; + } + } + else + { + MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[j].Flags.Consumer = MC_NPPOOL; + MmPageArray[j].Flags.Zero = 0; + MmPageArray[j].ReferenceCount = 0; + InsertTailList(&BiosPageListHead, + &MmPageArray[j].ListEntry); + 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; + InsertTailList(&UsedPageListHeads[MC_NPPOOL], + &MmPageArray[i].ListEntry); + 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; InsertTailList(&BiosPageListHead, - &MmPageArray[j].ListEntry); - 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; - InsertTailList(&UsedPageListHeads[MC_NPPOOL], - &MmPageArray[i].ListEntry); - 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; - InsertTailList(&BiosPageListHead, - &MmPageArray[i].ListEntry); - MmStats.NrReservedPages++; - } - } - - - - KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); - - MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + - MmStats.NrReservedPages + MmStats.NrUserPages; - MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages + MmStats.NrReservedPages); - return((PVOID)LastKernelAddress); + &MmPageArray[i].ListEntry); + MmStats.NrReservedPages++; + } + } + + KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); + + MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrReservedPages + MmStats.NrUserPages; + MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages + MmStats.NrReservedPages); + return((PVOID)LastKernelAddress); } VOID 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 07:44:51 2008 @@ -289,7 +289,6 @@ ULONG MaxMem) { ULONG kernel_len; - ULONG_PTR MappingAddress; PLDR_DATA_TABLE_ENTRY LdrEntry; /* Dump memory descriptors */ @@ -353,15 +352,6 @@ /* Unmap low memory */ MmDeletePageTable(NULL, 0); - /* Unmap FreeLDR's 6MB allocation */ - DPRINT("Invalidating between %p and %p\n", LastKernelAddress, KSEG0_BASE + 0x00600000); - for (MappingAddress = LastKernelAddress; - MappingAddress < KSEG0_BASE + 0x00600000; - MappingAddress += PAGE_SIZE) - { - MmRawDeleteVirtualMapping((PVOID)MappingAddress); - } - /* Intialize memory areas */ MmInitVirtualMemory(LastKernelAddress, kernel_len);

1 0

[ros-arm-bringup] 32353: [FORMATTING] Reformat MmInit1. Also, it seems someone added code to get the First/LastKernPhysAddrs without having them setup (they are setup by the FreeLDR hack-code in freeldr.c, not by "real" bootloaders)... so why set them up in the first place? The code now uses the nice memory-list based routines to get this information instead. Re-factored some detection and debugging code, cleaned up comments.
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Thu Feb 14 07:28:41 2008 New Revision: 32353 URL: http://svn.reactos.org/svn/reactos?rev=32353&view=rev Log: [FORMATTING] Reformat MmInit1. Also, it seems someone added code to get the First/LastKernPhysAddrs without having them setup (they are setup by the FreeLDR hack-code in freeldr.c, not by "real" bootloaders)... so why set them up in the first place? The code now uses the nice memory-list based routines to get this information instead. Re-factored some detection and debugging code, cleaned up comments. Modified: trunk/reactos/ntoskrnl/mm/mminit.c 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 07:28:41 2008 @@ -51,6 +51,12 @@ ULONG MiNonPagedPoolLength; ULONG MmNumberOfPhysicalPages; extern KMUTANT MmSystemLoadLock; +BOOLEAN MiDbgEnableMdDump = +#ifdef _ARM_ +TRUE; +#else +FALSE; +#endif /* PRIVATE FUNCTIONS *********************************************************/ @@ -225,6 +231,54 @@ } VOID +NTAPI +MiDbgDumpMemoryDescriptors(VOID) +{ + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; + ULONG TotalPages = 0; + + DPRINT1("Base\t\tLength\t\tType\n"); + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + DPRINT1("%08lX\t%08lX\t%s\n", Md->BasePage, Md->PageCount, MemType[Md->MemoryType]); + TotalPages += Md->PageCount; + } + + DPRINT1("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); +} + +ULONG_PTR +NTAPI +MiGetLastKernelAddress(VOID) +{ + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; + ULONG_PTR LastKrnlPhysAddr = 0; + + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + if (Md->MemoryType == LoaderBootDriver || + Md->MemoryType == LoaderSystemCode || + Md->MemoryType == LoaderHalCode) + { + if (Md->BasePage+Md->PageCount > LastKrnlPhysAddr) + LastKrnlPhysAddr = Md->BasePage+Md->PageCount; + + } + } + + /* Convert to a physical address */ + return LastKrnlPhysAddr << PAGE_SHIFT; +} + +VOID INIT_FUNCTION NTAPI MmInit1(ULONG_PTR FirstKrnlPhysAddr, @@ -233,165 +287,86 @@ PADDRESS_RANGE BIOSMemoryMap, ULONG AddressRangeCount, ULONG MaxMem) -/* - * FUNCTION: Initalize memory managment - */ -{ - ULONG kernel_len; - ULONG_PTR MappingAddress; - PLDR_DATA_TABLE_ENTRY LdrEntry; - - DPRINT("MmInit1(FirstKrnlPhysAddr, %p, LastKrnlPhysAddr %p, LastKernelAddress %p)\n", - FirstKrnlPhysAddr, - LastKrnlPhysAddr, - LastKernelAddress); +{ + ULONG kernel_len; + ULONG_PTR MappingAddress; + PLDR_DATA_TABLE_ENTRY LdrEntry; /* Dump memory descriptors */ - { - PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR Md; - ULONG TotalPages = 0; - - DPRINT("Base\t\tLength\t\tType\n"); - for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; - NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; - NextEntry = NextEntry->Flink) - { - Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - DPRINT("%08lX\t%08lX\t%s\n", Md->BasePage, Md->PageCount, MemType[Md->MemoryType]); - TotalPages += Md->PageCount; - } - - DPRINT("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); - } - - /* Set the page directory */ - DPRINT("CurrentProcess: %x\n", PsGetCurrentProcess()); - PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); - - /* NTLDR Hacks */ - if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; - if (!FirstKrnlPhysAddr) - { - /* Get the kernel entry */ - LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - /* Get the addresses */ - FirstKrnlPhysAddr = (ULONG_PTR)LdrEntry->DllBase - KSEG0_BASE; - } - - /* Get the last kernel address */ - if (!LastKrnlPhysAddr) - { - PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR Md; - - for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; - NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; - NextEntry = NextEntry->Flink) - { - Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - if (Md->MemoryType == LoaderBootDriver || - Md->MemoryType == LoaderSystemCode || - Md->MemoryType == LoaderHalCode) - { - if (Md->BasePage+Md->PageCount > LastKrnlPhysAddr) - LastKrnlPhysAddr = Md->BasePage+Md->PageCount; - } - } - - /* Convert to a physical address */ - LastKrnlPhysAddr = LastKrnlPhysAddr << PAGE_SHIFT; - LastKernelAddress = LastKrnlPhysAddr | KSEG0_BASE; - } - - /* Set memory limits */ - MmSystemRangeStart = (PVOID)KSEG0_BASE; - MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; - MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); - DPRINT("MmSystemRangeStart: %08x\n", MmSystemRangeStart); - DPRINT("MmUserProbeAddress: %08x\n", MmUserProbeAddress); - DPRINT("MmHighestUserAddress:%08x\n", MmHighestUserAddress); - - /* - * Initialize memory managment statistics - */ - MmStats.NrTotalPages = 0; - MmStats.NrSystemPages = 0; - MmStats.NrUserPages = 0; - MmStats.NrReservedPages = 0; - MmStats.NrUserPages = 0; - MmStats.NrFreePages = 0; - MmStats.NrLockedPages = 0; - MmStats.PagingRequestsInLastMinute = 0; - MmStats.PagingRequestsInLastFiveMinutes = 0; - MmStats.PagingRequestsInLastFifteenMinutes = 0; - - /* - * Free all pages not used for kernel memory - * (we assume the kernel occupies a continuous range of physical - * memory) - */ - DPRINT("first krnl %x, last krnl %x\n",FirstKrnlPhysAddr, - LastKrnlPhysAddr); - - /* - * Free physical memory not used by the kernel - */ - 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? */ - MmStats.NrTotalPages += 256; - } - - /* - * Initialize the kernel address space - */ - MmInitializeKernelAddressSpace(); - - MmInitGlobalKernelPageDirectory(); - - DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024); - - LastKernelAddress = (ULONG_PTR)MmInitializePageList( - FirstKrnlPhysAddr, - LastKrnlPhysAddr, - MmStats.NrTotalPages, - PAGE_ROUND_UP(LastKernelAddress), - BIOSMemoryMap, - AddressRangeCount); - kernel_len = LastKrnlPhysAddr - FirstKrnlPhysAddr; - - /* - * Unmap low memory - */ - MmDeletePageTable(NULL, 0); - - DPRINT("Invalidating between %x and %x\n", - LastKernelAddress, KSEG0_BASE + 0x00600000); - for (MappingAddress = LastKernelAddress; - MappingAddress < KSEG0_BASE + 0x00600000; - MappingAddress += PAGE_SIZE) - { - MmRawDeleteVirtualMapping((PVOID)MappingAddress); - } - - DPRINT("Almost done MmInit()\n"); - /* - * Intialize memory areas - */ - MmInitVirtualMemory(LastKernelAddress, kernel_len); - - MmInitializeMdlImplementation(); + if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); + + /* Set the page directory */ + PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); + + /* NTLDR Hacks */ + if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; + + /* Get the first physical address */ + LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + FirstKrnlPhysAddr = (ULONG_PTR)LdrEntry->DllBase - KSEG0_BASE; + + /* Get the last kernel address */ + LastKrnlPhysAddr = MiGetLastKernelAddress(); + LastKernelAddress = LastKrnlPhysAddr | KSEG0_BASE; + + /* Set memory limits */ + MmSystemRangeStart = (PVOID)KSEG0_BASE; + MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; + MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); + DPRINT("MmSystemRangeStart: %08x\n", MmSystemRangeStart); + DPRINT("MmUserProbeAddress: %08x\n", MmUserProbeAddress); + DPRINT("MmHighestUserAddress:%08x\n", MmHighestUserAddress); + + /* Initialize memory managment statistics */ + 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; + } + + /* Initialize the kernel address space */ + MmInitializeKernelAddressSpace(); + MmInitGlobalKernelPageDirectory(); + + /* Initialize the page list */ + LastKernelAddress = (ULONG_PTR)MmInitializePageList(FirstKrnlPhysAddr, + LastKrnlPhysAddr, + MmStats.NrTotalPages, + PAGE_ROUND_UP(LastKernelAddress), + BIOSMemoryMap, + AddressRangeCount); + kernel_len = LastKrnlPhysAddr - FirstKrnlPhysAddr; + + /* Unmap low memory */ + MmDeletePageTable(NULL, 0); + + /* Unmap FreeLDR's 6MB allocation */ + DPRINT("Invalidating between %p and %p\n", LastKernelAddress, KSEG0_BASE + 0x00600000); + for (MappingAddress = LastKernelAddress; + MappingAddress < KSEG0_BASE + 0x00600000; + MappingAddress += PAGE_SIZE) + { + MmRawDeleteVirtualMapping((PVOID)MappingAddress); + } + + /* Intialize memory areas */ + MmInitVirtualMemory(LastKernelAddress, kernel_len); + + /* Initialize MDLs */ + MmInitializeMdlImplementation(); } BOOLEAN

1 0

[ros-arm-bringup] 32352: [FORMATTING] Remove dead code (#if 0) and re-organize the file to match kernel standard layout/style. Get rid of old debugging hacks introduced by ion (rmapready, pageopready, pagingready).
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Thu Feb 14 06:08:20 2008 New Revision: 32352 URL: http://svn.reactos.org/svn/reactos?rev=32352&view=rev Log: [FORMATTING] Remove dead code (#if 0) and re-organize the file to match kernel standard layout/style. Get rid of old debugging hacks introduced by ion (rmapready, pageopready, pagingready). Modified: trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/pageop.c trunk/reactos/ntoskrnl/mm/rmap.c 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 06:08:20 2008 @@ -1,81 +1,71 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/mm/mminit.c - * PURPOSE: Kernel memory managment initialization functions - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * PURPOSE: Memory Manager Initialization + * PROGRAMMERS: */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> -/* GLOBALS *****************************************************************/ - -/* - * Compiler defined symbols - */ -#if 0 -extern unsigned int _image_base__; -extern unsigned int _text_start__; -extern unsigned int _text_end__; - -extern unsigned int _init_start__; -extern unsigned int _init_end__; - -extern unsigned int _bss_end__; -#endif - -static BOOLEAN IsThisAnNtAsSystem = FALSE; +/* GLOBALS *******************************************************************/ + +PCHAR +MemType[] = +{ + "ExceptionBlock ", + "SystemBlock ", + "Free ", + "Bad ", + "LoadedProgram ", + "FirmwareTemporary ", + "FirmwarePermanent ", + "OsloaderHeap ", + "OsloaderStack ", + "SystemCode ", + "HalCode ", + "BootDriver ", + "ConsoleInDriver ", + "ConsoleOutDriver ", + "StartupDpcStack ", + "StartupKernelStack", + "StartupPanicStack ", + "StartupPcrPage ", + "StartupPdrPage ", + "RegistryData ", + "MemoryData ", + "NlsData ", + "SpecialMemory ", + "BBTMemory ", + "LoaderReserve " +}; + +BOOLEAN IsThisAnNtAsSystem = FALSE; MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; - PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; - PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; - ULONG MmNumberOfPhysicalPages; - -VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength); - -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -BOOLEAN STDCALL MmIsThisAnNtAsSystem(VOID) -{ - return(IsThisAnNtAsSystem); -} - -/* - * @implemented - */ -MM_SYSTEMSIZE STDCALL MmQuerySystemSize(VOID) -{ - return(MmSystemSize); -} +extern KMUTANT MmSystemLoadLock; + +/* PRIVATE FUNCTIONS *********************************************************/ VOID NTAPI MiShutdownMemoryManager(VOID) -{} +{ + +} VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength) -/* - * FUNCTION: Intialize the memory areas list - * ARGUMENTS: - * bp = Pointer to the boot parameters - * kernel_len = Length of the kernel - */ { PVOID BaseAddress; ULONG Length; @@ -233,35 +223,6 @@ return TotalPages; } - -PCHAR -MemType[] = { - "ExceptionBlock ", // ? - "SystemBlock ", // ? - "Free ", - "Bad ", // used - "LoadedProgram ", // == Free - "FirmwareTemporary ", // == Free - "FirmwarePermanent ", // == Bad - "OsloaderHeap ", // used - "OsloaderStack ", // == Free - "SystemCode ", - "HalCode ", - "BootDriver ", // not used - "ConsoleInDriver ", // ? - "ConsoleOutDriver ", // ? - "StartupDpcStack ", // ? - "StartupKernelStack", // ? - "StartupPanicStack ", // ? - "StartupPcrPage ", // ? - "StartupPdrPage ", // ? - "RegistryData ", // used - "MemoryData ", // not used - "NlsData ", // used - "SpecialMemory ", // == Bad - "BBTMemory ", - "LoaderReserve "// == Bad -}; VOID INIT_FUNCTION @@ -413,24 +374,7 @@ /* * Unmap low memory */ -#ifdef CONFIG_SMP - /* In SMP mode we unmap the low memory pagetable in MmInit3. - The APIC needs the mapping of the first pages - while the processors are starting up. - We unmap all pages except page 2 and 3. */ - for (MappingAddress = 0; - MappingAddress < 1024 * PAGE_SIZE; - MappingAddress += PAGE_SIZE) - { - if (MappingAddress != 2 * PAGE_SIZE && - MappingAddress != 3 * PAGE_SIZE) - { - MmRawDeleteVirtualMapping((PVOID)MappingAddress); - } - } -#else MmDeletePageTable(NULL, 0); -#endif DPRINT("Invalidating between %x and %x\n", LastKernelAddress, KSEG0_BASE + 0x00600000); @@ -450,9 +394,6 @@ MmInitializeMdlImplementation(); } -BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; -extern KMUTANT MmSystemLoadLock; - BOOLEAN NTAPI MmInitSystem(IN ULONG Phase, @@ -483,13 +424,9 @@ else if (Phase == 1) { MmInitializeRmapList(); - RmapReady = TRUE; MmInitializePageOp(); - PageOpReady = TRUE; MmInitSectionImplementation(); - SectionsReady = TRUE; MmInitPagingFile(); - PagingReady = TRUE; MmCreatePhysicalMemorySection(); /* Setup shared user data settings that NT does as well */ @@ -521,29 +458,25 @@ return TRUE; } -#if 0 - -VOID static -MiFreeInitMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, - PFN_TYPE Page, SWAPENTRY SwapEntry, - BOOLEAN Dirty) -{ - ASSERT(SwapEntry == 0); - if (Page != 0) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Page); - } -} - -VOID -NTAPI -MiFreeInitMemory(VOID) -{ - MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), - (PVOID)&_init_start__, - MiFreeInitMemoryPage, - NULL); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); -} -#endif + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +BOOLEAN +NTAPI +MmIsThisAnNtAsSystem(VOID) +{ + return IsThisAnNtAsSystem; +} + +/* + * @implemented + */ +MM_SYSTEMSIZE +NTAPI +MmQuerySystemSize(VOID) +{ + return MmSystemSize; +} Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c Thu Feb 14 06:08:20 2008 @@ -322,8 +322,6 @@ return(Status); } -extern BOOLEAN PagingReady; - VOID INIT_FUNCTION NTAPI @@ -367,11 +365,6 @@ KIRQL oldIrql; ULONG MiAvailSwapPages; - if (!PagingReady) - { - DPRINT1("PAGING USED TOO SOON!!!\n"); - while (TRUE); - } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); MiAvailSwapPages = (MiFreeSwapPages * MM_PAGEFILE_COMMIT_RATIO) + MM_PAGEFILE_COMMIT_GRACE; @@ -391,11 +384,6 @@ { KIRQL oldIrql; - if (!PagingReady) - { - DPRINT1("PAGING USED TOO SOON!!!\n"); - while (TRUE); - } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); MiReservedSwapPages = MiReservedSwapPages - Nr; KeReleaseSpinLock(&PagingFileListLock, oldIrql); @@ -407,11 +395,6 @@ KIRQL oldIrql; ULONG i, j; - if (!PagingReady) - { - DPRINT1("PAGING USED TOO SOON!!!\n"); - while (TRUE); - } KeAcquireSpinLock(&PagingFile->AllocMapLock, &oldIrql); for (i = 0; i < PagingFile->AllocMapSize; i++) @@ -441,11 +424,6 @@ ULONG off; KIRQL oldIrql; - if (!PagingReady) - { - DPRINT1("PAGING USED TOO SOON!!!\n"); - while (TRUE); - } i = FILE_FROM_ENTRY(Entry); off = OFFSET_FROM_ENTRY(Entry); @@ -490,11 +468,6 @@ ULONG off; SWAPENTRY entry; - if (!PagingReady) - { - DPRINT1("PAGING USED TOO SOON!!!\n"); - while (TRUE); - } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); if (MiFreeSwapPages == 0) Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c Thu Feb 14 06:08:20 2008 @@ -133,8 +133,6 @@ return(NULL); } -extern BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; - PMM_PAGEOP NTAPI MmGetPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, @@ -148,12 +146,6 @@ ULONG_PTR Hash; KIRQL oldIrql; PMM_PAGEOP PageOp; - - if (!PageOpReady) - { - DPRINT1("PAGEOPS USED TOO SOON!!!\n"); - while (TRUE); - } /* * Calcuate the hash value for pageop structure Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=323… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c Thu Feb 14 06:08:20 2008 @@ -379,8 +379,6 @@ return(FALSE); } -extern BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; - VOID NTAPI MmInsertRmap(PFN_TYPE Page, PEPROCESS Process, @@ -389,12 +387,6 @@ PMM_RMAP_ENTRY current_entry; PMM_RMAP_ENTRY new_entry; ULONG PrevSize; - - if (!RmapReady) - { - DPRINT1("RMAPS USED TOO SOON!!!\n"); - while (TRUE); - } Address = (PVOID)PAGE_ROUND_DOWN(Address); @@ -467,12 +459,6 @@ PMM_RMAP_ENTRY previous_entry; PEPROCESS Process; - if (!RmapReady) - { - DPRINT1("RMAPS USED TOO SOON!!!\n"); - while (TRUE); - } - ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); if (current_entry == NULL) @@ -510,12 +496,6 @@ PVOID Address) { PMM_RMAP_ENTRY current_entry, previous_entry; - - if (!RmapReady) - { - DPRINT1("RMAPS USED TOO SOON!!!\n"); - while (TRUE); - } ExAcquireFastMutex(&RmapListLock); previous_entry = NULL;

1 0

[ros-arm-bringup] 32351: Don't overwrite the stacks anymore -- set the right pointer in the ARM loader block (remember that stacks are top-down!). Make a specialized UNIMPLEMENTED for Mm code so we don't go too far into the boot with 100 failures hanging behind our backs, which makes it hard to debug progress.
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Thu Feb 14 05:33:42 2008 New Revision: 32351 URL: http://svn.reactos.org/svn/reactos?rev=32351&view=rev Log: Don't overwrite the stacks anymore -- set the right pointer in the ARM loader block (remember that stacks are top-down!). Make a specialized UNIMPLEMENTED for Mm code so we don't go too far into the boot with 100 failures hanging behind our backs, which makes it hard to debug progress. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/ntoskrnl/mm/arm/stubs.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Thu Feb 14 05:33:42 2008 @@ -374,18 +374,21 @@ // Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupDpcStack); ArmLoaderBlock->u.Arm.InterruptStack = KSEG0_BASE | (ULONG)Base; + ArmLoaderBlock->u.Arm.InterruptStack += KERNEL_STACK_SIZE; // // Allocate the Kernel Boot stack // Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupKernelStack); ArmLoaderBlock->KernelStack = KSEG0_BASE | (ULONG)Base; + ArmLoaderBlock->KernelStack += KERNEL_STACK_SIZE; // // Allocate the Abort stack // Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupPanicStack); ArmLoaderBlock->u.Arm.PanicStack = KSEG0_BASE | (ULONG)Base; + ArmLoaderBlock->u.Arm.PanicStack += KERNEL_STACK_SIZE; // // Allocate the PCR page -- align it to 1MB (we only need 4KB) Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c Thu Feb 14 05:33:42 2008 @@ -13,9 +13,12 @@ #include <debug.h> /* GLOBALS ********************************************************************/ -// -// METAFIXME: We need to stop using 1MB Section Entry TTEs! -// +#undef UNIMPLEMENTED +#define UNIMPLEMENTED \ +{ \ + DPRINT1("[ARM Mm Bringup]: %s is unimplemented!\n", __FUNCTION__); \ + while (TRUE); \ +} /* FUNCTIONS ******************************************************************/ @@ -28,7 +31,6 @@ // // Nothing to do // - UNIMPLEMENTED; return; }

1 0

[ros-arm-bringup] 32350: Say hello to 4KB pages! Removed bring-up 1MB page hacks all over FreeLDR, and setup the kernel pages the same way the x86 build does it -- 6MB from 0x80800000 to 0x80DFFFFF for kernel and drivers. We still identity map the bottom 0MB of memory with a 1MB page, since this makes the most sense. We now map the low 8MB of memory to 0x80000000-0x807FFFFF, also with 4KB pages. This area will be discardable after early-init, and contains the early boot structures allocated by F
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Thu Feb 14 05:25:25 2008 New Revision: 32350 URL: http://svn.reactos.org/svn/reactos?rev=32350&view=rev Log: Say hello to 4KB pages! Removed bring-up 1MB page hacks all over FreeLDR, and setup the kernel pages the same way the x86 build does it -- 6MB from 0x80800000 to 0x80DFFFFF for kernel and drivers. We still identity map the bottom 0MB of memory with a 1MB page, since this makes the most sense. We now map the low 8MB of memory to 0x80000000-0x807FFFFF, also with 4KB pages. This area will be discardable after early-init, and contains the early boot structures allocated by FreeLDR. The Loader Parameter Block and its Extension are now dynamically allocated, instead of being static inside FreeLDR. Fixed some bugs in the ARM_PTE structure. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/ke/arm/cpu.c trunk/reactos/ntoskrnl/ke/arm/kiinit.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s Thu Feb 14 05:25:25 2008 @@ -69,4 +69,24 @@ .section pagedata .global ArmTranslationTable ArmTranslationTable: - .space 0x4000 + .space 0x4000 // 0x00000000->0xFFFFFFFF + +.global BootTranslationTable +BootTranslationTable: + .space 0x0400 // 0x00000000->0x800FFFFF + .space 0x0400 // 0x00100000->0x801FFFFF + .space 0x0400 // 0x00200000->0x802FFFFF + .space 0x0400 // 0x00300000->0x803FFFFF + .space 0x0400 // 0x00400000->0x804FFFFF + .space 0x0400 // 0x00500000->0x805FFFFF + .space 0x0400 // 0x00600000->0x806FFFFF + .space 0x0400 // 0x00700000->0x807FFFFF + +.global KernelTranslationTable +KernelTranslationTable: + .space 0x0400 // 0x00800000->0x808FFFFF + .space 0x0400 // 0x00900000->0x809FFFFF + .space 0x0400 // 0x00A00000->0x80AFFFFF + .space 0x0400 // 0x00B00000->0x80BFFFFF + .space 0x0400 // 0x00C00000->0x80CFFFFF + .space 0x0400 // 0x00D00000->0x80DFFFFF Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Thu Feb 14 05:25:25 2008 @@ -16,15 +16,17 @@ /* GLOBALS ********************************************************************/ ULONG PageDirectoryStart, PageDirectoryEnd; -LOADER_PARAMETER_BLOCK ArmLoaderBlock; +PLOADER_PARAMETER_BLOCK ArmLoaderBlock; CHAR ArmCommandLine[256]; CHAR ArmArcBootPath[64]; CHAR ArmArcHalPath[64]; CHAR ArmNtHalPath[64]; CHAR ArmNtBootPath[64]; -LOADER_PARAMETER_EXTENSION ArmExtension; +PLOADER_PARAMETER_EXTENSION ArmExtension; extern ARM_TRANSLATION_TABLE ArmTranslationTable; +extern ARM_COARSE_PAGE_TABLE BootTranslationTable, KernelTranslationTable; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; +extern ULONG_PTR KernelBase; ULONG SizeBits[] = { @@ -65,21 +67,21 @@ ARM_TTB_REGISTER TtbRegister; ARM_DOMAIN_REGISTER DomainRegister; ARM_PTE Pte; - ULONG i; - PARM_TRANSLATION_TABLE TranslationTable; - - // - // Allocate translation table buffer. - // During bootstrap, this will be a simple L1 (Master) Page Table with - // Section entries for KSEG0 and the first MB of RAM. - // - TranslationTable = &ArmTranslationTable; - if (!TranslationTable) return; - - // - // Set it as the TTB - // - TtbRegister.AsUlong = (ULONG)TranslationTable; + ULONG i, j; + PARM_TRANSLATION_TABLE MasterTable; + PARM_COARSE_PAGE_TABLE BootTable, KernelTable; + + // + // Get the PDEs that we will use + // + MasterTable = &ArmTranslationTable; + BootTable = &BootTranslationTable; + KernelTable = &KernelTranslationTable; + + // + // Set the master L1 PDE as the TTB + // + TtbRegister.AsUlong = (ULONG)MasterTable; ASSERT(TtbRegister.Reserved == 0); KeArmTranslationTableRegisterSet(TtbRegister); @@ -93,10 +95,10 @@ // // Set Fault PTEs everywhere // - RtlZeroMemory(TranslationTable, 4096 * sizeof(ARM_PTE)); - - // - // Build the template PTE + RtlZeroMemory(MasterTable, sizeof(ARM_TRANSLATION_TABLE)); + + // + // Identity map the first MB of memory // Pte.L1.Section.Type = SectionPte; Pte.L1.Section.Buffered = FALSE; @@ -106,32 +108,125 @@ Pte.L1.Section.Access = SupervisorAccess; Pte.L1.Section.BaseAddress = 0; Pte.L1.Section.Ignored = Pte.L1.Section.Ignored1 = 0; - - // - // Map KSEG0 (0x80000000 - 0xA0000000) to 0x00000000 - 0x20000000 + MasterTable->Pte[0] = Pte; + + // + // Map the page in MMIO space that contains the serial port into virtual memory + // + Pte.L1.Section.BaseAddress = ArmBoardBlock->UartRegisterBase >> PDE_SHIFT; + MasterTable->Pte[UART_VIRTUAL >> PDE_SHIFT] = Pte; + + // + // Create template PTE for the coarse page tables which map the first 8MB + // + Pte.L1.Coarse.Type = CoarsePte; + Pte.L1.Coarse.Domain = Domain0; + Pte.L1.Coarse.Reserved = 1; // ARM926EJ-S manual recommends setting to 1 + Pte.L1.Coarse.BaseAddress = (ULONG)BootTable >> CPT_SHIFT; + Pte.L1.Coarse.Ignored = Pte.L1.Coarse.Ignored1 = 0; + + // + // Map 0x00000000 - 0x007FFFFF to 0x80000000 - 0x807FFFFF. + // This is where the freeldr boot structures are located, and we need them. + // + for (i = (KSEG0_BASE >> PDE_SHIFT); i < ((KSEG0_BASE + 0x800000) >> PDE_SHIFT); i++) + { + // + // Write PTE and update the base address (next MB) for the next one + // + MasterTable->Pte[i] = Pte; + Pte.L1.Coarse.BaseAddress++; + } + + // + // Now create the template PTE for the coarse page tables for the next 6MB + // + Pte.L1.Coarse.BaseAddress = (ULONG)KernelTable >> CPT_SHIFT; + TuiPrintf("Coarse Table at: %x\n", KernelTable); + TuiPrintf("Coarse Table at: %x\n", Pte.L1.Coarse.BaseAddress); + + // + // Map 0x00800000 - 0x00DFFFFF to 0x80800000 - 0x80DFFFFF // In this way, the KERNEL_PHYS_ADDR (0x800000) becomes 0x80800000 - // which is the entrypoint, just like on x86. - // - for (i = (KSEG0_BASE >> TTB_SHIFT); i < ((KSEG0_BASE + 0x20000000) >> TTB_SHIFT); i++) + // which is the kernel virtual base address, just like on x86. + // + ASSERT(KernelBase == 0x80800000); + for (i = (KernelBase >> PDE_SHIFT); i < ((KernelBase + 0x600000) >> PDE_SHIFT); i++) { // // Write PTE and update the base address (next MB) for the next one // - TranslationTable->Pte[i] = Pte; - Pte.L1.Section.BaseAddress++; + MasterTable->Pte[i] = Pte; + Pte.L1.Coarse.BaseAddress++; } // - // Identity map the first MB of memory as well - // - Pte.L1.Section.BaseAddress = 0; - TranslationTable->Pte[0] = Pte; - - // - // Map the page in MMIO space that contains the serial port into virtual memory - // - Pte.L1.Section.BaseAddress = ArmBoardBlock->UartRegisterBase >> TTB_SHIFT; - TranslationTable->Pte[UART_VIRTUAL >> TTB_SHIFT] = Pte; + // Now build the template PTE for the pages mapping the first 8MB + // + Pte.L2.Small.Type = SmallPte; + Pte.L2.Small.Buffered = Pte.L2.Small.Cached = 0; + Pte.L2.Small.Access0 = + Pte.L2.Small.Access1 = + Pte.L2.Small.Access2 = + Pte.L2.Small.Access3 = SupervisorAccess; + Pte.L2.Small.BaseAddress = 0; + + // + // Loop each boot coarse page table (i). + // Each PDE describes 1MB. We're mapping an area of 8MB, so 8 times. + // + for (i = 0; i < 8; i++) + { + // + // Loop and set each the PTE (j). + // Each PTE describes 4KB. We're mapping an area of 1MB, so 256 times. + // + for (j = 0; j < (PDE_SIZE / PAGE_SIZE); j++) + { + // + // Write PTE and update the base address (next MB) for the next one + // + BootTable->Pte[j] = Pte; + Pte.L2.Small.BaseAddress++; + } + + // + // Next iteration + // + BootTable++; + } + + // + // Now create the template PTE for the pages mapping the next 6MB + // + Pte.L2.Small.BaseAddress = (ULONG)KERNEL_BASE_PHYS >> PTE_SHIFT; + TuiPrintf("First Kernel PFN at: %x\n", Pte.L2.Small.BaseAddress); + + // + // Loop each kernel coarse page table (i). + // Each PDE describes 1MB. We're mapping an area of 6MB, so 6 times. + // + for (i = 0; i < 6; i++) + { + // + // Loop and set each the PTE (j). + // Each PTE describes 4KB. We're mapping an area of 1MB, so 256 times. + // + for (j = 0; j < (PDE_SIZE / PAGE_SIZE); j++) + { + // + // Write PTE and update the base address (next MB) for the next one + // + KernelTable->Pte[j] = Pte; + Pte.L2.Small.BaseAddress++; + } + + // + // Next iteration + // + KernelTable++; + TuiPrintf("Coarse Table at: %x\n", KernelTable); + } } VOID @@ -153,13 +248,13 @@ // ArmBoardBlock->UartRegisterBase = UART_VIRTUAL | (ArmBoardBlock->UartRegisterBase & - ((1 << TTB_SHIFT) - 1)); + ((1 << PDE_SHIFT) - 1)); TuiPrintf("Mapped serial port to 0x%x\n", ArmBoardBlock->UartRegisterBase); // // Jump to Kernel // - (*KernelEntryPoint)(Magic, (PVOID)&ArmLoaderBlock); + (*KernelEntryPoint)(Magic, (PVOID)ArmLoaderBlock); } VOID @@ -170,17 +265,27 @@ PCHAR BootPath, HalPath; // + // Allocate the loader block and extension + // + ArmLoaderBlock = MmAllocateMemoryWithType(sizeof(LOADER_PARAMETER_BLOCK), + LoaderOsloaderHeap); + if (!ArmLoaderBlock) return; + ArmExtension = MmAllocateMemoryWithType(sizeof(LOADER_PARAMETER_EXTENSION), + LoaderOsloaderHeap); + if (!ArmExtension) return; + + // // Initialize the loader block // - InitializeListHead(&ArmLoaderBlock.BootDriverListHead); - InitializeListHead(&ArmLoaderBlock.LoadOrderListHead); - InitializeListHead(&ArmLoaderBlock.MemoryDescriptorListHead); + InitializeListHead(&ArmLoaderBlock->BootDriverListHead); + InitializeListHead(&ArmLoaderBlock->LoadOrderListHead); + InitializeListHead(&ArmLoaderBlock->MemoryDescriptorListHead); // // Setup the extension and setup block // - ArmLoaderBlock.Extension = &ArmExtension; - ArmLoaderBlock.SetupLdrBlock = NULL; + ArmLoaderBlock->Extension = ArmExtension; + ArmLoaderBlock->SetupLdrBlock = NULL; // // TODO: Setup memory descriptors @@ -209,7 +314,7 @@ // // Make a copy of the command line // - ArmLoaderBlock.LoadOptions = ArmCommandLine; + ArmLoaderBlock->LoadOptions = ArmCommandLine; strcpy(ArmCommandLine, reactos_kernel_cmdline); // @@ -222,7 +327,7 @@ // Set the ARC Boot Path // strncpy(ArmArcBootPath, ArmCommandLine, 63); - ArmLoaderBlock.ArcBootDeviceName = ArmArcBootPath; + ArmLoaderBlock->ArcBootDeviceName = ArmArcBootPath; // // The rest of the string is the NT path @@ -232,77 +337,77 @@ ArmNtBootPath[0] = '\\'; strncat(ArmNtBootPath, BootPath + 1, 63); strcat(ArmNtBootPath,"\\"); - ArmLoaderBlock.NtBootPathName = ArmNtBootPath; + ArmLoaderBlock->NtBootPathName = ArmNtBootPath; // // Set the HAL paths // strncpy(ArmArcHalPath, ArmArcBootPath, 63); - ArmLoaderBlock.ArcHalDeviceName = ArmArcHalPath; + ArmLoaderBlock->ArcHalDeviceName = ArmArcHalPath; strcpy(ArmNtHalPath, "\\"); - ArmLoaderBlock.NtHalPathName = ArmNtHalPath; + ArmLoaderBlock->NtHalPathName = ArmNtHalPath; /* Use this new command line */ - strncpy(ArmLoaderBlock.LoadOptions, HalPath + 2, 255); + strncpy(ArmLoaderBlock->LoadOptions, HalPath + 2, 255); /* Parse it and change every slash to a space */ - BootPath = ArmLoaderBlock.LoadOptions; + BootPath = ArmLoaderBlock->LoadOptions; do {if (*BootPath == '/') *BootPath = ' ';} while (*BootPath++); // // Setup cache information // CacheReg = KeArmCacheRegisterGet(); - ArmLoaderBlock.u.Arm.FirstLevelDcacheSize = SizeBits[CacheReg.DSize]; - ArmLoaderBlock.u.Arm.FirstLevelDcacheFillSize = LenBits[CacheReg.DLength]; - ArmLoaderBlock.u.Arm.FirstLevelDcacheFillSize <<= 2; - ArmLoaderBlock.u.Arm.FirstLevelIcacheSize = SizeBits[CacheReg.ISize]; - ArmLoaderBlock.u.Arm.FirstLevelIcacheFillSize = LenBits[CacheReg.ILength]; - ArmLoaderBlock.u.Arm.FirstLevelIcacheFillSize <<= 2; - ArmLoaderBlock.u.Arm.SecondLevelDcacheSize = - ArmLoaderBlock.u.Arm.SecondLevelDcacheFillSize = - ArmLoaderBlock.u.Arm.SecondLevelIcacheSize = - ArmLoaderBlock.u.Arm.SecondLevelIcacheFillSize = 0; - + ArmLoaderBlock->u.Arm.FirstLevelDcacheSize = SizeBits[CacheReg.DSize]; + ArmLoaderBlock->u.Arm.FirstLevelDcacheFillSize = LenBits[CacheReg.DLength]; + ArmLoaderBlock->u.Arm.FirstLevelDcacheFillSize <<= 2; + ArmLoaderBlock->u.Arm.FirstLevelIcacheSize = SizeBits[CacheReg.ISize]; + ArmLoaderBlock->u.Arm.FirstLevelIcacheFillSize = LenBits[CacheReg.ILength]; + ArmLoaderBlock->u.Arm.FirstLevelIcacheFillSize <<= 2; + ArmLoaderBlock->u.Arm.SecondLevelDcacheSize = + ArmLoaderBlock->u.Arm.SecondLevelDcacheFillSize = + ArmLoaderBlock->u.Arm.SecondLevelIcacheSize = + ArmLoaderBlock->u.Arm.SecondLevelIcacheFillSize = 0; + // // Allocate the Interrupt stack // Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupDpcStack); - ArmLoaderBlock.u.Arm.InterruptStack = KSEG0_BASE | (ULONG)Base; + ArmLoaderBlock->u.Arm.InterruptStack = KSEG0_BASE | (ULONG)Base; // // Allocate the Kernel Boot stack // Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupKernelStack); - ArmLoaderBlock.KernelStack = KSEG0_BASE | (ULONG)Base; + ArmLoaderBlock->KernelStack = KSEG0_BASE | (ULONG)Base; // // Allocate the Abort stack // Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupPanicStack); - ArmLoaderBlock.u.Arm.PanicStack = KSEG0_BASE | (ULONG)Base; + ArmLoaderBlock->u.Arm.PanicStack = KSEG0_BASE | (ULONG)Base; // // Allocate the PCR page -- align it to 1MB (we only need 4KB) // Base = MmAllocateMemoryWithType(2 * 1024 * 1024, LoaderStartupPcrPage); Base = (PVOID)ROUND_UP(Base, 1 * 1024 * 1024); - ArmLoaderBlock.u.Arm.PcrPage = (ULONG)Base >> TTB_SHIFT; + ArmLoaderBlock->u.Arm.PcrPage = (ULONG)Base >> PDE_SHIFT; // // Allocate PDR pages -- align them to 1MB (we only need 3xKB) // Base = MmAllocateMemoryWithType(4 * 1024 * 1024, LoaderStartupPdrPage); Base = (PVOID)ROUND_UP(Base, 1 * 1024 * 1024); - ArmLoaderBlock.u.Arm.PdrPage = (ULONG)Base >> TTB_SHIFT; + ArmLoaderBlock->u.Arm.PdrPage = (ULONG)Base >> PDE_SHIFT; // // Set initial PRCB, Thread and Process on the last PDR page // Base = (PVOID)((ULONG)Base + 2 * 1024 * 1024); - ArmLoaderBlock.Prcb = KSEG0_BASE | (ULONG)Base; - ArmLoaderBlock.Process = ArmLoaderBlock.Prcb + sizeof(KPRCB); - ArmLoaderBlock.Thread = ArmLoaderBlock.Process + sizeof(EPROCESS); + ArmLoaderBlock->Prcb = KSEG0_BASE | (ULONG)Base; + ArmLoaderBlock->Process = ArmLoaderBlock->Prcb + sizeof(KPRCB); + ArmLoaderBlock->Thread = ArmLoaderBlock->Process + sizeof(EPROCESS); } VOID Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h Thu Feb 14 05:25:25 2008 @@ -5,7 +5,23 @@ #pragma GCC system_header #endif -#define TTB_SHIFT 20 +// +// Number of bits corresponding to the area that a PDE entry represents (1MB) +// +#define PDE_SHIFT 20 +#define PDE_SIZE (1 << PDE_SHIFT) + +// +// Number of bits corresponding to the area that a coarse page table entry represents (4KB) +// +#define PTE_SHIFT 12 +#define PAGE_SIZE (1 << PTE_SHIFT) + +// +// Number of bits corresponding to the area that a coarse page table occupies (1KB) +// +#define CPT_SHIFT 10 +#define CPT_SIZE (1 << CPT_SHIFT) typedef union _ARM_PTE { @@ -19,9 +35,10 @@ struct { ULONG Type:2; - ULONG Reserved:3; + ULONG Ignored:2; + ULONG Reserved:1; ULONG Domain:4; - ULONG Ignored:1; + ULONG Ignored1:1; ULONG BaseAddress:22; } Coarse; struct @@ -93,6 +110,11 @@ ARM_PTE Pte[4096]; } ARM_TRANSLATION_TABLE, *PARM_TRANSLATION_TABLE; +typedef struct _ARM_COARSE_PAGE_TABLE +{ + ARM_PTE Pte[256]; +} ARM_COARSE_PAGE_TABLE, *PARM_COARSE_PAGE_TABLE; + typedef enum _ARM_L1_PTE_TYPE { FaultPte, @@ -100,6 +122,13 @@ SectionPte, FinePte } ARM_L1_PTE_TYPE; + +typedef enum _ARM_L2_PTE_TYPE +{ + LargePte = 1, + SmallPte, + TinyPte +} ARM_L2_PTE_TYPE; typedef enum _ARM_PTE_ACCESS { Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/cpu.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/arm/cpu.c Thu Feb 14 05:25:25 2008 @@ -40,7 +40,7 @@ PARM_TRANSLATION_TABLE TranslationTable; // - // Hack for 1MB Section Entries + // Fixed TB entries must be section entries // Virtual = (PVOID)((ULONG)Virtual & 0xFFF00000); @@ -69,7 +69,7 @@ // Map the PTE for this virtual address // TranslationTable = (PVOID)KeArmTranslationTableRegisterGet().AsUlong; - TranslationTable->Pte[(ULONG)Virtual >> TTB_SHIFT] = Pte; + TranslationTable->Pte[(ULONG)Virtual >> PDE_SHIFT] = Pte; // // Now force a miss @@ -103,7 +103,7 @@ // // Clear the PTE // - TranslationTable->Pte[(ULONG)Virtual >> TTB_SHIFT].AsUlong = 0; + TranslationTable->Pte[(ULONG)Virtual >> PDE_SHIFT].AsUlong = 0; } } Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c Thu Feb 14 05:25:25 2008 @@ -19,10 +19,6 @@ ULONG KeNumberProcessIds; ULONG KeNumberTbEntries; #define __ARMV6__ KeIsArmV6 - -// -// METAFIXME: We need to stop using 1MB Section Entry TTEs! -// /* FUNCTIONS ******************************************************************/

1 0

[mpiulachs] 32349: -'win32csr' and 'access' localizations by Javier Ramacha See issue #3028 for more details.
by mpiulachs＠svn.reactos.org 13 Feb '08

13 Feb '08

Author: mpiulachs Date: Thu Feb 14 00:00:33 2008 New Revision: 32349 URL: http://svn.reactos.org/svn/reactos?rev=32349&view=rev Log: -'win32csr' and 'access' localizations by Javier Ramacha See issue #3028 for more details. Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc (with props) Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Thu Feb 14 00:00:33 2008 @@ -1,5 +1,6 @@ /* Spanish Resource file * ReactOS (c) 2006 Samuel Serapion + * ReactOS (c) 2008 Javier Remacha */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -9,61 +10,61 @@ CAPTION "Teclado" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Teclas Pegajosas",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Use Teclas Pegajosas si quiere utilizar las llaves Shift, Ctrl, ó Alt presionando una tecla a la vez.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&Usar Teclas Pegajosas",IDC_STICKY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + GROUPBOX "StickyKeys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Use StickyKeys si desea utilizar MAYÚS, Ctrl, ó Alt presionando una tecla a la vez.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Usar &StickyKeys ",IDC_STICKY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Opciones",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - GROUPBOX "Filtro de Teclas",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Use Teclas Filtradas si desea que Reactos ignore presionadas de teclas quebradas o repetidas, o hacer más corto la repetición de teclas.",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "Usar Teclas &Filtradas",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + GROUPBOX "FilterKeys",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Use FilterKeys si desea que Reactos omita la pulsaciones repetidas o breves, o reducir la velocidad de repetición.",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Usar &FilterKeys",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Opcion&es",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 - GROUPBOX "Teclas Activas",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Use &Teclas Activas si desea escuchar tonos al presionar Caps Lock, Num Lock, y Scroll Lock.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - AUTOCHECKBOX "Usar Teclas Activas",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + GROUPBOX "ToogleKeys",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Use &ToogleKeys si desea escuchar tonos al presionar Bloq Mayús, Bloq Num, y Bloq Despl.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "Usar &ToogleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Opcio&nes",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 - AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 + AUTOCHECKBOX "&Mostrar ayuda adicional de teclado en los programas.",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Sonidos" +CAPTION "Sonido" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Vigilante Auditivo",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) - LTEXT "Use el Vigilante Auditivo si desea que Reactos genere avisos visuales cuando sus systema haga un sonido.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "Use el Vigilante Auditivo si desea que Reactos genere avisos visuales cuando el sistema emita un sonido.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Usar Vigilante Auditivo",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Elija la advertencia visual:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Despliegue Sonidos",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Use el Despliegue de Sonidos para decirle a sus programas que enseñen texto por las voces y sonidos que utilizen.",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "Use el Despliegue de Sonidos sidesea que los programas muestren leyendas de voz y de los sonidos que emiten.",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Usar Despliegue de Sonidos",IDC_SSHOW_BOX,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Despliegue" +CAPTION "Pantalla" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Alto Contraste",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Use esta opción si desea que Reactos use colores y letras deseñadas para lectura fácil.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "Use esta opción si desea que Reactos use colores y letras diseñadas para una lectura más cómoda.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Usar Alto Contraste",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Opcione&s",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) - LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) - LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + GROUPBOX "Opciones del cursor",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Mueva los controles deslizantes para cambiar la velocidad de las intermitencias del cursor y la anchura del cursor.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Velocidad de intermitencia:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Ninguna",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Rápida",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) - CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) - LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CTEXT "Anchura:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Estrecho",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Ancho",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END @@ -71,12 +72,12 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Raton" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Raton de teclas",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Use esta opción si desea controlar el cursor con el teclado numerico de su teclado.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "Usar Raton de Teclas",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 +CAPTION "Ratón" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "MouseKeys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Use esta opción si desea controlar el cursor con el teclado numérico del teclado.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Usar &MouseKeys",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Opcione&s",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END @@ -86,222 +87,222 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "Apagar las opciones de accesibilidad despues de estar inactivo por:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + GROUPBOX "Reinicio automático",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "Desactivar las opciones de accesibilidad despues de estar inactivo por:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Notificación",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "Dar mensage de aviso al activar unacaracterística",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "Hacer un sonido al activar una característica",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "Dispositivos de Teclados Seriales",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - LTEXT "Los Dispositivos de Teclados Seriales te permiten una alternativa de acceso de teclado y raton.",-1,PROPSHEETPADDING(2),LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - AUTOCHECKBOX "Apoyar Dispositivos de Teclados &Seriales",IDC_SERIAL_BOX,PROPSHEETPADDING(2),LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + AUTOCHECKBOX "Mostrar advertencia al activar una característica",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "Emitir un sonido al activar o desactivar una característica",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Dispositivos SerialKey",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "Los dispositivos SerialKey permiten acceso alternativo a las caraterísticas del teclado y del ratón.",-1,PROPSHEETPADDING(2),LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "Usa&r SerialKey",IDC_SERIAL_BOX,PROPSHEETPADDING(2),LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Opcion&es",IDC_SERIAL_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(16)-4,PROPSHEETPADDING(15),14 - GROUPBOX "Opciones Administrativas",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "Applicar todas las opciones al escritorio de inicio",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "Applicar todas las opciones al escritorio de nuevos usuarios",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + GROUPBOX "Opciones administrativas",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "Aplicar todas las opciones al escritorio de inicio de sesión",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "Aplicar todas las opciones al escritorio de nuevos usuarios",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 END IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Sticky Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "Options",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +CAPTION "Configuración para StickyKeys" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Método abreviado de teclado",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "El método abreviado para StickyKeys es: \nPresionar la tecla MAYÚS cinco veces.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Utilizar método abreviado",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Opciones",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Presionar dos veces la tecla modificadora para bloquear",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Desactivar StickyKeys si se presionan dos teclas a la vez",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Notificación",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "P&roducir sonido al presionar la tecla modificada",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Mostrar en pantalla el estado de StickyKeys",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "Aceptar", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Filter Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for FilterKeys is: \nHold down <Right Shift> for eight seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&Use shortcut",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 - - GROUPBOX "Filter options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 - AUTORADIOBUTTON "Ign&ore repeated keystrokes",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEETPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP - AUTORADIOBUTTON "Ig&nore quick keystrokes and slow down the repeat rate",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE - PUSHBUTTON "&Settings",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP - PUSHBUTTON "S&ettings",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP - LTEXT "&Click here and type here to test the settings:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) +CAPTION "Configuración para FilterKeys" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Método abreviado de teclado",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "El método abreviado para FilterKeys es: \nMantener presionada <MAYÚS Drch> ocho segundos.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Utilizar método abreviado",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + + GROUPBOX "Opciones de filtro",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 + AUTORADIOBUTTON "&Pasar pos alto pulsaciones repetidas",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEETPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP + AUTORADIOBUTTON "P&asar por alto pulsaciones repetidas y disminuir la velocidad de repetición",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE + PUSHBUTTON "C&onfiguración",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP + PUSHBUTTON "Co&nfiguración",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP + LTEXT "Es&criba aquí para probar la configuración:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) EDITTEXT IDC_FILTER_TEST_EDIT,PROPSHEETPADDING(2),LABELLINE(15)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),14,WS_GROUP|ES_AUTOHSCROLL - GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+3 - AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + GROUPBOX "Notificación",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+3 + AUTOCHECKBOX "&Emitir un sonido al presionar o aceptar taclas",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + AUTOCHECKBOX "Mo&strar en pantalla el estado de FilterKeys",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + + DEFPUSHBUTTON "Aceptar", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Toggle Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +CAPTION "Configuración para ToogleKeys" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Método abreviado de teclado",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "El método abreviado para ToogleKeys es: \nMantener presionado <Block Num> cinco segundos.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Utilizar método abreviado",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "Aceptar", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "High Contrast Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) +CAPTION "Configuración para Alto contraste" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Método abreviado de teclado",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "El método abreviado para Alto contraste es: \nPresionar <Alt Izq+Mayús Izq+Impr Pant>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Utilizar método abreviado",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Combinación en contraste alto",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Su combinación actual en alto contraste es:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Mouse Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) - - LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) - LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) +CAPTION "Configuración para MouseKeys" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Método abreviado de teclado",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "El método abreviado para el Ratón de teclas es: \nPresionar <Alt Izq+Mayús Izq+Bloq Num>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Utilizar método abreviado",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Velocidad del puntero",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Velocidad máxima:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Baja",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) - LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + LTEXT "Alta",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Aceleración:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Lenta",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) - - AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - - AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + LTEXT "Rápida",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Presionar Ctrl para aumentar la velocidad o Mayús para disminuirla",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Utilizar MouseKeys cuando Bloq Num esté:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "A&ctivada",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "D&esactivada",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Mostrar en pantalla el estado de MouseKeys",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "Aceptar", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_BOUNCEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced FilterKeys Settings" +CAPTION "Configuración avanzada para FilterKeys" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + LTEXT "&Ignorar pulsaciones cuya velocidad de repetición sea superior a:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Ár&ea de prueba:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced FilterKeys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) - LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) - - LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) +CAPTION "Configuración avanzada para RepeatKeys" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "RepeatKeys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Hacer prevalecer esta configuración de teclado sobre la del Panel de Control:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + AUTORADIOBUTTON "&Sin repetición en el teclado",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Disminuir la velocidad de repetición del teclado",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Retras&o de la repetición:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + LTEXT "Velocidad de &repetición:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 - LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "&Las teclas deben mantenerse presionadas durante:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Ár&ea de prueba:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "SerialKeys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) - LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "&Serial port:",-1,PROPSHEETPADDING(2),LABELLINE(3)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) +CAPTION "Configuración para SerialKeys" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "SerialKeys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Elija el puerto al que conectará un dispositivo de entrada alternativo.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Puerto serie:",-1,PROPSHEETPADDING(2),LABELLINE(3)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) COMBOBOX IDC_SERIAL_PORT_COMBO, PROPSHEETPADDING(2), LABELLINE(4)+7, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "&Baud rate:",-1,PROPSHEETPADDING(2),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + LTEXT "&Velocidad en baudios:",-1,PROPSHEETPADDING(2),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) COMBOBOX IDC_SERIAL_BAUD_COMBO, PROPSHEETPADDING(2), LABELLINE(8)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Accessibilidad" - IDS_CPLSYSTEMDESCRIPTION "Cambia las características de accesibilidad disponibles para su computadora." - - IDS_SENTRY_NONE "[None]" - IDS_SENTRY_TITLE "Flash the titlebar" - IDS_SENTRY_WINDOW "Flash the active window" - IDS_SENTRY_DISPLAY "Flash the desktop" - - IDS_SECONDS "Seconds" - IDS_MINUTES "Minutes" -END + IDS_CPLSYSTEMNAME "Accesibilidad" + IDS_CPLSYSTEMDESCRIPTION "Cambia las características de accesibilidad disponibles para su equipo." + + IDS_SENTRY_NONE "[Ninguno]" + IDS_SENTRY_TITLE "Hacer parpadear la barra de título" + IDS_SENTRY_WINDOW "Hacer parpadear la ventana activa" + IDS_SENTRY_DISPLAY "Hacer parpadear el escritorio" + + IDS_SECONDS "Segundos" + IDS_MINUTES "Minutos" +END Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc Thu Feb 14 00:00:33 2008 @@ -1,0 +1,53 @@ +/* + *Spanish Language resource file + * Traducido por: Javier Remacha 2008-26-01 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizar programa - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Finalizando programa... Por favor, espere",IDC_STATIC,7,7,186,11 + CONTROL "Progreso",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Si elige finalizar el programa ahora, perderá todos los datos no guardados. Para finalizar el programa ahora, haga clic en Finalizar ahora.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Finalizar ahora",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizar programa - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Cancelar",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Finalizar ahora",IDC_END_NOW,78,98,43,17 + LTEXT "Este programa no responde",IDC_STATIC,7,7,178,8 + LTEXT "Para volver a ReactOS y ver el estado del programa, haga clic en Cancelar", + IDC_STATIC,7,26,178,16 + LTEXT "Si elige finalizar el programa ahora, perderá todos los datos no guardados. Para finalizar el programa ahora, haga clic en Finalizar ahora.", + IDC_STATIC,7,53,178,26 +END + +STRINGTABLE +BEGIN + IDS_EDIT "Editar" + IDS_MARK "Marcar" + IDS_COPY "Copiar\tIntroducir" + IDS_PASTE "Pegar" + IDS_SELECTALL "Select All" + IDS_SCROLL "Desplazar" + IDS_FIND "Buscar..." + IDS_DEFAULTS "Por defecto" + IDS_PROPERTIES "Propiedades" + IDS_SCROLLHERE "Desplazar aquí" + IDS_SCROLLTOP "Desplazar hasta arriba" + IDS_SCROLLBOTTOM "Desplazar hasta abajo" + IDS_SCROLLPAGE_UP "Subir página" + IDS_SCROLLPAGE_DOWN "Bajar página" + IDS_SCROLLUP "Desplazar arriba" + IDS_SCROLLDOWN "Desplazar abajo" +END Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Thu Feb 14 00:00:33 2008 @@ -9,6 +9,7 @@ #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc"

1 0

[janderwald] 32348: - use tchar - rename dialog to win xp sp2+ name
by janderwald＠svn.reactos.org 13 Feb '08

13 Feb '08

Author: janderwald Date: Wed Feb 13 20:51:41 2008 New Revision: 32348 URL: http://svn.reactos.org/svn/reactos?rev=32348&view=rev Log: - use tchar - rename dialog to win xp sp2+ name Modified: trunk/reactos/dll/cpl/desk/general.c trunk/reactos/dll/cpl/desk/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/general.c (original) +++ trunk/reactos/dll/cpl/desk/general.c Wed Feb 13 20:51:41 2008 @@ -18,7 +18,7 @@ hFontSize = GetDlgItem(hWnd, IDC_FONTSIZE_COMBO); - hInf = SetupOpenInfFile(L"font.inf", NULL, + hInf = SetupOpenInfFile(_T("font.inf"), NULL, INF_STYLE_WIN4, NULL); if (hInf != INVALID_HANDLE_VALUE) Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Wed Feb 13 20:51:41 2008 @@ -2,7 +2,7 @@ IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hintergrund" +CAPTION "Desktop" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW,

1 0

[dchapyshev] 32347: - Fix build
by dchapyshev＠svn.reactos.org 13 Feb '08

13 Feb '08

Author: dchapyshev Date: Wed Feb 13 20:09:51 2008 New Revision: 32347 URL: http://svn.reactos.org/svn/reactos?rev=32347&view=rev Log: - Fix build Modified: trunk/reactos/dll/win32/winfax/precomp.h Modified: trunk/reactos/dll/win32/winfax/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winfax/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/winfax/precomp.h (original) +++ trunk/reactos/dll/win32/winfax/precomp.h Wed Feb 13 20:09:51 2008 @@ -1,5 +1,5 @@ #include <windows.h> -#include <WinFax.h> +#include <winfax.h> /* INTERNAL *******************************************************************/

1 0

[dchapyshev] 32346: - Add winhttp.dll from Wine - Add winhttp.h from Wine - Add rbuild file for winfax.dll - Add winhttp and winfax to bootcd
by dchapyshev＠svn.reactos.org 13 Feb '08

13 Feb '08

Author: dchapyshev Date: Wed Feb 13 19:46:28 2008 New Revision: 32346 URL: http://svn.reactos.org/svn/reactos?rev=32346&view=rev Log: - Add winhttp.dll from Wine - Add winhttp.h from Wine - Add rbuild file for winfax.dll - Add winhttp and winfax to bootcd Added: trunk/reactos/dll/win32/winfax/winfax.rbuild (with props) trunk/reactos/dll/win32/winhttp/ trunk/reactos/dll/win32/winhttp/main.c (with props) trunk/reactos/dll/win32/winhttp/winhttp.rbuild (with props) trunk/reactos/dll/win32/winhttp/winhttp.spec (with props) trunk/reactos/include/psdk/winhttp.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=323… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Wed Feb 13 19:46:28 2008 @@ -163,4 +163,5 @@ <property name="BASEADDRESS_BEEPMIDI" value="0x7ef0000" /> <property name="BASEADDRESS_FREETYPE" value="0x7f000000" /> <property name="BASEADDRESS_MSCOREE" value="0x79000000" /> + <property name="BASEADDRESS_WINHTTP" value="0x70c60000" /> </group> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Wed Feb 13 19:46:28 2008 @@ -269,6 +269,8 @@ dll\win32\uxtheme\uxtheme.dll 1 dll\win32\vdmdbg\vdmdbg.dll 1 dll\win32\version\version.dll 1 +dll\win32\winfax\winfax.dll 1 +dll\win32\winhttp\winhttp.dll 1 dll\win32\wininet\wininet.dll 1 dll\win32\winmm\winmm.dll 1 dll\win32\winspool\winspool.drv 1 Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Wed Feb 13 19:46:28 2008 @@ -322,6 +322,12 @@ <directory name="version"> <xi:include href="version/version.rbuild" /> </directory> +<directory name="winfax"> + <xi:include href="winfax/winfax.rbuild" /> +</directory> +<directory name="winhttp"> + <xi:include href="winhttp/winhttp.rbuild" /> +</directory> <directory name="wininet"> <xi:include href="wininet/wininet.rbuild" /> </directory> Added: trunk/reactos/dll/win32/winfax/winfax.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winfax/winfax.rb… ============================================================================== --- trunk/reactos/dll/win32/winfax/winfax.rbuild (added) +++ trunk/reactos/dll/win32/winfax/winfax.rbuild Wed Feb 13 19:46:28 2008 @@ -1,0 +1,13 @@ +<module name="winfax" type="win32dll" baseaddress="${BASEADDRESS_WINFAX}" installbase="system32" installname="winfax.dll" allowwarnings="true" entrypoint="0"> + <importlibrary definition="winfax.def" /> + <include base="winfax">.</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>kernel32</library> + <library>ntdll</library> + <file>winfax.c</file> + <file>winfax.rc</file> +</module> Propchange: trunk/reactos/dll/win32/winfax/winfax.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/winhttp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/winhttp/main.c (added) +++ trunk/reactos/dll/win32/winhttp/main.c Wed Feb 13 19:46:28 2008 @@ -1,0 +1,131 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "winhttp.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winhttp); + +/****************************************************************** + * DllMain (winhttp.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/****************************************************************** + * DllGetClassObject (winhttp.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow (winhttp.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("()\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (winhttp.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("()\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (winhttp.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("()\n"); + return S_OK; +} + +/*********************************************************************** + * WinHttpCheckPlatform (winhttp.@) + */ +BOOL WINAPI WinHttpCheckPlatform(void) +{ + FIXME("stub\n"); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/*********************************************************************** + * WinHttpGetIEProxyConfigForCurrentUser (winhttp.@) + */ +BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config) +{ + if(!config) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* TODO: read from HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings */ + FIXME("returning no proxy used\n"); + config->fAutoDetect = FALSE; + config->lpszAutoConfigUrl = NULL; + config->lpszProxy = NULL; + config->lpszProxyBypass = NULL; + + SetLastError(ERROR_SUCCESS); + return TRUE; +} + +/*********************************************************************** + * WinHttpOpen (winhttp.@) + */ +HINTERNET WINAPI WinHttpOpen(LPCWSTR pwszUserAgent, DWORD dwAccessType, + LPCWSTR pwszProxyName, LPCWSTR pwszProxyByPass, + DWORD dwFlags) +{ + FIXME("(%s, %d, %s, %s, 0x%x): stub\n", debugstr_w(pwszUserAgent), + dwAccessType, debugstr_w(pwszProxyName), debugstr_w(pwszProxyByPass), + dwFlags); + + SetLastError(ERROR_NOT_SUPPORTED); + return NULL; +} Propchange: trunk/reactos/dll/win32/winhttp/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/winhttp/winhttp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp.rbuild (added) +++ trunk/reactos/dll/win32/winhttp/winhttp.rbuild Wed Feb 13 19:46:28 2008 @@ -1,0 +1,16 @@ +<module name="winhttp" type="win32dll" baseaddress="${BASEADDRESS_WINHTTP}" installbase="system32" installname="winhttp.dll" allowwarnings="true" entrypoint="0"> + <importlibrary definition="winhttp.spec.def" /> + <include base="winhttp">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> + <file>main.c</file> + <file>winhttp.spec</file> +</module> Propchange: trunk/reactos/dll/win32/winhttp/winhttp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/winhttp/winhttp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp.spec (added) +++ trunk/reactos/dll/win32/winhttp/winhttp.spec Wed Feb 13 19:46:28 2008 @@ -1,0 +1,31 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub WinHttpAddRequestHeaders +@ stdcall WinHttpCheckPlatform() +@ stub WinHttpCloseHandle +@ stub WinHttpConnect +@ stub WinHttpCrackUrl +@ stub WinHttpCreateUrl +@ stub WinHttpDetectAutoProxyConfigUrl +@ stub WinHttpGetDefaultProxyConfiguration +@ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) +@ stub WinHttpGetProxyForUrl +@ stdcall WinHttpOpen(wstr long wstr wstr long) +@ stub WinHttpOpenRequest +@ stub WinHttpQueryAuthSchemes +@ stub WinHttpQueryDataAvailable +@ stub WinHttpQueryHeaders +@ stub WinHttpQueryOption +@ stub WinHttpReadData +@ stub WinHttpReceiveResponse +@ stub WinHttpSendRequest +@ stub WinHttpSetCredentials +@ stub WinHttpSetDefaultProxyConfiguration +@ stub WinHttpSetOption +@ stub WinHttpSetStatusCallback +@ stub WinHttpSetTimeouts +@ stub WinHttpTimeFromSystemTime +@ stub WinHttpTimeToSystemTime +@ stub WinHttpWriteData Propchange: trunk/reactos/dll/win32/winhttp/winhttp.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/winhttp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winhttp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winhttp.h (added) +++ trunk/reactos/include/psdk/winhttp.h Wed Feb 13 19:46:28 2008 @@ -1,0 +1,174 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINHTTP_H +#define __WINE_WINHTTP_H + +#define WINHTTPAPI +#define BOOLAPI WINHTTPAPI BOOL WINAPI + + +typedef LPVOID HINTERNET; +typedef HINTERNET *LPHINTERNET; + +#define INTERNET_DEFAULT_PORT 0 +#define INTERNET_DEFAULT_HTTP_PORT 80 +#define INTERNET_DEFAULT_HTTPS_PORT 443 +typedef WORD INTERNET_PORT; +typedef INTERNET_PORT *LPINTERNET_PORT; + +#define INTERNET_SCHEME_HTTP 1 +#define INTERNET_SCHEME_HTTPS 2 +typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; + +/* flags for WinHttpOpen */ +#define WINHTTP_FLAG_ASYNC 0x10000000 + +/* flags for WinHttpOpenRequest */ +#define WINHTTP_FLAG_ESCAPE_PERCENT 0x00000004 +#define WINHTTP_FLAG_NULL_CODEPAGE 0x00000008 +#define WINHTTP_FLAG_ESCAPE_DISABLE 0x00000040 +#define WINHTTP_FLAG_ESCAPE_DISABLE_QUERY 0x00000080 +#define WINHTTP_FLAG_BYPASS_PROXY_CACHE 0x00000100 +#define WINHTTP_FLAG_REFRESH WINHTTP_FLAG_BYPASS_PROXY_CACHE +#define WINHTTP_FLAG_SECURE 0x00800000 + +#define WINHTTP_ACCESS_TYPE_DEFAULT_PROXY 0 +#define WINHTTP_ACCESS_TYPE_NO_PROXY 1 +#define WINHTTP_ACCESS_TYPE_NAMED_PROXY 3 + +#define WINHTTP_NO_PROXY_NAME NULL +#define WINHTTP_NO_PROXY_BYPASS NULL + +#define WINHTTP_NO_REFERER NULL +#define WINHTTP_DEFAULT_ACCEPT_TYPES NULL + +#define WINHTTP_ERROR_BASE 12000 + +typedef struct +{ + DWORD dwStructSize; + LPWSTR lpszScheme; + DWORD dwSchemeLength; + INTERNET_SCHEME nScheme; + LPWSTR lpszHostName; + DWORD dwHostNameLength; + INTERNET_PORT nPort; + LPWSTR lpszUserName; + DWORD dwUserNameLength; + LPWSTR lpszPassword; + DWORD dwPasswordLength; + LPWSTR lpszUrlPath; + DWORD dwUrlPathLength; + LPWSTR lpszExtraInfo; + DWORD dwExtraInfoLength; +} URL_COMPONENTS, *LPURL_COMPONENTS; +typedef URL_COMPONENTS URL_COMPONENTSW; +typedef LPURL_COMPONENTS LPURL_COMPONENTSW; + +typedef struct +{ + DWORD_PTR dwResult; + DWORD dwError; +} WINHTTP_ASYNC_RESULT, *LPWINHTTP_ASYNC_RESULT; + +typedef struct +{ + FILETIME ftExpiry; + FILETIME ftStart; + LPWSTR lpszSubjectInfo; + LPWSTR lpszIssuerInfo; + LPWSTR lpszProtocolName; + LPWSTR lpszSignatureAlgName; + LPWSTR lpszEncryptionAlgName; + DWORD dwKeySize; +} WINHTTP_CERTIFICATE_INFO; + +typedef struct +{ + DWORD dwAccessType; + LPCWSTR lpszProxy; + LPCWSTR lpszProxyBypass; +} WINHTTP_PROXY_INFO, *LPWINHTTP_PROXY_INFO; +typedef WINHTTP_PROXY_INFO WINHTTP_PROXY_INFOW; +typedef LPWINHTTP_PROXY_INFO LPWINHTTP_PROXY_INFOW; + +typedef struct +{ + BOOL fAutoDetect; + LPWSTR lpszAutoConfigUrl; + LPWSTR lpszProxy; + LPWSTR lpszProxyBypass; +} WINHTTP_CURRENT_USER_IE_PROXY_CONFIG; + +typedef VOID (CALLBACK *WINHTTP_STATUS_CALLBACK)(HINTERNET,DWORD_PTR,DWORD,LPVOID,DWORD); + +typedef struct +{ + DWORD dwFlags; + DWORD dwAutoDetectFlags; + LPCWSTR lpszAutoConfigUrl; + LPVOID lpvReserved; + DWORD dwReserved; + BOOL fAutoLogonIfChallenged; +} WINHTTP_AUTOPROXY_OPTIONS; + +typedef struct +{ + DWORD dwMajorVersion; + DWORD dwMinorVersion; +} HTTP_VERSION_INFO, *LPHTTP_VERSION_INFO; + + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); +BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); +BOOL WINAPI WinHttpCheckPlatform(void); +BOOL WINAPI WinHttpCloseHandle(HINTERNET); +HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); +BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); +BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); +BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); +BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config); +BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); +HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); +HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,DWORD); +BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); +BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); +BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); +BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); +BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); +BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); +BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); +BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); +BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); +BOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); +WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR); +BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); +BOOL WINAPI WinHttpTimeFromSystemTime(CONST SYSTEMTIME *,LPWSTR); +BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); +BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINHTTP_H */ Propchange: trunk/reactos/include/psdk/winhttp.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 32345: - Update Russian translation
by dchapyshev＠svn.reactos.org 13 Feb '08

13 Feb '08

Author: dchapyshev Date: Wed Feb 13 18:38:05 2008 New Revision: 32345 URL: http://svn.reactos.org/svn/reactos?rev=32345&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Wed Feb 13 18:38:05 2008 @@ -566,13 +566,13 @@ { 10, 8, - "â® ¬®¦¥â § ïâì ¬¨ãâã", + "â® ¬®¦¥â § ïâì ¥ª®â®à®¥ ¢à¥¬ï.", TEXT_NORMAL }, { 10, 9, - "®á«¥ § ¢¥àè¥¨ï ª®¬¯ìîâ¥à ¡ã¤¥â ¢â®¬ â¨ç¥áª¨ ¯¥à¥§ £àã¦¥", + "®á«¥ § ¢¥àè¥¨ï ª®¬¯ìîâ¥à ¡ã¤¥â ¢â®¬ â¨ç¥áª¨ ¯¥à¥§ £àã¦¥.", TEXT_NORMAL }, { @@ -721,7 +721,7 @@ { 0, 0, - " ENTER = ¥à¥§ £àã§¨âì ª®¬¯ìîâ¥à", + " ENTER = ¥à¥§ £àã§ª ", TEXT_STATUS }, { @@ -1581,23 +1581,23 @@ {STRING_CHOOSENEWPARTITION, "ë å®â¨â¥ á®§¤ âì ®¢ë© à §¤¥« "}, {STRING_HDDSIZE, - "Please enter the size of the new partition in megabytes."}, + "®¦ «ã©áâ , ¢¢¥¤¨â¥ à §¬¥à ®¢®£® à §¤¥« ¢ ¬¥£ ¡ ©â å."}, {STRING_CREATEPARTITION, " ENTER = ®§¤ âì à §¤¥« ESC = â¬¥ F3 = ëå®¤"}, {STRING_PARTFORMAT, - "This Partition will be formatted next."}, + "â®â à §¤¥« ¡ã¤¥â ®âä®à¬ â¨à®¢ ¤ «¥¥."}, {STRING_NONFORMATTEDPART, - "You chose to install ReactOS on a new or unformatted Partition."}, + "ë ¢ë¡à «¨ ãáâ ®¢ªã ReactOS ®¢ë© ¥®âä®à¬ â¨à®¢ ë© à §¤¥«."}, {STRING_INSTALLONPART, - "Setup install ReactOS onto Partition"}, + "áâ ¢«¨¢ ¥âáï ReactOS à §¤¥«"}, {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, + "à®£à ¬¬ ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ë¡à ë© à §¤¥«."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3 = ëå®¤ ENTER = à®¤®«¦¥¨¥"}, {STRING_REBOOTCOMPUTER, - "ENTER = Reboot computer"}, + "ENTER = ¥à¥§ £àã§ª "}, {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + "à®£à ¬¬ ãáâ ®¢ª¨ ¥ á¬®£« ©â¨ á¥ªæ¨î '%S'\n¢ ä ©«¥ TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 ®¯¨à®¢ ¨¥: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1609,37 +1609,37 @@ {STRING_FREEMEM, "¢®¡®¤ ï ¯ ¬ïâì"}, {STRING_REGHIVEUPDATE, - " Updating registry hives..."}, + " ¡®¢«¥¨¥ ªãáâ®¢ à¥¥áâà ..."}, {STRING_IMPORTFILE, - " Importing %S..."}, + " ¬¯®àâ¨à®¢ ¨¥ %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Updating display registry settings..."}, + " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ íªà ¢ à¥¥áâà¥..."}, {STRING_LOCALESETTINGSUPDATE, - " Updating locale settings..."}, + " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ «®ª «¨..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " Updating keyboard layout settings..."}, + " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ à áª« ¤ª¨ ª« ¢¨ âãàë..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " ®¡ ¢«¥¨¥ ¨ä®à¬ æ¨¨ ® ª®¤®¢®© áâà ¨æ¥ ¢ à¥¥áâà..."}, {STRING_DONE, - " Done..."}, + " ¢¥àè¥®..."}, {STRING_REBOOTCOMPUTER2, - " ENTER = Reboot computer"}, + " ENTER = ¥à¥§ £àã§ª "}, {STRING_CONSOLEFAIL1, - "Unable to open the console\n\n"}, + "¥ ã¤ «®áì ®âªàëâì ª®á®«ì\n\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + " ¨¡®«¥¥ ¢¥à®ïâ ï ¯à¨ç¨ íâ®£® - ¨á¯®«ì§®¢ ¨¥ USB-ª« ¢¨ âãàë\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + "USB ª« ¢¨ âãàë á¥©ç á ¯®¤¤¥à¦¨¢ îâáï ¥ ¯®«®áâìî\n"}, {STRING_FORMATTINGDISK, - "Setup is formatting your disk"}, + "à®£à ¬¬ ãáâ ®¢ª¨ ä®à¬ â¨àã¥â ¢ è ¤¨áª"}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "à®£à ¬¬ ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ è ¤¨áª"}, {STRING_FORMATDISK1, - " Format partition as %S file system (quick format) "}, + " ®à¬ â¨à®¢ ¨¥ à §¤¥« ¢ ä ©«®¢®© á¨áâ¥¬¥ %S (¡ëáâà®¥) "}, {STRING_FORMATDISK2, - " Format partition as %S file system "}, + " ®à¬ â¨à®¢ ¨¥ à §¤¥« ¢ ä ©«®¢®© á¨áâ¥¬¥ %S "}, {STRING_KEEPFORMAT, - " Keep current file system (no changes) "}, + " áâ ¢¨âì áãé¥áâ¢ãîéãî ä ©«®¢ãî á¨áâ¥¬ã (¡¥§ ¨§¬¥¥¨©) "}, {0, 0} };

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008