Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[akorotaev] 31568: Merge that too. Now it links, but asserts at early boot phase.

by akorotaev＠svn.reactos.org

Author: akorotaev Date: Wed Jan 2 22:36:10 2008 New Revision: 31568 URL: http://svn.reactos.org/svn/reactos?rev=31568&view=rev Log: Merge that too. Now it links, but asserts at early boot phase. Modified: branches/cache_manager_rewrite/mm/i386/page.c Modified: branches/cache_manager_rewrite/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/i386/p… ============================================================================== --- branches/cache_manager_rewrite/mm/i386/page.c (original) +++ branches/cache_manager_rewrite/mm/i386/page.c Wed Jan 2 22:36:10 2008 @@ -75,22 +75,23 @@ BOOLEAN MmUnmapPageTable(PULONG Pt); -VOID -STDCALL -MiFlushTlbIpiRoutine(PVOID Address) -{ - if (Address == (PVOID)0xffffffff) +ULONG_PTR +NTAPI +MiFlushTlbIpiRoutine(ULONG_PTR Address) +{ + if (Address == (ULONG_PTR)-1) { KeFlushCurrentTb(); } - else if (Address == (PVOID)0xfffffffe) + else if (Address == (ULONG_PTR)-2) { KeFlushCurrentTb(); } else { - __invlpg(Address); - } + __invlpg((PVOID)Address); + } + return 0; } VOID @@ -101,13 +102,13 @@ { MmUnmapPageTable(Pt); } - if (KeNumberProcessors>1) - { - KeIpiGenericCall(MiFlushTlbIpiRoutine, Address); - } - else - { - MiFlushTlbIpiRoutine(Address); + if (KeNumberProcessors > 1) + { + KeIpiGenericCall(MiFlushTlbIpiRoutine, (ULONG_PTR)Address); + } + else + { + MiFlushTlbIpiRoutine((ULONG_PTR)Address); } #else if ((Pt && MmUnmapPageTable(Pt)) || Address >= MmSystemRangeStart) @@ -325,17 +326,33 @@ } NTSTATUS +NTAPI +MmInitializeHandBuiltProcess(IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) +{ + /* Share the directory base with the idle process */ + *DirectoryTableBase = PsGetCurrentProcess()->Pcb.DirectoryTableBase; + + /* Initialize the Addresss Space */ + MmInitializeAddressSpace(Process, (PMADDRESS_SPACE)&Process->VadRoot); + + /* The process now has an address space */ + Process->HasAddressSpace = TRUE; + return STATUS_SUCCESS; +} + +BOOLEAN STDCALL -MmCopyMmInfo(PEPROCESS Src, - PEPROCESS Dest, - PPHYSICAL_ADDRESS DirectoryTableBase) +MmCreateProcessAddressSpace(IN ULONG MinWs, + IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) { NTSTATUS Status; ULONG i, j; PFN_TYPE Pfn[7]; ULONG Count; - DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", Src, Dest); + DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", MinWs, Process); Count = Ke386Pae ? 7 : 2; @@ -344,11 +361,12 @@ Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn[i]); if (!NT_SUCCESS(Status)) { - for (j = 0; j < i; j++) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[j]); - } - return Status; + for (j = 0; j < i; j++) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[j]); + } + + return FALSE; } } @@ -400,7 +418,7 @@ DirectoryTableBase->QuadPart = PFN_TO_PTE(Pfn[0]); DPRINT("Finished MmCopyMmInfo(): %I64x\n", DirectoryTableBase->QuadPart); - return(STATUS_SUCCESS); + return TRUE; } VOID @@ -625,7 +643,7 @@ if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) { - PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart)); + PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.LowPart)); if (PageDir == NULL) { KEBUGCHECK(0); @@ -1925,8 +1943,16 @@ { if (!MmIsUsablePage(Pages[i])) { - DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); - KEBUGCHECK(0); + /* Is this an attempt to map KUSER_SHARED_DATA? */ + if ((Address == (PVOID)0x7FFE0000) && (PageCount == 1) && (Pages[0] == 2)) + { + // allow + } + else + { + DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); + KEBUGCHECK(0); + } } }

16 years, 8 months

[akorotaev] 31567: Merge changes from HEAD. It still doesn't link.

by akorotaev＠svn.reactos.org

Author: akorotaev Date: Wed Jan 2 22:12:58 2008 New Revision: 31567 URL: http://svn.reactos.org/svn/reactos?rev=31567&view=rev Log: Merge changes from HEAD. It still doesn't link. Modified: branches/cache_manager_rewrite/mm/anonmem.c branches/cache_manager_rewrite/mm/cont.c branches/cache_manager_rewrite/mm/drvlck.c branches/cache_manager_rewrite/mm/elf.inc.h branches/cache_manager_rewrite/mm/elf32.c branches/cache_manager_rewrite/mm/elf64.c branches/cache_manager_rewrite/mm/freelist.c branches/cache_manager_rewrite/mm/iospace.c branches/cache_manager_rewrite/mm/marea.c branches/cache_manager_rewrite/mm/mm.c branches/cache_manager_rewrite/mm/mminit.c branches/cache_manager_rewrite/mm/mpw.c branches/cache_manager_rewrite/mm/npool.c branches/cache_manager_rewrite/mm/pagefile.c Modified: branches/cache_manager_rewrite/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/anonme… ============================================================================== --- branches/cache_manager_rewrite/mm/anonmem.c (original) +++ branches/cache_manager_rewrite/mm/anonmem.c Wed Jan 2 22:12:58 2008 @@ -27,14 +27,14 @@ * Ge van Geldorp * Eric Kohl * Royce Mitchell III - * Aleksey Bragin + * Aleksey Bragin * Jason Filby * Art Yerkes * Gunnar Andre' Dalsnes * Filip Navara * Thomas Weidenmueller * Alex Ionescu - * Trevor McCort + * Trevor McCort * Steven Edwards */ @@ -516,12 +516,12 @@ * @implemented */ NTSTATUS STDCALL -NtAllocateVirtualMemory(IN HANDLE ProcessHandle, - IN OUT PVOID* UBaseAddress, - IN ULONG ZeroBits, +NtAllocateVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID* UBaseAddress, + IN ULONG ZeroBits, IN OUT PULONG URegionSize, - IN ULONG AllocationType, - IN ULONG Protect) + IN ULONG AllocationType, + IN ULONG Protect) /* * FUNCTION: Allocates a block of virtual memory in the process address space * ARGUMENTS: @@ -542,6 +542,10 @@ * PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_GUARD, * PAGE_NOACCESS * RETURNS: Status + * NOTES: Must run at IRQL PASSIVE_LEVEL? (or is APC_LEVEL cool too?) + * MSDN states that ZwAllocateVirtualMemory IRQL must be PASSIVE_LEVEL, + * but why wouldn't APC_LEVEL be valid (or is that only for the Zw* version + * and Nt* can indeed run at APC_LEVEL?) */ { PEPROCESS Process; @@ -555,6 +559,12 @@ PVOID PBaseAddress; ULONG PRegionSize; PHYSICAL_ADDRESS BoundaryAddressMultiple; + KPROCESSOR_MODE PreviousMode; + + // TMN: Someone Pick one of these. Until it's clear which + // level is allowed, I play it safe and check for <= APC_LEVEL + PAGED_CODE(); +// ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); DPRINT("NtAllocateVirtualMemory(*UBaseAddress %x, " "ZeroBits %d, *URegionSize %x, AllocationType %x, Protect %x)\n", @@ -576,7 +586,7 @@ } /* Check for valid Allocation Types */ - if ((AllocationType &~ (MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | + if ((AllocationType & ~(MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | MEM_TOP_DOWN | MEM_WRITE_WATCH))) { DPRINT1("Invalid Allocation Type\n"); @@ -589,11 +599,11 @@ DPRINT1("No memory allocation base type\n"); return STATUS_INVALID_PARAMETER_5; } - + /* MEM_RESET is an exclusive flag, make sure that is valid too */ if ((AllocationType & MEM_RESET) && (AllocationType != MEM_RESET)) { - DPRINT1("MEM_RESET used illegaly\n"); + DPRINT1("Invalid use of MEM_RESET\n"); return STATUS_INVALID_PARAMETER_5; } @@ -623,27 +633,45 @@ } } - PBaseAddress = *UBaseAddress; - PRegionSize = *URegionSize; + PreviousMode = KeGetPreviousMode(); + + _SEH_TRY + { + if (PreviousMode != KernelMode) + { + ProbeForWritePointer(UBaseAddress); + ProbeForWriteUlong(URegionSize); + } + PBaseAddress = *UBaseAddress; + PRegionSize = *URegionSize; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + _SEH_YIELD(return Status); + } + _SEH_END; + BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - PAGE_ROUND_DOWN(PBaseAddress); - /* + /* * We've captured and calculated the data, now do more checks * Yes, MmCreateMemoryArea does similar checks, but they don't return * the right status codes that a caller of this routine would expect. */ if (BaseAddress >= MM_HIGHEST_USER_ADDRESS) { - DPRINT1("Virtual allocation above User Space\n"); + DPRINT1("Virtual allocation base above User Space\n"); return STATUS_INVALID_PARAMETER_2; } if (!RegionSize) { - DPRINT1("Region size is invalid\n"); + DPRINT1("Region size is invalid (zero)\n"); return STATUS_INVALID_PARAMETER_4; } if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)BaseAddress) < RegionSize) @@ -652,12 +680,12 @@ return STATUS_INVALID_PARAMETER_4; } - /* + /* * Copy on Write is reserved for system use. This case is a certain failure * but there may be other cases...needs more testing */ - if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && - ((Protect & PAGE_WRITECOPY) || (Protect & PAGE_EXECUTE_WRITECOPY))) + if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && + (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) { DPRINT1("Copy on write is not supported by VirtualAlloc\n"); return STATUS_INVALID_PAGE_PROTECTION; @@ -666,8 +694,8 @@ Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_VM_OPERATION, - NULL, - UserMode, + PsProcessType, + PreviousMode, (PVOID*)(&Process), NULL); if (!NT_SUCCESS(Status)) @@ -750,10 +778,10 @@ MemoryAreaLength, Type, Protect); if ((AllocationType & MEM_COMMIT) && - ((Protect & PAGE_READWRITE) || - (Protect & PAGE_EXECUTE_READWRITE))) - { - MmReserveSwapPages(MemoryAreaLength); + (Protect & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) + { + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + MmReserveSwapPages(nPages); } *UBaseAddress = BaseAddress; @@ -816,17 +844,11 @@ { ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress; - - /* FiN TODO: Optimize loop counter! */ - for (i = 0; i < PAGE_ROUND_UP(MemoryAreaLength) / PAGE_SIZE; i++) + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + + for (i = 0; i < nPages && MemoryArea->PageOpCount != 0; ++i) { PMM_PAGEOP PageOp; - - if (MemoryArea->PageOpCount == 0) - { - break; - } - PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), NULL, 0); @@ -919,9 +941,8 @@ MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea == NULL) { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); + Status = STATUS_UNSUCCESSFUL; + goto unlock_deref_and_return; } switch (FreeType) @@ -931,14 +952,13 @@ if (MemoryArea->StartingAddress != BaseAddress || MemoryArea->Type != MEMORY_AREA_VIRTUAL_MEMORY) { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); + Status = STATUS_UNSUCCESSFUL; + goto unlock_deref_and_return; } + MmFreeVirtualMemory(Process, MemoryArea); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_SUCCESS); + Status = STATUS_SUCCESS; + goto unlock_deref_and_return; case MEM_DECOMMIT: Status = @@ -950,13 +970,17 @@ MEM_RESERVE, PAGE_NOACCESS, MmModifyAttributes); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(Status); - } + goto unlock_deref_and_return; + } + + Status = STATUS_NOT_IMPLEMENTED; + +unlock_deref_and_return: + MmUnlockAddressSpace(AddressSpace); ObDereferenceObject(Process); - return(STATUS_NOT_IMPLEMENTED); + + return(Status); } NTSTATUS Modified: branches/cache_manager_rewrite/mm/cont.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/cont.c… ============================================================================== --- branches/cache_manager_rewrite/mm/cont.c (original) +++ branches/cache_manager_rewrite/mm/cont.c Wed Jan 2 22:12:58 2008 @@ -16,7 +16,7 @@ /* FUNCTIONS *****************************************************************/ -static VOID +static VOID MmFreeContinuousPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) Modified: branches/cache_manager_rewrite/mm/drvlck.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/drvlck… ============================================================================== --- branches/cache_manager_rewrite/mm/drvlck.c (original) +++ branches/cache_manager_rewrite/mm/drvlck.c Wed Jan 2 22:12:58 2008 @@ -14,6 +14,8 @@ #include <internal/debug.h> /* FUNCTIONS *****************************************************************/ + +#undef MmLockPagableDataSection #if 0 VOID Modified: branches/cache_manager_rewrite/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf.in… ============================================================================== --- branches/cache_manager_rewrite/mm/elf.inc.h (original) +++ branches/cache_manager_rewrite/mm/elf.inc.h Wed Jan 2 22:12:58 2008 @@ -1,6 +1,5 @@ /* $Id$ */ -#include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> Modified: branches/cache_manager_rewrite/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf32.… ============================================================================== --- branches/cache_manager_rewrite/mm/elf32.c (original) +++ branches/cache_manager_rewrite/mm/elf32.c Wed Jan 2 22:12:58 2008 @@ -7,7 +7,7 @@ * * PROGRAMMERS: No programmer listed. */ - +#include <ntoskrnl.h> #define __ELF_WORD_SIZE 32 #include "elf.inc.h" Modified: branches/cache_manager_rewrite/mm/elf64.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf64.… ============================================================================== --- branches/cache_manager_rewrite/mm/elf64.c (original) +++ branches/cache_manager_rewrite/mm/elf64.c Wed Jan 2 22:12:58 2008 @@ -7,6 +7,6 @@ * * PROGRAMMERS: No programmer listed. */ - +#include <ntoskrnl.h> #define __ELF_WORD_SIZE 64 #include "elf.inc.h" Modified: branches/cache_manager_rewrite/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/freeli… ============================================================================== --- branches/cache_manager_rewrite/mm/freelist.c (original) +++ branches/cache_manager_rewrite/mm/freelist.c Wed Jan 2 22:12:58 2008 @@ -190,9 +190,9 @@ { start = -1; length = 0; - /* First try to allocate the pages above the 16MB area. This may fail - * because there are not enough continuous pages or we cannot allocate - * pages above the 16MB area because the caller has specify an upper limit. + /* First try to allocate the pages above the 16MB area. This may fail + * because there are not enough continuous pages or we cannot allocate + * pages above the 16MB area because the caller has specify an upper limit. * The second try uses the specified lower limit. */ for (i = j == 0 ? 0x100000 / PAGE_SIZE : LowestAcceptableAddress.QuadPart / PAGE_SIZE; i <= last; ) @@ -428,7 +428,7 @@ if (j == 0) { /* - * Page zero is reserved + * Page zero is reserved for the IVT */ MmPageArray[0].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[0].Flags.Consumer = MC_NPPOOL; @@ -450,6 +450,19 @@ 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 */ Modified: branches/cache_manager_rewrite/mm/iospace.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/iospac… ============================================================================== --- branches/cache_manager_rewrite/mm/iospace.c (original) +++ branches/cache_manager_rewrite/mm/iospace.c Wed Jan 2 22:12:58 2008 @@ -95,7 +95,7 @@ DPRINT("MmMapIoSpace failed (%lx)\n", Status); return (NULL); } - Pfn = PhysicalAddress.QuadPart >> PAGE_SHIFT; + Pfn = PhysicalAddress.LowPart >> PAGE_SHIFT; for (i = 0; i < PAGE_ROUND_UP(NumberOfBytes); i += PAGE_SIZE, Pfn++) { Status = MmCreateVirtualMappingForKernel((char*)Result + i, Modified: branches/cache_manager_rewrite/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/marea.… ============================================================================== --- branches/cache_manager_rewrite/mm/marea.c (original) +++ branches/cache_manager_rewrite/mm/marea.c Wed Jan 2 22:12:58 2008 @@ -29,7 +29,7 @@ * Eric Kohl * Ge van Geldorp * Royce Mitchell III - * Aleksey Bragin + * Aleksey Bragin * Jason Filby * Thomas Weidenmueller * Gunnar Andre' Dalsnes @@ -713,7 +713,7 @@ NTAPI MmInitMemoryAreas(VOID) { - DPRINT("MmInitMemoryAreas()\n",0); + DPRINT("MmInitMemoryAreas()\n"); return(STATUS_SUCCESS); } Modified: branches/cache_manager_rewrite/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mm.c?r… ============================================================================== --- branches/cache_manager_rewrite/mm/mm.c (original) +++ branches/cache_manager_rewrite/mm/mm.c Wed Jan 2 22:12:58 2008 @@ -193,17 +193,6 @@ CPRINT("Page fault at high IRQL was %d, address %x\n", KeGetCurrentIrql(), Address); return(STATUS_UNSUCCESSFUL); } - if (PsGetCurrentProcess() == NULL) - { - /* Allow this! It lets us page alloc much earlier! It won't be needed - * after my init patch anyways - */ - DPRINT("No current process\n"); - if (Address < (ULONG_PTR)MmSystemRangeStart) - { - return(STATUS_ACCESS_VIOLATION); - } - } /* * Find the memory area for the faulting address @@ -274,7 +263,7 @@ break; case MEMORY_AREA_SHARED_DATA: - Pfn = MmSharedDataPagePhysicalAddress.QuadPart >> PAGE_SHIFT; + Pfn = MmSharedDataPagePhysicalAddress.LowPart >> PAGE_SHIFT; Status = MmCreateVirtualMapping(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Address), @@ -310,12 +299,14 @@ /* Cute little hack for ROS */ if ((ULONG_PTR)Address >= (ULONG_PTR)MmSystemRangeStart) { +#ifdef _M_IX86 /* Check for an invalid page directory in kernel mode */ if (Mmi386MakeKernelPageTableGlobal(Address)) { /* All is well with the world */ return STATUS_SUCCESS; } +#endif } /* Keep same old ReactOS Behaviour */ @@ -399,70 +390,6 @@ return (FALSE); } -/* - * @implemented - */ -PVOID -NTAPI -MmGetSystemRoutineAddress(IN PUNICODE_STRING SystemRoutineName) -{ - PVOID ProcAddress; - ANSI_STRING AnsiRoutineName; - NTSTATUS Status; - PLIST_ENTRY NextEntry; - extern LIST_ENTRY ModuleListHead; - PLDR_DATA_TABLE_ENTRY LdrEntry; - BOOLEAN Found = FALSE; - UNICODE_STRING KernelName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); - UNICODE_STRING HalName = RTL_CONSTANT_STRING(L"hal.dll"); - - /* Convert routine to ansi name */ - Status = RtlUnicodeStringToAnsiString(&AnsiRoutineName, - SystemRoutineName, - TRUE); - if (!NT_SUCCESS(Status)) return NULL; - - /* Loop the loaded module list */ - NextEntry = ModuleListHead.Flink; - while (NextEntry != &ModuleListHead) - { - /* Get the entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - /* Check if it's the kernel or HAL */ - if (RtlEqualUnicodeString(&KernelName, &LdrEntry->BaseDllName, TRUE)) - { - /* Found it */ - Found = TRUE; - } - else if (RtlEqualUnicodeString(&HalName, &LdrEntry->BaseDllName, TRUE)) - { - /* Found it */ - Found = TRUE; - } - - /* Check if we found a valid binary */ - if (Found) - { - /* Find the procedure name */ - Status = LdrGetProcedureAddress(LdrEntry->DllBase, - &AnsiRoutineName, - 0, - &ProcAddress); - break; - } - - /* Keep looping */ - NextEntry = NextEntry->Flink; - } - - /* Free the string and return */ - RtlFreeAnsiString(&AnsiRoutineName); - return (NT_SUCCESS(Status) ? ProcAddress : NULL); -} - NTSTATUS NTAPI NtGetWriteWatch(IN HANDLE ProcessHandle, Modified: branches/cache_manager_rewrite/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit… ============================================================================== --- branches/cache_manager_rewrite/mm/mminit.c (original) +++ branches/cache_manager_rewrite/mm/mminit.c Wed Jan 2 22:12:58 2008 @@ -19,6 +19,7 @@ /* * Compiler defined symbols */ +#if 0 extern unsigned int _image_base__; extern unsigned int _text_start__; extern unsigned int _text_end__; @@ -27,7 +28,7 @@ extern unsigned int _init_end__; extern unsigned int _bss_end__; - +#endif static BOOLEAN IsThisAnNtAsSystem = FALSE; MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; @@ -37,14 +38,9 @@ PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; +ULONG MmNumberOfPhysicalPages; + VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength); - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitVirtualMemory) -#pragma alloc_text(INIT, MmInit1) -#pragma alloc_text(INIT, MmInit2) -#pragma alloc_text(INIT, MmInit3) -#endif /* FUNCTIONS ****************************************************************/ @@ -83,10 +79,8 @@ { PVOID BaseAddress; ULONG Length; - ULONG ParamLength = KernelLength; NTSTATUS Status; PHYSICAL_ADDRESS BoundaryAddressMultiple; - PFN_TYPE Pfn; PMEMORY_AREA MArea; DPRINT("MmInitVirtualMemory(%x, %x)\n",LastKernelAddress, KernelLength); @@ -96,14 +90,19 @@ MmInitMemoryAreas(); - /* Start the paged and nonpaged pool at a 4MB boundary. */ - MiNonPagedPoolStart = (PVOID)ROUND_UP((ULONG_PTR)LastKernelAddress + PAGE_SIZE, 0x400000); + /* + * FreeLDR Marks 6MB "in use" at the start of the kernel base, + * so start the non-paged pool at a boundary of 6MB from where + * the last driver was loaded. This should be the end of the + * FreeLDR-marked region. + */ + MiNonPagedPoolStart = (PVOID)ROUND_UP((ULONG_PTR)LastKernelAddress + PAGE_SIZE, 0x600000); MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE; MmPagedPoolBase = (PVOID)ROUND_UP((ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength + PAGE_SIZE, 0x400000); MmPagedPoolSize = MM_PAGED_POOL_SIZE; - DPRINT("NonPagedPool %x - %x, PagedPool %x - %x\n", MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength - 1, + DPRINT("NonPagedPool %x - %x, PagedPool %x - %x\n", MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength - 1, MmPagedPoolBase, (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize - 1); MiInitializeNonPagedPool(); @@ -159,73 +158,6 @@ 0, BoundaryAddressMultiple); - BaseAddress = (PVOID)&_image_base__; - Length = PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)) - (ULONG_PTR)&_image_base__; - ParamLength = ParamLength - Length; - - /* - * No need to lock the address space at this point since no - * other threads are running. - */ - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_EXECUTE_READ, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)); - ASSERT(BaseAddress == (PVOID)&_init_start__); - Length = PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)) - - PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)); - ParamLength = ParamLength - Length; - - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_EXECUTE_READ, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - Length = PAGE_ROUND_UP(((ULONG_PTR)&_bss_end__)) - - PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)); - ParamLength = ParamLength - Length; - DPRINT("Length %x\n",Length); - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)); - DPRINT("BaseAddress %x\n",BaseAddress); - - /* - * No need to lock the address space at this point since we are - * the only thread running. - */ - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_bss_end__)); - Length = LastKernelAddress - (ULONG_PTR)BaseAddress; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - BaseAddress = MiNonPagedPoolStart; MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, @@ -264,18 +196,7 @@ TRUE, 0, BoundaryAddressMultiple); - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Pfn); - MmSharedDataPagePhysicalAddress.QuadPart = Pfn << PAGE_SHIFT; - Status = MmCreateVirtualMapping(NULL, - (PVOID)KI_USER_SHARED_DATA, - PAGE_READWRITE, - &Pfn, - 1); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Unable to create virtual mapping\n"); - KEBUGCHECK(0); - } + MmSharedDataPagePhysicalAddress.QuadPart = 2 << PAGE_SHIFT; RtlZeroMemory(BaseAddress, Length); /* @@ -283,6 +204,35 @@ */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); } + +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 @@ -306,6 +256,25 @@ FirstKrnlPhysAddr, LastKrnlPhysAddr, LastKernelAddress); + + /* 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 */ PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); @@ -350,6 +319,7 @@ } /* Set memory limits */ + MmSystemRangeStart = (PVOID)KSEG0_BASE; MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); @@ -379,6 +349,7 @@ * Free physical memory not used by the kernel */ MmStats.NrTotalPages = MmFreeLdrMemHigher/4; + MmNumberOfPhysicalPages = MmStats.NrTotalPages; if (!MmStats.NrTotalPages) { DbgPrint("Memory not detected, default to 8 MB\n"); @@ -451,47 +422,78 @@ MmInitializeMdlImplementation(); } -VOID +BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; +extern KMUTANT MmSystemLoadLock; + +BOOLEAN NTAPI -INIT_FUNCTION -MmInit2(VOID) -{ - MmInitializeRmapList(); - MmInitializePageOp(); - MmInitSectionImplementation(); - MmInitPagingFile(); -} - -VOID -MmInitSectionImplementation2(VOID); - -VOID -INIT_FUNCTION -NTAPI -MmInit3(VOID) -{ - /* - * Unmap low memory - */ -#ifdef CONFIG_SMP - /* In SMP mode we can unmap the low memory - if all processors are started. */ - MmDeletePageTable(NULL, 0); -#endif - - MmCreatePhysicalMemorySection(); - MiInitBalancerThread(); - - /* - * Initialise the modified page writer. - */ - if (!strstr(KeLoaderBlock->LoadOptions, "MININT")) MmInitMpwThread(); - - /* FIXME: Read parameters from memory */ - MmInitSectionImplementation2(); - - -} +MmInitSystem(IN ULONG Phase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + ULONG Flags = 0; + if (Phase == 0) + { + /* Initialize the Loader Lock */ + KeInitializeMutant(&MmSystemLoadLock, FALSE); + + /* Initialize the address space for the system process */ + MmInitializeProcessAddressSpace(PsGetCurrentProcess(), + NULL, + NULL, + &Flags, + NULL); + + /* Reload boot drivers */ + MiReloadBootLoadedDrivers(LoaderBlock); + + /* Initialize the loaded module list */ + MiInitializeLoadedModuleList(LoaderBlock); + + /* We're done, for now */ + DPRINT("Mm0: COMPLETE\n"); + } + 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 */ + ASSERT(SharedUserData->NumberOfPhysicalPages == 0); + SharedUserData->NumberOfPhysicalPages = MmStats.NrTotalPages; + SharedUserData->LargePageMinimum = 0; + + /* For now, we assume that we're always Workstation */ + SharedUserData->NtProductType = NtProductWinNt; + } + else if (Phase == 2) + { + /* + * Unmap low memory + */ + MiInitBalancerThread(); + + /* + * Initialise the modified page writer. + */ + MmInitMpwThread(); + + /* Initialize the balance set manager */ + MmInitBsmThread(); + + /* FIXME: Read parameters from memory */ + } + + return TRUE; +} + +#if 0 VOID static MiFreeInitMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, @@ -516,3 +518,4 @@ NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } +#endif Modified: branches/cache_manager_rewrite/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mpw.c?… ============================================================================== --- branches/cache_manager_rewrite/mm/mpw.c (original) +++ branches/cache_manager_rewrite/mm/mpw.c Wed Jan 2 22:12:58 2008 @@ -123,3 +123,26 @@ return(STATUS_SUCCESS); } + +NTSTATUS +NTAPI +MmInitBsmThread(VOID) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE ThreadHandle; + + /* Create the thread */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = PsCreateSystemThread(&ThreadHandle, + THREAD_ALL_ACCESS, + &ObjectAttributes, + NULL, + NULL, + KeBalanceSetManager, + NULL); + + /* Close the handle and return status */ + ZwClose(ThreadHandle); + return Status; +} Modified: branches/cache_manager_rewrite/mm/npool.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/npool.… ============================================================================== --- branches/cache_manager_rewrite/mm/npool.c (original) +++ branches/cache_manager_rewrite/mm/npool.c Wed Jan 2 22:12:58 2008 @@ -83,7 +83,7 @@ LIST_ENTRY TagListEntry; #if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) ULONG UserSize; -#endif +#endif BOOLEAN Dumped; } HDR_USED, *PHDR_USED; @@ -911,7 +911,7 @@ } DbgPrint("***************** Dump Complete ***************\n"); KeReleaseSpinLock(&MmNpoolLock, oldIrql); -#endif +#endif } #ifdef ENABLE_VALIDATE_POOL @@ -1327,7 +1327,7 @@ break; } } - + if (best) { if (size < PAGE_SIZE) @@ -1346,7 +1346,7 @@ } } p = avl_get_next(FreeBlockListRoot, p); - } + } /* * We didn't find anything suitable at all. */ @@ -1487,7 +1487,7 @@ HiOK = FALSE; } } - + if (!HiOK || !LoOK) { c[0] = (CHAR)((hdr->Tag >> 24) & 0xFF); @@ -1514,7 +1514,7 @@ KEBUGCHECK(0); } } -#endif +#endif #ifdef NPOOL_REDZONE_CHECK_FULL void check_redzone_list(void) Modified: branches/cache_manager_rewrite/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pagefi… ============================================================================== --- branches/cache_manager_rewrite/mm/pagefile.c (original) +++ branches/cache_manager_rewrite/mm/pagefile.c Wed Jan 2 22:12:58 2008 @@ -323,6 +323,8 @@ return(Status); } +extern BOOLEAN PagingReady; + VOID INIT_FUNCTION NTAPI @@ -366,11 +368,16 @@ 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; MiReservedSwapPages = MiReservedSwapPages + Nr; - if (MM_PAGEFILE_COMMIT_RATIO != 0 && MiAvailSwapPages < MiReservedSwapPages) + if ((MM_PAGEFILE_COMMIT_RATIO != 0) && (MiAvailSwapPages < MiReservedSwapPages)) { KeReleaseSpinLock(&PagingFileListLock, oldIrql); return(FALSE); @@ -385,6 +392,11 @@ { KIRQL oldIrql; + if (!PagingReady) + { + DPRINT1("PAGING USED TOO SOON!!!\n"); + while (TRUE); + } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); MiReservedSwapPages = MiReservedSwapPages - Nr; KeReleaseSpinLock(&PagingFileListLock, oldIrql); @@ -396,6 +408,11 @@ 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++) @@ -425,6 +442,11 @@ ULONG off; KIRQL oldIrql; + if (!PagingReady) + { + DPRINT1("PAGING USED TOO SOON!!!\n"); + while (TRUE); + } i = FILE_FROM_ENTRY(Entry); off = OFFSET_FROM_ENTRY(Entry); @@ -469,6 +491,11 @@ ULONG off; SWAPENTRY entry; + if (!PagingReady) + { + DPRINT1("PAGING USED TOO SOON!!!\n"); + while (TRUE); + } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); if (MiFreeSwapPages == 0) @@ -553,12 +580,14 @@ Headers->Type = MmCoreDumpType; if (TrapFrame != NULL) { +#ifdef _M_IX86 if (!(TrapFrame->EFlags & (1 << 17))) { memcpy(&Headers->TrapFrame, TrapFrame, sizeof(KTRAP_FRAME) - (4 * sizeof(ULONG))); } else +#endif { memcpy(&Headers->TrapFrame, TrapFrame, sizeof(KTRAP_FRAME)); } @@ -672,7 +701,7 @@ UNICODE_STRING DiskDumpName = RTL_CONSTANT_STRING(L"DiskDump"); ANSI_STRING ProcName; PIO_STACK_LOCATION StackPtr; - PLDR_DATA_TABLE_ENTRY ModuleObject; + PLDR_DATA_TABLE_ENTRY ModuleObject = NULL; Status = ZwFsControlFile(PageFileHandle, 0,

16 years, 8 months

[mpiulachs] 31566: Patch by Olaf Siejka <olaf_siejka (at) o2 (dot) pl> - Partial usetup polish translation - Adds missing "Setup" word in ERROR_WRITE_BOOT section by me: - Activate all current (10) usetup translations in txtsetup.sif - Add polish localization in mui.c See issue #2930 for more details.

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Wed Jan 2 21:54:54 2008 New Revision: 31566 URL: http://svn.reactos.org/svn/reactos?rev=31566&view=rev Log: Patch by Olaf Siejka <olaf_siejka (at) o2 (dot) pl> - Partial usetup polish translation - Adds missing "Setup" word in ERROR_WRITE_BOOT section by me: - Activate all current (10) usetup translations in txtsetup.sif - Add polish localization in mui.c See issue #2930 for more details. Added: trunk/reactos/base/setup/usetup/lang/pl-PL.h (with props) Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc Wed Jan 2 21:54:54 2008 @@ -11,7 +11,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CAPTION "Instalator ReactOS" - IDS_TEXT "Nie mo¿esz zainstalowaæ ReactOS bezporednio z tego CD!\n\nProszê zrestartowaæ komputer i uruchomiæ z tego CD, aby zainstalowaæ ReactOS." + IDS_TEXT "Nie mo¿esz zainstalowaæ ReactOS bezporednio!\n\nProszê zrestartowaæ komputer i uruchomiæ z tego CD, aby zainstalowaæ ReactOS." END /* EOF */ Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc Wed Jan 2 21:54:54 2008 @@ -15,8 +15,8 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/lt-LT.rc" +#include "lang/nb-NO.rc" #include "lang/nl-NL.rc" -#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Åðáíåêêßíçóç õðïëïãéóôÞ" }, { Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { @@ -1561,3 +1561,4 @@ + Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Wed Jan 2 21:54:54 2008 @@ -1470,8 +1470,8 @@ itITLanguagePageEntries }, { - START_PAGE, - itITWelcomePageEntries + START_PAGE, + itITWelcomePageEntries }, { INSTALL_INTRO_PAGE, Added: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (added) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Wed Jan 2 21:54:54 2008 @@ -1,0 +1,1569 @@ +/* + * translated by Caemyr (Jan,2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + + +#ifndef LANG_PL_PL_H__ +#define LANG_PL_PL_H__ + +static MUI_ENTRY plPLLanguagePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Wybór jêzyka", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Proszê wybraæ jêzyk dla procesu instalacji systemu", + TEXT_NORMAL + }, + { + 8, + 11, + " i nacisn¹æ ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Wybrany jêzyk bêdzie domylnym dla zainstalowanego systemu.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLWelcomePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Witamy w programie instalacyjnym systemu ReactOS", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "Na tym etapie, instalator skopiuje niezbêdne pliki systemu operacyjnego", + TEXT_NORMAL + }, + { + 6, + 12, + " na twój komputer i przygotuje kolejny etap procesu instalacji.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Nacinij ENTER aby zainstalowaæ system ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Nacinij R aby naprawiæ zainstalowany system ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Nacinij L aby zapoznaæ siê z licencj¹ i warunkami korzystania z ReactOS", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Nacinij F3 aby wyjæ bez instalacji systemu ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "Wiêcej informacji o systemie ReactOS, mo¿na znaleæ na stronie:", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER = Kontynuacja R = Naprawa F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator ReactOS wci¹¿ jest we wczesnej fazie rozwoju. Nadal nie", + TEXT_NORMAL + }, + { + 6, + 9, + "obs³uguje wszystkich funkcji, niezbêdnych dla programu instalacyjnego.", + TEXT_NORMAL + }, + { + 6, + 12, + "Najwa¿niejsze ograniczenia:", + TEXT_NORMAL + }, + { + 8, + 13, + "- Instalator nie obs³uguje wiêcej ni¿ jednej partycji Podstawowej na dysku.", + TEXT_NORMAL + }, + { + 8, + 14, + "- Instalator nie mo¿e skasowaæ partycji podstawowej z dysku", + TEXT_NORMAL + }, + { + 8, + 15, + " o ile nadal znajduje siê na nim tak¿e partycja Rozszerzona.", + TEXT_NORMAL + }, + { + 8, + 16, + "- Instalator nie mo¿e skasowaæ pierwszej partycji Rozszerzonej z dysku", + TEXT_NORMAL + }, + { + 8, + 17, + " o ile nadal znajduj¹ siê na nim kolejne partycje Rozszerzone.", + TEXT_NORMAL + }, + { + 8, + 18, + "- Instalator obs³uguje jedynie system plików FAT.", + TEXT_NORMAL + }, + { + 8, + 19, + "- Brakuje sprawdzenia poprawnoci systemu plików.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Nacinij ENTER aby zainstalowaæ system ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Nacinij F3 aby wyjæ bez instalacji systemu ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLLicensePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 6, + "Licencja:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "System ReactOS jest licencjonowany na warunkach licencji", + TEXT_NORMAL + }, + { + 8, + 9, + "GNU GPL z elementami kodu pochodz¹cego z kompatybilnych", + TEXT_NORMAL + }, + { + 8, + 10, + "licencji, takich jak X11 czy BSD albo GNU LGPL. Ca³e", + TEXT_NORMAL + }, + { + 8, + 11, + "oprogramowanie, bêd¹ce czêsci¹ system ReactOS podlega wiêc", + TEXT_NORMAL + }, + { + 8, + 12, + "licencji GNU GPL jak i odpowiedniej licencji oryginalnej.", + TEXT_NORMAL + }, + { + 8, + 13, + "To oprogramowanie wydawane jest BEZ JAKIEJKOLWIEK gwarancji", + TEXT_NORMAL + }, + { + 8, + 15, + "czy te¿ ograniczeñ w u¿yciu, poza przepisami prawa lokalnego", + TEXT_NORMAL + }, + { + 8, + 16, + "b¹d miêdzynarodowego. Licencja systemu ReactOS", + TEXT_NORMAL + }, + { + 8, + 17, + "reguluje wy³¹cznie zasady dystrybucji dla osób trzecich.", + TEXT_NORMAL + }, + { + 8, + 18, + "Jeli z jakiego powodu nie otrzyma³e kopii licencji", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU GPL wraz z systemem ReactOS, prosimy odwiedziæ stronê:", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Gwarancja:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "Niniejszy program jest wolnym oprogramowaniem; szczegó³y", + TEXT_NORMAL + }, + { + 8, + 25, + "dotycz¹ce kopiowania w ród³ach. Nie ma ¯ADNEJ gwarancji", + TEXT_NORMAL + }, + { + 8, + 26, + "PRZYDATNOCI HANDLOWEJ LUB DO OKRELONYCH ZASTOSOWAÑ", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Powrót", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLDevicePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Poni¿sza lista zawiera obecne ustawienia sprzêtu.", + TEXT_NORMAL + }, + { + 8, + 11, + " Komputer:", + TEXT_NORMAL + }, + { + 8, + 12, + " Ekran:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Klawiatura:", + TEXT_NORMAL + }, + { + 8, + 14, + "Uk³ad klawiatury:", + TEXT_NORMAL + }, + { + 8, + 16, + " Zaakceptuj:", + TEXT_NORMAL + }, + { + 25, + 16, "Zaakceptuj te ustawienia sprzêtu", + TEXT_NORMAL + }, + { + 6, + 19, + "Mo¿esz zmieniæ poszczególne ustawienia za pomoc¹ klawiszy GÓRA i DÓ£", + TEXT_NORMAL + }, + { + 6, + 20, + "aby wybraæ kategoriê. Potem nacinij ENTER by przejæ do menu z ", + TEXT_NORMAL + }, + { + 6, + 21, + "ustawieniami szczegó³owymi do wyboru.", + TEXT_NORMAL + }, + { + 6, + 23, + "Kiedy wszystkie ustawienia s¹ poprawne, wybierz \"Zaakceptuj te ustawienia sprzêtu\"", + TEXT_NORMAL + }, + { + 6, + 24, + "i nacinij ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLRepairPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator ReactOS wci¹¿ jest we wczesnej fazie rozwoju. Nadal nie", + TEXT_NORMAL + }, + { + 6, + 9, + "obs³uguje wszystkich funkcji, niezbêdnych dla programu instalacyjnego.", + TEXT_NORMAL + }, + { + 6, + 12, + "Naprawa istniej¹cej instalacji systemu nie jest jeszcze mo¿liwa.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Nacinij U ¿eby uaktualniæ system.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Nacinij R by uruchomiæ Konsolê Odtwarzania.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Nacinij ESC by powróciæ do g³ównego menu.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Nacinij ENTER by zrestartowaæ komputer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Menu g³ówne ENTER = Restart", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY plPLComputerPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Aby zmieniæ typ komputera, na którym chcesz zainstalowaæ", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 nacinij klawisz GÓRA albo DÓ£ by wybraæ odpowiedni typ komputera.", + TEXT_NORMAL + }, + { + 8, + 11, + " Nastêpnie nacinij ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Nacinij ESC key aby powróciæ do poprzedniej strony bez zmiany", + TEXT_NORMAL + }, + { + 8, + 14, + " typu komputera.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLFlushPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "System obecnie sprawdza czy dane s¹ poprawnie zapisane na dysku", + TEXT_NORMAL + }, + { + 10, + 8, + "To mo¿e zaj¹æ minutê.", + TEXT_NORMAL + }, + { + 10, + 9, + "Po zakoñczeniu, system zrestartuje komputer automatycznie.", + TEXT_NORMAL + }, + { + 0, + 0, + " Czyszczenie pamieci Cache", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLQuitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "ReactOS zosta³ ju¿ poprawnie zainstalowany", + TEXT_NORMAL + }, + { + 10, + 8, + "Upewnij siê ze w Napêdzie A: nie ma dyskietki i", + TEXT_NORMAL + }, + { + 10, + 9, + "w napêdach optycznych - ¿adnych CD-ROMów.", + TEXT_NORMAL + }, + { + 10, + 11, + "Nacinij ENTER by zrestartowaæ komputer.", + TEXT_NORMAL + }, + { + 0, + 0, + " Proszê czekaæ ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLDisplayPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcesz zmieniæ rozdzielczoæ ekranu.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Nacinij klawisz GÓRA albo DÓ£ by wybraæ odpowiedni typ komputera.", + TEXT_NORMAL + }, + { + 8, + 11, + " Nastêpnie nacinij ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Nacinij ESC key aby powróciæ do poprzedniej strony bez zmiany", + TEXT_NORMAL + }, + { + 8, + 14, + " rodzaju ekranu.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLSuccessPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "Podstawowe sk³adniki systemu ReactOS zosta³y zainstalowane.", + TEXT_NORMAL + }, + { + 10, + 8, + "Upewnij siê ze w Napêdzie A: nie ma dyskietki i", + TEXT_NORMAL + }, + { + 10, + 9, + "w napêdach optycznych - ¿adnych CD-ROMów.", + TEXT_NORMAL + }, + { + 10, + 11, + "Nacinij ENTER by zrestartowaæ komputer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Restart komputera", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLBootPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator ReactOS nie mo¿e wgraæ bootloadera na twój", + TEXT_NORMAL + }, + { + 6, + 9, + "dysk twardy", + TEXT_NORMAL + }, + { + 6, + 13, + "Proszê umieciæ sformatowan¹ dyskietkê w napêdzie A:", + TEXT_NORMAL + }, + { + 6, + 14, + "i nacisn¹æ klawisz ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY plPLSelectPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Poni¿sza lista pokazuje istniej¹ce partycje i puste", + TEXT_NORMAL + }, + { + 6, + 9, + "miejsce na nowe partycje.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Nacinij GÓRA lub DÓ£ by wybraæ pozycjê z listy.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Nacinij ENTER by zainstalowaæ ReactOS na wybranej partycji.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Nacinij C by stworzyæ now¹ partycjê.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Nacinij D by skasowaæ istniej¹c¹ partycjê.", + TEXT_NORMAL + }, + { + 0, + 0, + " Proszê czekaæ...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLFormatPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Formatowanie partycji", + TEXT_NORMAL + }, + { + 6, + 10, + "Instalator sformatuje teraz partycjê. Nacinij ENTER aby kontynuowaæ.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY plPLInstallDirectoryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator przegra pliki systemu na wybran¹ partycjê. Wybierz", + TEXT_NORMAL + }, + { + 6, + 9, + "katalog do którego chcesz zainstalowaæ system ReactOS:", + TEXT_NORMAL + }, + { + 6, + 14, + "Aby zmieniæ domylny katalog, u¿yj klawisza BACKSPACE by skasowaæ", + TEXT_NORMAL + }, + { + 6, + 15, + "a nastêpnie wprowad now¹ cie¿kê do katalogu, do którego system", + TEXT_NORMAL + }, + { + 6, + 16, + "ma zostaæ zainstalowany.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLFileCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 11, + 12, + "Proszê czekaæ, Instalator ReactOS kopiuje pliki do wybranego", + TEXT_NORMAL + }, + { + 30, + 13, + "katalogu.", + TEXT_NORMAL + }, + { + 20, + 14, + "To mo¿e zaj¹æ kilka minut.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Proszê czekaæ... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLBootLoaderEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator musi teraz wgraæ bootloader", + TEXT_NORMAL + }, + { + 8, + 12, + "Wgraj bootloader na dysk twardy (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Wgraj bootloader na dyskietkê.", + TEXT_NORMAL + }, + { + 8, + 14, + "Pomiñ wgrywanie bootloadera.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcesz zmieniæ typ klawiatury, jaki ma byæ zainstalowany.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Nacinij klawisz GÓRA albo DÓ£ by wybraæ odpowiedni typ klawiatury.", + TEXT_NORMAL + }, + { + 8, + 11, + " Nastêpnie nacinij ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Nacinij ESC key aby powróciæ do poprzedniej strony bez zmiany", + TEXT_NORMAL + }, + { + 8, + 14, + " typu klawiatury.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLLayoutSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcesz zmieniæ uk³ad klawiatury, jaki ma byæ zainstalowany.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Nacinij klawisz GÓRA albo DÓ£ by wybraæ odpowiedni uk³ad", + TEXT_NORMAL + }, + { + 8, + 11, + " klawiatury. Nastêpnie nacinij ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Nacinij ESC key aby powróciæ do poprzedniej strony bez zmiany", + TEXT_NORMAL + }, + { + 8, + 14, + " uk³adu klawiatury.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY plPLPrepareCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator przygotuje twój komputer do skopiowania plików systemu. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Tworzenie listy plików do skopiowania...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY plPLSelectFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 17, + "Wybierz system plików z listy poni¿ej.", + 0 + }, + { + 8, + 19, + "\x07 Nacinij klawisz GÓRa alub DÓ£ by wybraæ system plików.", + 0 + }, + { + 8, + 21, + "\x07 Nacinij ENTER aby sformatowaæ partycjê.", + 0 + }, + { + 8, + 23, + "\x07 Nacinij ESC aby wybraæ inn¹ partycjê.", + 0 + }, + { + 0, + 0, + " ENTER = Kontynuacja ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcesz skasowaæ wybran¹ partycjê", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Nacinij D by skasowaæ partycjê.", + TEXT_NORMAL + }, + { + 11, + 19, + "UWAGA: Wszystkie dane, zapisane na tej partycji zostan¹ skasowane!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Nacinij ESC aby anulowaæ.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Skasowanie partycji ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator uaktualnia w³anie konfiguracjê systemu. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Tworzenie ga³êzi rejestru...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR plPLErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS nie zosta³ w pe³ni zainstalowany na twoim\n" + "komputerze. Jeli wyjdziesz teraz, trzeba bêdzie\n" + "ponownie uruchomiæ instalator by zainstalowaæ ReactOS.\n" + "\n" + " \x07 Nacinij ENTER aby kontynuowaæ instalacjê.\n" + " \x07 Nacinij F3 aby wyjæ z instalatora.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NO_HDD + "Instalator nie znalaz³ ¿adnego dysku twardego.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Instalator nie znalaz³ napêdu ród³owego.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Instalator nie móg³ za³adowaæ pliku TXTSETUP.SIF.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Instalator znalaz³ uszkodzony plik TXTSETUP.SIF.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Instalator znalaz³ nieprawid³owy wpis w TXTSETUP.SIF.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_DRIVE_INFORMATION + "Instalator nie móg³ odczytaæ informacji o napêdzie.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_WRITE_BOOT, + "Nieudane zapisanie FAT bootcode na partycji systemowej.", + "ENTER = Restart komputera" + }, + { + //ERROR_LOAD_COMPUTER, + "Instalator failed to load the computer type list.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_LOAD_DISPLAY, + "Instalator nie móg³ za³adowaæ listy ustawieñ ekranu.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_LOAD_KEYBOARD, + "Instalator nie móg³ za³adowaæ listy typów klawiatury.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Instalator nie móg³ za³adowaæ listy uk³adów klawiatury.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_WARN_PARTITION, + "Instalator wykry³, ¿e co najmniej jeden dysk twardy zawiera niekompatybiln¹ \n" + "tablicê partycji, która nie bêdzie poprawnie obs³ugiwana!\n" + "\n" + "Tworzenie lub kasowanie partycji mo¿e zniszczyæ ca³¹ tablicê partycji.\n" + "\n" + " \x07 Nacinij F3 aby wyjæ z instalatora." + " \x07 Nacinij ENTER aby kontynuowaæ.", + "F3= Wyjcie ENTER = Kontynuacja" + }, + { + //ERROR_NEW_PARTITION, + "Nie mo¿esz stworzyæ nowej partycji w miejscu ju¿\n" + "istniej¹cej!\n" + "\n" + " * Nacinij dowolny klawisz aby kontynuowaæ.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "Nie mo¿esz skasowaæ pustej przestrzeni, gdzie nie ma ¿adnej partycji!\n" + "\n" + " * Nacinij dowolny klawisz aby kontynuowaæ.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Nieudana instalacja FAT bootcode na partycji systemowej.", + "ENTER = Restart komputera" + }, + { + //ERROR_NO_FLOPPY, + "Brak dyskietki w napêdzie A:.", + "ENTER = Kontynuacja" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Instalator nie móg³ zmieniæ uk³adu klawiatury.", + "ENTER = Restart komputera" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Instalator nie móg³ zmieniæ ustawieñ ekranu w rejestrze.", + "ENTER = Restart komputera" + }, + { + //ERROR_IMPORT_HIVE, + "Instalator nie by³ w stanie zaimportowaæ pliku ga³êzi rejestru.", + "ENTER = Restart komputera" + }, + { + //ERROR_FIND_REGISTRY + "Instalator nie by³ w stanie znaleæ plików z danymi rejestru.", + "ENTER = Restart komputera" + }, + { + //ERROR_CREATE_HIVE, + "Instalator nie móg³ stworzyæ ga³êzi rejestru.", + "ENTER = Restart komputera" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Instalator nie by³ w stanie ustawic inicjalizacji rejestru.", + "ENTER = Restart komputera" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet nie zawiera prawid³owego pliku inf.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet nie zosta³ znaleziony.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet nie zawiera skryptu instalacji.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_COPY_QUEUE, + "Instalator nie by³ w stanie otworzyæ kolejki kopiowania pliku.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CREATE_DIR, + "Instalator nie móg³ stworzyæ katalogów.", + "ENTER = Restart komputera" + }, + { + //ERROR_TXTSETUP_SECTION, + "Instalator nie by³ w stanie znaleæ sekcji 'Directories'\n" + "w pliku TXTSETUP.SIF.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CABINET_SECTION, + "Instalator nie by³ w stanie znaleæ sekcji 'Directories'\n" + "w pliku cabinet.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Instalator nie móg³ stworzyæ katalogu instalacji.", + "ENTER = Restart komputera" + }, + { + //ERROR_FIND_SETUPDATA, + "Instalator nie by³ w stanie znaleæ sekcji 'SetupData'\n" + "w pliku TXTSETUP.SIF.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_WRITE_PTABLE, + "Instalator nie móg³ zapisaæ zmian w tablicy partycji.\n" + "ENTER = Restart komputera" + }, + { + NULL, + NULL + } +}; + + +MUI_PAGE plPLPages[] = +{ + { + LANGUAGE_PAGE, + plPLLanguagePageEntries + }, + { + START_PAGE, + plPLWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + plPLIntroPageEntries + }, + { + LICENSE_PAGE, + plPLLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + plPLDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + plPLRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + plPLComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + plPLDisplayPageEntries + }, + { + FLUSH_PAGE, + plPLFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + plPLSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + plPLSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + plPLFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + plPLDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + plPLInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + plPLPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + plPLFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + plPLKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + plPLBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + plPLLayoutSettingsEntries + }, + { + QUIT_PAGE, + plPLQuitPageEntries + }, + { + SUCCESS_PAGE, + plPLSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + plPLBootPageEntries + }, + { + REGISTRY_PAGE, + plPLRegistryEntries + }, + { + -1, + NULL + } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/pl-PL.h ------------------------------------------------------------------------------ svn:eol-style = native 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 Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Wed Jan 2 21:54:54 2008 @@ -34,6 +34,7 @@ #include "lang/es-ES.h" #include "lang/fr-FR.h" #include "lang/it-IT.h" +#include "lang/pl-PL.h" #include "lang/ru-RU.h" #include "lang/sv-SE.h" #include "lang/uk-UA.h" @@ -88,6 +89,13 @@ L"Spanish", esESPages, esESErrorEntries + }, + { + L"00000415", + L"00000415", + L"Polish", + plPLPages, + plPLErrorEntries }, { L"0000041D", Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Wed Jan 2 21:54:54 2008 @@ -106,17 +106,18 @@ ;0000040B = "Finnish" 0000040C = "French" 00000407 = "German" -;00000408 = "Greek" +00000408 = "Greek" ;0000040D = "Hebrew" ;0000040E = "Hungarian" 00000410 = "Italian" ;00000411 = "Japanese" ;00000414 = "Norwegian" -;00000415 = "Polish" +00000415 = "Polish" ;00000816 = "Portuguese" -;00000419 = "Russian" +00000419 = "Russian" ;0000041B = "Slovak" 0000040A = "Spanish" +0000041D = "Swedish" 00000422 = "Ukrainian"

16 years, 8 months

[fireball] 31565: - Get rid of possible buffer overflows and memory corruptions due to an assumption that UNICODE_STRING's buffers are always NULL-terminated.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jan 2 19:06:03 2008 New Revision: 31565 URL: http://svn.reactos.org/svn/reactos?rev=31565&view=rev Log: - Get rid of possible buffer overflows and memory corruptions due to an assumption that UNICODE_STRING's buffers are always NULL-terminated. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Jan 2 19:06:03 2008 @@ -222,27 +222,31 @@ if (InputImagePath.Length == 0) { - ImagePath->Length = (33 * sizeof(WCHAR)) + ServiceName->Length; - ImagePath->MaximumLength = ImagePath->Length + sizeof(UNICODE_NULL); + ImagePath->Length = 0; + ImagePath->MaximumLength = + (33 * sizeof(WCHAR)) + ServiceName->Length + sizeof(UNICODE_NULL); ImagePath->Buffer = ExAllocatePool(NonPagedPool, ImagePath->MaximumLength); if (ImagePath->Buffer == NULL) return STATUS_NO_MEMORY; - wcscpy(ImagePath->Buffer, L"\\SystemRoot\\system32\\drivers\\"); - wcscat(ImagePath->Buffer, ServiceName->Buffer); - wcscat(ImagePath->Buffer, L".sys"); + RtlAppendUnicodeToString(ImagePath, L"\\SystemRoot\\system32\\drivers\\"); + RtlAppendUnicodeStringToString(ImagePath, ServiceName); + RtlAppendUnicodeToString(ImagePath, L".sys"); } else if (InputImagePath.Buffer[0] != L'\\') { - ImagePath->Length = (12 * sizeof(WCHAR)) + InputImagePath.Length; - ImagePath->MaximumLength = ImagePath->Length + sizeof(UNICODE_NULL); + ImagePath->Length = 0; + ImagePath->MaximumLength = + 12 * sizeof(WCHAR) + InputImagePath.Length + sizeof(UNICODE_NULL); ImagePath->Buffer = ExAllocatePool(NonPagedPool, ImagePath->MaximumLength); if (ImagePath->Buffer == NULL) return STATUS_NO_MEMORY; - wcscpy(ImagePath->Buffer, L"\\SystemRoot\\"); - wcscat(ImagePath->Buffer, InputImagePath.Buffer); - ExFreePool(InputImagePath.Buffer); + RtlAppendUnicodeToString(ImagePath, L"\\SystemRoot\\"); + RtlAppendUnicodeStringToString(ImagePath, &InputImagePath); + + /* Free caller's string */ + RtlFreeUnicodeString(&InputImagePath); } return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Jan 2 19:06:03 2008 @@ -1593,7 +1593,6 @@ PUNICODE_STRING ParentIdPrefix) { ULONG KeyNameBufferLength; - PWSTR KeyNameBuffer = NULL; PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation = NULL; UNICODE_STRING KeyName; UNICODE_STRING KeyValue; @@ -1620,15 +1619,20 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } - KeyNameBuffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); - if (!KeyNameBuffer) + + + KeyName.Buffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); + if (!KeyName.Buffer) { Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } - wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - wcscat(KeyNameBuffer, DeviceNode->Parent->InstancePath.Buffer); - RtlInitUnicodeString(&KeyName, KeyNameBuffer); + KeyName.Length = 0; + KeyName.MaximumLength = (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length; + + RtlAppendUnicodeToString(&KeyName, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + RtlAppendUnicodeStringToString(&KeyName, &DeviceNode->Parent->InstancePath); + Status = IopOpenRegistryKeyEx(&hKey, NULL, &KeyName, KEY_QUERY_VALUE | KEY_SET_VALUE); if (!NT_SUCCESS(Status)) goto cleanup; @@ -1678,7 +1682,7 @@ Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &KeyValue, ParentIdPrefix); } ExFreePool(ParentIdPrefixInformation); - ExFreePool(KeyNameBuffer); + RtlFreeUnicodeString(&KeyName); if (hKey != NULL) ZwClose(hKey); return Status; @@ -1713,7 +1717,6 @@ WCHAR InstancePath[MAX_PATH]; IO_STACK_LOCATION Stack; NTSTATUS Status; - PWSTR KeyBuffer; PWSTR Ptr; USHORT Length; USHORT TotalLength; @@ -1851,18 +1854,11 @@ /* * Create registry key for the instance id, if it doesn't exist yet */ - KeyBuffer = ExAllocatePool( - PagedPool, - (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length); - wcscpy(KeyBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - wcscat(KeyBuffer, DeviceNode->InstancePath.Buffer); - Status = IopCreateDeviceKeyPath(/*KeyBuffer*/&DeviceNode->InstancePath, &InstanceKey); - ExFreePool(KeyBuffer); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceKey); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create the instance key! (Status %lx)\n", Status); } - { /* Set 'Capabilities' value */

16 years, 8 months

[mpiulachs] 31564: - Add missing REGISTRY_PAGE localizations note: "make usetup_clean" may be required

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Wed Jan 2 18:07:27 2008 New Revision: 31564 URL: http://svn.reactos.org/svn/reactos?rev=31564&view=rev Log: - Add missing REGISTRY_PAGE localizations note: "make usetup_clean" may be required Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Wed Jan 2 18:07:27 2008 @@ -2975,9 +2975,7 @@ BOOLEAN Delete; NTSTATUS Status; - CONSOLE_SetTextXY(6, 8, "Setup is updating the system configuration"); - - CONSOLE_SetStatusText(" Creating registry hives..."); + MUIDisplayPage(REGISTRY_PAGE); if (RepairUpdateFlag) { Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Wed Jan 2 18:07:27 2008 @@ -1242,6 +1242,34 @@ } }; +static MUI_ENTRY deDERegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; MUI_ERROR deDEErrorEntries[] = { @@ -1527,6 +1555,10 @@ deDEBootPageEntries }, { + REGISTRY_PAGE, + deDERegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Wed Jan 2 18:07:27 2008 @@ -1236,6 +1236,34 @@ } }; +static MUI_ENTRY elGRRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; MUI_ERROR elGRErrorEntries[] = { @@ -1521,6 +1549,10 @@ elGRBootPageEntries }, { + REGISTRY_PAGE, + elGRRegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Wed Jan 2 18:07:27 2008 @@ -1234,6 +1234,35 @@ NULL, 0 } +}; + +static MUI_ENTRY enUSRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + }; MUI_ERROR enUSErrorEntries[] = @@ -1436,8 +1465,8 @@ enUSLanguagePageEntries }, { - START_PAGE, - enUSWelcomePageEntries + START_PAGE, + enUSWelcomePageEntries }, { INSTALL_INTRO_PAGE, @@ -1520,6 +1549,10 @@ enUSBootPageEntries }, { + REGISTRY_PAGE, + enUSRegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Wed Jan 2 18:07:27 2008 @@ -1234,6 +1234,35 @@ NULL, 0 } +}; + +static MUI_ENTRY esESRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + }; MUI_ERROR esESErrorEntries[] = @@ -1519,6 +1548,10 @@ esESBootPageEntries }, { + REGISTRY_PAGE, + esESRegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Wed Jan 2 18:07:27 2008 @@ -1248,6 +1248,34 @@ } }; +static MUI_ENTRY frFRRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; MUI_ERROR frFRErrorEntries[] = { @@ -1533,6 +1561,10 @@ frFRBootPageEntries }, { + REGISTRY_PAGE, + frFRRegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Wed Jan 2 18:07:27 2008 @@ -1242,6 +1242,34 @@ } }; +static MUI_ENTRY itITRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; MUI_ERROR itITErrorEntries[] = { @@ -1526,6 +1554,10 @@ itITBootPageEntries }, { + REGISTRY_PAGE, + itITRegistryEntries + }, + { -1, NULL } 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 Jan 2 18:07:27 2008 @@ -1234,6 +1234,35 @@ NULL, 0 } +}; + +static MUI_ENTRY ruRURegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + }; MUI_ERROR ruRUErrorEntries[] = @@ -1519,6 +1548,10 @@ ruRUBootPageEntries }, { + REGISTRY_PAGE, + ruRURegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Wed Jan 2 18:07:27 2008 @@ -1234,6 +1234,35 @@ NULL, 0 } +}; + +static MUI_ENTRY svSERegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + }; MUI_ERROR svSEErrorEntries[] = @@ -1519,6 +1548,10 @@ svSEBootPageEntries }, { + REGISTRY_PAGE, + svSERegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Wed Jan 2 18:07:27 2008 @@ -1234,6 +1234,35 @@ NULL, 0 } +}; + +static MUI_ENTRY ukUARegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + }; MUI_ERROR ukUAErrorEntries[] = @@ -1520,6 +1549,10 @@ ukUABootPageEntries }, { + REGISTRY_PAGE, + ukUARegistryEntries + }, + { -1, NULL }

16 years, 8 months

[mpiulachs] 31563: - Show localized error messages

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Wed Jan 2 17:34:51 2008 New Revision: 31563 URL: http://svn.reactos.org/svn/reactos?rev=31563&view=rev Log: - Show localized error messages Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h (original) +++ trunk/reactos/base/setup/usetup/errorcode.h Wed Jan 2 17:34:51 2008 @@ -1,6 +1,31 @@ -#ifndef ERROR_CODE_H__ -#define ERROR_CODE_H__ +/* + * ReactOS kernel + * Copyright (C) 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: registry.h 21704 2006-04-22 13:55:01Z tretiakov $ + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: subsys/system/usetup/errcode.h + * PURPOSE: + * PROGRAMMER: + */ +#ifndef __ERROR_CODE_H__ +#define __ERROR_CODE_H__ typedef enum { @@ -41,16 +66,7 @@ ERROR_LAST_ERROR_CODE }ERROR_NUMBER; -typedef struct -{ - CHAR * ErrorText; - CHAR * ErrorStatus; -}MUI_ERROR; +#endif /* __ERROR_CODE_H__ */ +/* EOF */ -VOID -MUIDisplayError(ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent); - - - -#endif Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Wed Jan 2 17:34:51 2008 @@ -1241,12 +1241,12 @@ { //ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" - "computer. If you quit Setup now, you will need to\n" - "run Setup again to install ReactOS.\n" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Presione ENTER para continuar el Setup.\n" + " \x07 Presione F3 para abandonar el Setup.", + "F3 = Salir ENTER = Continuar" }, { //ERROR_NO_HDD @@ -1305,14 +1305,14 @@ }, { //ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" - "\n" - "Creating or deleting partitions can destroy the partiton table.\n" - "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partiton table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1414,8 +1414,8 @@ { //ERROR_FIND_SETUPDATA, "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" }, { //ERROR_WRITE_PTABLE, @@ -1527,3 +1527,4 @@ #endif + Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Wed Jan 2 17:34:51 2008 @@ -41,58 +41,67 @@ static MUI_LANGUAGE LanguageList[] = { { - L"00000409", /* The Language ID */ - L"00000409", /* Default Keyboard Layout for this language */ - L"English", /* Language Name , not used just to make things easier when updating this file */ - enUSPages /* Translated strings */ + L"00000409", /* The Language ID */ + L"00000409", /* Default Keyboard Layout for this language */ + L"English", /* Language Name , not used just to make things easier when updating this file */ + enUSPages, /* Translated page strings */ + enUSErrorEntries /* Translated error strings */ }, { L"0000040C", L"0000040C", L"French", - frFRPages + frFRPages, + frFRErrorEntries }, { L"00000407", L"00000407", L"German", - deDEPages + deDEPages, + deDEErrorEntries }, { L"00000408", L"00000409", L"Greek", - elGRPages + elGRPages, + elGRErrorEntries }, { L"00000410", L"00000410", L"Italian", - itITPages + itITPages, + itITErrorEntries }, { L"00000419", L"00000419", L"Russian", - ruRUPages + ruRUPages, + ruRUErrorEntries }, { L"0000040A", L"0000040A", L"Spanish", - esESPages + esESPages, + esESErrorEntries }, { L"0000041D", L"0000041D", L"Swedish", - svSEPages + svSEPages, + svSEErrorEntries }, { L"00000422", L"00000422", L"Ukrainian", - ukUAPages + ukUAPages, + ukUAErrorEntries }, { NULL, @@ -142,6 +151,28 @@ return NULL; } +static +MUI_ERROR * +FindMUIErrorEntries () +{ + ULONG lngIndex = 0; + + do + { + /* First we search the language list till we find current selected language messages */ + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + /* Get all available error messages for this language */ + return LanguageList[lngIndex].MuiErrors; + } + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); + + return NULL; +} + VOID MUIDisplayPage(ULONG page) { @@ -188,18 +219,30 @@ VOID MUIDisplayError(ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent) { + MUI_ERROR * entry; + if (ErrorNum >= ERROR_LAST_ERROR_CODE) { - PopupError("invalid error number provided", - "press enter to continue", - Ir, - POPUP_WAIT_ENTER); + PopupError("Pnvalid error number provided", + "Press ENTER to continue", + Ir, + POPUP_WAIT_ENTER); return; } - PopupError(enUSErrorEntries[ErrorNum].ErrorText, - enUSErrorEntries[ErrorNum].ErrorStatus, + entry = FindMUIErrorEntries (); + if (!entry) + { + PopupError("Error: Failed to find translated error message", + NULL, + NULL, + POPUP_WAIT_NONE); + return; + } + + PopupError(entry[ErrorNum].ErrorText, + entry[ErrorNum].ErrorStatus, Ir, WaitEvent); } Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Wed Jan 2 17:34:51 2008 @@ -11,6 +11,12 @@ typedef struct { + CHAR * ErrorText; + CHAR * ErrorStatus; +}MUI_ERROR; + +typedef struct +{ long Number; MUI_ENTRY * MuiEntry; }MUI_PAGE; @@ -21,19 +27,24 @@ PWCHAR LanguageKeyboardLayoutID; PWCHAR LanguageDescriptor; MUI_PAGE * MuiPages; + MUI_ERROR * MuiErrors; }MUI_LANGUAGE; + #define TEXT_NORMAL 0 #define TEXT_HIGHLIGHT 1 #define TEXT_UNDERLINE 2 #define TEXT_STATUS 4 -#define TEXT_ALIGN_DEFAULT 5 -#define TEXT_ALIGN_RIGHT 6 -#define TEXT_ALIGN_LEFT 7 -#define TEXT_ALIGN_CENTER 8 +#define TEXT_ALIGN_DEFAULT 8 +#define TEXT_ALIGN_RIGHT 16 +#define TEXT_ALIGN_LEFT 32 +#define TEXT_ALIGN_CENTER 64 VOID MUIDisplayPage (ULONG PageNumber); +VOID +MUIDisplayError (ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent); + #endif

16 years, 8 months

[hpoussin] 31562: Release memory when not needed anymore Do not display errors when checking for binutils Cleanup PCH handling

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Jan 2 17:04:35 2008 New Revision: 31562 URL: http://svn.reactos.org/svn/reactos?rev=31562&view=rev Log: Release memory when not needed anymore Do not display errors when checking for binutils Cleanup PCH handling Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Wed Jan 2 17:04:35 2008 @@ -929,7 +929,7 @@ MingwBackend::TryToDetectThisBinutils ( const string& binutils ) { string command = ssprintf ( - "%s -v 1>%s", + "%s -v 1>%s 2>%s", FixSeparatorForSystemCommand(binutils).c_str (), NUL, NUL ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Jan 2 17:04:35 2008 @@ -122,7 +122,8 @@ return file; } -/*static*/ const FileLocation* +/* caller needs to delete the returned object */ +const FileLocation* MingwModuleHandler::GetTargetFilename ( const Module& module, string_list* pclean_files ) @@ -136,7 +137,8 @@ return target; } -/*static*/ const FileLocation* +/* caller needs to delete the returned object */ +const FileLocation* MingwModuleHandler::GetImportLibraryFilename ( const Module& module, string_list* pclean_files ) @@ -150,7 +152,8 @@ return target; } -/*static*/ MingwModuleHandler* +/* caller needs to delete the returned object */ +MingwModuleHandler* MingwModuleHandler::InstanciateHandler ( const Module& module, MingwBackend* backend ) @@ -261,6 +264,7 @@ return ""; } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetActualSourceFilename ( const FileLocation* file ) const @@ -311,11 +315,22 @@ if ( extension == ".idl" || extension == ".IDL" ) { if ( (module.type == RpcServer) || (module.type == RpcClient) ) - return backend->GetFullName ( *GetRpcServerHeaderFilename ( file ) ) - + " " - + backend->GetFullName ( *GetRpcClientHeaderFilename ( file ) ); + { + const FileLocation *server_header = GetRpcServerHeaderFilename ( file ); + const FileLocation *client_header = GetRpcClientHeaderFilename ( file ); + string dependencies = backend->GetFullName ( *server_header ) + " " + + backend->GetFullName ( *client_header ); + delete server_header; + delete client_header; + return dependencies; + } else if ( module.type == IdlHeader ) - return backend->GetFullName ( *GetIdlHeaderFilename ( file ) ); + { + const FileLocation *idl_header = GetIdlHeaderFilename ( file ); + string dependencies = backend->GetFullName ( *idl_header ); + delete idl_header; + return dependencies; + } else return ""; } @@ -338,11 +353,12 @@ return v2s ( sourceFiles, 10 ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetModuleArchiveFilename () const { if ( module.type == StaticLibrary ) - return new FileLocation ( *GetTargetFilename ( module, NULL ) ); + return GetTargetFilename ( module, NULL ); return new FileLocation ( IntermediateDirectory, module.output->relative_path, ReplaceExtension ( module.name, ".temp.a" ) ); @@ -410,7 +426,11 @@ } } else - dep = backend->GetFullName ( *GetImportLibraryFilename ( importedModule, NULL ) ); + { + const FileLocation *library_target = GetImportLibraryFilename ( importedModule, NULL ); + dep = backend->GetFullName ( *library_target ); + delete library_target; + } return dep; } @@ -470,6 +490,7 @@ const FileLocation* sourceFileLocation = GetActualSourceFilename ( compilationUnits[i]->GetFilename () ); list.push_back ( *sourceFileLocation ); + delete sourceFileLocation; } } // intentionally make a copy so that we can append more work in @@ -492,6 +513,7 @@ const FileLocation* sourceFileLocation = GetActualSourceFilename ( compilationUnit.GetFilename () ); list.push_back ( *sourceFileLocation ); + delete sourceFileLocation; } } } @@ -504,6 +526,7 @@ GetSourceFilenames ( list, false ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetObjectFilename ( const FileLocation* sourceFile, @@ -649,7 +672,9 @@ { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += backend->GetFullName ( *GetObjectFilename ( compilationUnits[i]->GetFilename (), module, NULL ) ); + const FileLocation *object_file = GetObjectFilename ( compilationUnits[i]->GetFilename (), module, NULL ); + objectFilenames += backend->GetFullName ( *object_file ); + delete object_file; } return objectFilenames; } @@ -812,11 +837,13 @@ assignmentOperation ); } - if ( use_pch && module.pch != NULL ) + const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); + if ( pchFilename ) { fprintf ( fMakefile, " -I%s", - backend->GetFullPath ( *GetPrecompiledHeaderFilename () ).c_str () ); + backend->GetFullPath ( *pchFilename ).c_str () ); + delete pchFilename; } if ( generatingCompilerMacro ) @@ -966,7 +993,7 @@ void MingwModuleHandler::CleanupCompilationUnitVector ( vector<CompilationUnit*>& compilationUnits ) { - for (size_t i = 0; i < compilationUnits.size (); i++) + for ( size_t i = 0; i < compilationUnits.size (); i++ ) delete compilationUnits[i]; } @@ -1051,7 +1078,7 @@ const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; vector<const FileLocation *> headers; - vector<const FileLocation *> mcheaders; + vector<const FileLocation *> mcheaders; vector<const FileLocation *> mcresources; if ( compilationUnits.size () > 0 ) { @@ -1060,11 +1087,13 @@ CompilationUnit& compilationUnit = *compilationUnits[i]; if ( compilationUnit.IsFirstFile () ) { + const FileLocation *object_file = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), - backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ) ).c_str (), + backend->GetFullName ( *object_file ).c_str (), objectsMacro.c_str() ); + delete object_file; } } fprintf ( @@ -1080,18 +1109,21 @@ const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) headers.push_back ( objectFilename ); - else if ( GetExtension ( *objectFilename ) == ".rc" ) - { - const FileLocation *headerFilename = GetMcHeaderFilename ( compilationUnit.GetFilename () ); - mcheaders.push_back ( headerFilename ); + else if ( GetExtension ( *objectFilename ) == ".rc" ) + { + const FileLocation *headerFilename = GetMcHeaderFilename ( compilationUnit.GetFilename () ); + mcheaders.push_back ( headerFilename ); mcresources.push_back ( objectFilename ); - } + } else + { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), backend->GetFullName ( *objectFilename ).c_str () ); + delete objectFilename; + } } } fprintf ( fMakefile, "\n" ); @@ -1104,15 +1136,18 @@ module.name.c_str (), assignmentOperation ); for ( i = 0; i < headers.size (); i++ ) + { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), backend->GetFullName ( *headers[i] ).c_str () ); + delete headers[i]; + } fprintf ( fMakefile, "\n" ); } - if ( mcheaders.size () > 0 ) + if ( mcheaders.size () > 0 ) { fprintf ( fMakefile, @@ -1120,15 +1155,18 @@ module.name.c_str (), assignmentOperation ); for ( i = 0; i < mcheaders.size (); i++ ) + { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), backend->GetFullName ( *mcheaders[i] ).c_str () ); + delete mcheaders[i]; + } fprintf ( fMakefile, "\n" ); } - if ( mcresources.size () > 0 ) + if ( mcresources.size () > 0 ) { fprintf ( fMakefile, @@ -1136,11 +1174,14 @@ module.name.c_str (), assignmentOperation ); for ( i = 0; i < mcresources.size (); i++ ) + { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), backend->GetFullName ( *mcresources[i] ).c_str () ); + delete mcresources[i]; + } fprintf ( fMakefile, "\n" ); } @@ -1174,18 +1215,23 @@ GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { + const FileLocation *object_file = GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), module, NULL ); fprintf ( fMakefile, "%s += %s\n", objectsMacro.c_str(), - backend->GetFullName ( *GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), module, NULL ) ).c_str () ); + backend->GetFullName ( *object_file ).c_str () ); + delete object_file; } CleanupCompilationUnitVector ( sourceCompilationUnits ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetPrecompiledHeaderFilename () const { + if ( !module.pch || !use_pch ) + return NULL; return new FileLocation ( IntermediateDirectory, module.pch->file.relative_path, ReplaceExtension ( module.pch->file.name, "_" + module.name + ".gch" ) ); @@ -1199,11 +1245,13 @@ const string& cflagsMacro ) { const FileLocation *generatedSourceFileName = GetActualSourceFilename ( sourceFile ); + const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); string dependencies = backend->GetFullName ( *generatedSourceFileName ); + if ( extraDependencies != "" ) dependencies += " " + extraDependencies; - if ( module.pch && use_pch ) - dependencies += " " + backend->GetFullName ( *GetPrecompiledHeaderFilename () ); + if ( pchFilename ) + dependencies += " " + backend->GetFullName ( *pchFilename ); /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; @@ -1223,6 +1271,11 @@ "\t%s -c $< -o $@ %s\n", cc.c_str (), cflagsMacro.c_str () ); + + delete objectFilename; + delete generatedSourceFileName; + if ( pchFilename ) + delete pchFilename; } void @@ -1246,6 +1299,8 @@ "\t%s -x assembler-with-cpp -c $< -o $@ -D__ASM__ %s\n", cc.c_str (), cflagsMacro.c_str () ); + + delete objectFilename; } void @@ -1268,6 +1323,8 @@ "\t%s -f win32 $< -o $@ %s\n", "$(Q)${nasm}", nasmflagsMacro.c_str () ); + + delete objectFilename; } void @@ -1313,6 +1370,8 @@ fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", backend->GetFullName ( resFilename ).c_str () ); + + delete objectFilename; } void @@ -1328,8 +1387,8 @@ basename + ".spec.def" ); CLEAN_FILE ( def_file ); - FileLocation stub_file ( *GetActualSourceFilename ( sourceFile ) ); - CLEAN_FILE ( stub_file ); + const FileLocation *stub_file = GetActualSourceFilename ( sourceFile ); + CLEAN_FILE ( *stub_file ); fprintf ( fMakefile, "%s: %s $(WINEBUILD_TARGET) | %s\n", @@ -1344,14 +1403,16 @@ backend->GetFullName ( *sourceFile ).c_str () ); fprintf ( fMakefile, "%s: %s $(WINEBUILD_TARGET)\n", - backend->GetFullName ( stub_file ).c_str (), + backend->GetFullName ( *stub_file ).c_str (), backend->GetFullName ( *sourceFile ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); fprintf ( fMakefile, "\t%s -o %s --pedll %s\n", "$(Q)$(WINEBUILD_TARGET)", - backend->GetFullName ( stub_file ).c_str (), + backend->GetFullName ( *stub_file ).c_str (), backend->GetFullName ( *sourceFile ).c_str () ); + + delete stub_file; } void @@ -1403,6 +1464,7 @@ return string ( "" ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetRpcServerHeaderFilename ( const FileLocation *base ) const { @@ -1444,8 +1506,11 @@ backend->GetFullName ( *generatedHeaderFilename ).c_str (), backend->GetFullName ( generatedServerFilename ).c_str (), backend->GetFullName ( *sourceFile ).c_str () ); -} - + + delete generatedHeaderFilename; +} + +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetRpcClientHeaderFilename ( const FileLocation *base ) const { @@ -1453,6 +1518,7 @@ return new FileLocation ( IntermediateDirectory, base->relative_path, newname ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetIdlHeaderFilename ( const FileLocation *base ) const { @@ -1460,6 +1526,7 @@ return new FileLocation ( IntermediateDirectory, base->relative_path, newname ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetMcHeaderFilename ( const FileLocation *base ) const { @@ -1531,6 +1598,8 @@ backend->GetFullName ( *generatedHeaderFilename ).c_str (), backend->GetFullName ( generatedClientFilename ).c_str (), backend->GetFullName ( *sourceFile ).c_str () ); + + delete generatedHeaderFilename; } void @@ -1560,6 +1629,8 @@ widlflagsMacro.c_str (), backend->GetFullName ( *generatedHeader ).c_str (), backend->GetFullName ( *sourceFile ).c_str () ); + + delete generatedHeader; } void @@ -1751,7 +1822,9 @@ for ( size_t i = 0; i < data.compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *data.compilationUnits[i]; - objectFiles.push_back ( *GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ) ); + const FileLocation *object_file = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); + objectFiles.push_back ( *object_file ); + delete object_file; } } @@ -1807,9 +1880,11 @@ const string& libsMacro, const string& pefixupParameters ) { - string target ( GetTargetMacro ( module ) ); - string target_folder ( backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ) ); + const FileLocation *target_file = GetTargetFilename ( module, NULL ); const FileLocation *definitionFilename = GetDefinitionFilename (); + + string target_macro ( GetTargetMacro ( module ) ); + string target_folder ( backend->GetFullPath ( *target_file ) ); string linkerScriptArgument; if ( module.linkerScript != NULL ) @@ -1819,7 +1894,7 @@ fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET) $(PEFIXUP_TARGET) | %s\n", - target.c_str (), + target_macro.c_str (), backend->GetFullName ( *definitionFilename ).c_str (), dependencies.c_str (), target_folder.c_str () ); @@ -1833,7 +1908,7 @@ linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), - target.c_str (), + target_macro.c_str (), objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); @@ -1859,14 +1934,14 @@ linkerParameters.c_str (), linkerScriptArgument.c_str (), backend->GetFullName ( temp_exp ).c_str (), - target.c_str (), + target_macro.c_str (), objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); fprintf ( fMakefile, "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", - target.c_str (), + target_macro.c_str (), pefixupParameters.c_str() ); fprintf ( fMakefile, @@ -1886,7 +1961,7 @@ linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), - target.c_str (), + target_macro.c_str (), objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); @@ -1897,18 +1972,25 @@ GenerateRunRsymCode (); GenerateRunStripCode (); GenerateCleanObjectsAsYouGoCode (); + + delete definitionFilename; + delete target_file; } void MingwModuleHandler::GeneratePhonyTarget() const { string targetMacro ( GetTargetMacro ( module ) ); + const FileLocation *target_file = GetTargetFilename ( module, NULL ); + fprintf ( fMakefile, ".PHONY: %s\n\n", targetMacro.c_str ()); fprintf ( fMakefile, "%s: | %s\n", targetMacro.c_str (), - backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *target_file ).c_str () ); + + delete target_file; } void @@ -1939,6 +2021,7 @@ moduleDependencies += ssprintf ( " $(%s_RESOURCES)", module.name.c_str () ); break; } + delete objectFilename; } for ( i = 0; i < compilationUnits.size (); i++ ) @@ -1992,10 +2075,11 @@ const string& windresflagsMacro, const string& widlflagsMacro ) { - if ( module.pch && use_pch ) + const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); + + if ( pchFilename ) { const FileLocation& baseHeaderFile = module.pch->file; - const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); CLEAN_FILE ( *pchFilename ); string dependencies = backend->GetFullName ( baseHeaderFile ); /* WIDL generated headers may be used */ @@ -2014,6 +2098,7 @@ backend->GetFullName ( *pchFilename ).c_str(), cflagsMacro.c_str(), backend->GetFullName ( baseHeaderFile ).c_str() ); + delete pchFilename; } GenerateObjectFileTargets ( module.non_if_data, @@ -2026,6 +2111,7 @@ fprintf ( fMakefile, "\n" ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GenerateArchiveTarget ( const string& ar, const string& objs_macro ) const @@ -2040,7 +2126,7 @@ if ( module.type == StaticLibrary && module.importLibrary ) { - const FileLocation *definitionFilename ( GetDefinitionFilename () ); + const FileLocation *definitionFilename = GetDefinitionFilename (); fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib $@ %s %s\n", @@ -2048,6 +2134,8 @@ backend->GetFullName ( *definitionFilename ).c_str (), module.mangledSymbols ? "" : "--kill-at", module.underscoreSymbols ? "--add-underscore" : "" ); + + delete definitionFilename; } fprintf ( fMakefile, "\t$(ECHO_AR)\n" ); @@ -2103,7 +2191,12 @@ if ( ReferenceObjects ( module ) ) return GetObjectsMacro ( module ); else - return backend->GetFullName ( *GetTargetFilename ( module, NULL ) ).c_str (); + { + const FileLocation *target_file = GetTargetFilename ( module, NULL ); + string target = backend->GetFullName ( *target_file ).c_str (); + delete target_file; + return target; + } } void @@ -2161,11 +2254,23 @@ { string basename = GetBasename ( sourceFile->name ); if ( library.importedModule->type == RpcServer ) - dependencies.push_back ( *GetRpcServerHeaderFilename ( sourceFile ) ); + { + const FileLocation *header = GetRpcServerHeaderFilename ( sourceFile ); + dependencies.push_back ( *header ); + delete header; + } if ( library.importedModule->type == RpcClient ) - dependencies.push_back ( *GetRpcClientHeaderFilename ( sourceFile ) ); + { + const FileLocation *header = GetRpcClientHeaderFilename ( sourceFile ); + dependencies.push_back ( *header ); + delete header; + } if ( library.importedModule->type == IdlHeader ) - dependencies.push_back ( *GetIdlHeaderFilename ( sourceFile ) ); + { + const FileLocation *header = GetIdlHeaderFilename ( sourceFile ); + dependencies.push_back ( *header ); + delete header; + } } } } @@ -2351,6 +2456,7 @@ { const FileLocation* ar_target = GenerateArchiveTarget ( ar, objectsMacro ); CLEAN_FILE ( *ar_target ); + delete ar_target; } GenerateObjectFileTargets ( cc, @@ -2511,6 +2617,7 @@ return ( index != string::npos ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetDefinitionFilename () const { @@ -2540,7 +2647,7 @@ vector<FileLocation> deps; GetDefinitionDependencies ( deps ); - + fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" ); fprintf ( fMakefile, "%s: %s", @@ -2553,7 +2660,7 @@ backend->GetFullName ( deps[i] ).c_str () ); fprintf ( fMakefile, " | %s\n", - backend->GetFullPath ( *GetImportLibraryFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *library_target ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); @@ -2564,6 +2671,9 @@ backend->GetFullName ( *library_target ).c_str (), module.mangledSymbols ? "" : "--kill-at", module.underscoreSymbols ? "--add-underscore" : "" ); + + delete defFilename; + delete library_target; } } @@ -2609,12 +2719,15 @@ const FileLocation *file ) const { string basename = GetBasename ( file->name ); + const FileLocation *generatedHeaderFilename = GetRpcServerHeaderFilename ( file ); FileLocation serverSourceDependency ( IntermediateDirectory, file->relative_path, basename + "_s.c" ); dependencies.push_back ( serverSourceDependency ); - dependencies.push_back ( *GetRpcServerHeaderFilename ( file ) ); + dependencies.push_back ( *generatedHeaderFilename ); + + delete generatedHeaderFilename; } void @@ -2692,11 +2805,12 @@ else linker = "${host_gcc}"; + const FileLocation *target_file = GetTargetFilename ( module, NULL ); fprintf ( fMakefile, "%s: %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *target_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, "\t%s %s -o $@ %s %s\n\n", @@ -2704,6 +2818,8 @@ GetLinkerMacro ().c_str (), objectsMacro.c_str (), libsMacro.c_str () ); + + delete target_file; } @@ -3359,11 +3475,12 @@ GenerateRules (); + const FileLocation *target_file = GetTargetFilename ( module, NULL ); fprintf ( fMakefile, "%s: %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *target_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); @@ -3380,6 +3497,8 @@ fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", backend->GetFullName ( junk_tmp ).c_str () ); + + delete target_file; } @@ -3449,12 +3568,13 @@ GenerateRules (); + const FileLocation *target_file = GetTargetFilename ( module, NULL ); fprintf ( fMakefile, "%s: %s %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), payload->name.c_str (), - backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *target_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); @@ -3484,6 +3604,8 @@ backend->GetFullName ( junk_tmp ).c_str (), backend->GetFullName ( junk_elf ).c_str (), backend->GetFullName ( junk_cpy ).c_str () ); + + delete target_file; } @@ -3883,6 +4005,7 @@ GenerateTestModuleTarget (); } +/* caller needs to delete the returned object */ void MingwTestModuleHandler::GetModuleSpecificCompilationUnits ( vector<CompilationUnit*>& compilationUnits ) { @@ -4003,11 +4126,12 @@ GenerateRules (); + const FileLocation *target_file = GetTargetFilename ( module, NULL ); fprintf ( fMakefile, "%s: %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *target_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); @@ -4016,4 +4140,6 @@ objectsMacro.c_str(), libsMacro.c_str(), targetMacro.c_str () ); -} + + delete target_file; +}

16 years, 8 months

[mpiulachs] 31561: - Fix typo

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Wed Jan 2 16:50:37 2008 New Revision: 31561 URL: http://svn.reactos.org/svn/reactos?rev=31561&view=rev Log: - Fix typo Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Wed Jan 2 16:50:37 2008 @@ -6,7 +6,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -52,7 +52,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -128,7 +128,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -228,7 +228,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -352,7 +352,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -445,7 +445,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -514,7 +514,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -566,7 +566,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -606,7 +606,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -652,7 +652,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -703,7 +703,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -749,7 +749,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -796,7 +796,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -854,7 +854,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -888,7 +888,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -940,7 +940,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -980,7 +980,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1026,7 +1026,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1078,7 +1078,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1131,7 +1131,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1160,7 +1160,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1207,7 +1207,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1449,8 +1449,8 @@ frFRLanguagePageEntries }, { - START_PAGE, - frFRWelcomePageEntries + START_PAGE, + frFRWelcomePageEntries }, { INSTALL_INTRO_PAGE,

16 years, 8 months

[fireball] 31560: - Use IopOpenRegistryKeyEx() to reduce code size and improve readability.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jan 2 16:33:40 2008 New Revision: 31560 URL: http://svn.reactos.org/svn/reactos?rev=31560&view=rev Log: - Use IopOpenRegistryKeyEx() to reduce code size and improve readability. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Jan 2 16:33:40 2008 @@ -270,7 +270,6 @@ ULONG ServiceStart; UNICODE_STRING ServiceImagePath, CCSName; NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; HANDLE CCSKey, ServiceKey; DPRINT("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject); @@ -282,13 +281,7 @@ /* Open CurrentControlSet */ RtlInitUnicodeString(&CCSName, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); - InitializeObjectAttributes(&ObjectAttributes, - &CCSName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&CCSKey, KEY_READ, &ObjectAttributes); - + Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); @@ -296,12 +289,7 @@ } /* Open service key */ - InitializeObjectAttributes(&ObjectAttributes, - ServiceName, - OBJ_CASE_INSENSITIVE, - CCSKey, - NULL); - Status = ZwOpenKey(&ServiceKey, KEY_READ, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); @@ -572,7 +560,6 @@ BOOLEAN Lower) { RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; - OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Class; WCHAR ClassBuffer[40]; UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT); @@ -580,13 +567,8 @@ NTSTATUS Status; /* Open enumeration root key */ - InitializeObjectAttributes(&ObjectAttributes, - &EnumRoot, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&EnumRootKey, KEY_READ, &ObjectAttributes); - + Status = IopOpenRegistryKeyEx(&EnumRootKey, NULL, + &EnumRoot, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); @@ -594,12 +576,8 @@ } /* Open subkey */ - InitializeObjectAttributes(&ObjectAttributes, - &DeviceNode->InstancePath, - OBJ_CASE_INSENSITIVE, - EnumRootKey, - NULL); - Status = ZwOpenKey(&SubKey, KEY_READ, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&SubKey, EnumRootKey, + &DeviceNode->InstancePath, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); @@ -649,17 +627,12 @@ /* * Load the class filter driver */ - if (NT_SUCCESS(Status)) { UNICODE_STRING ControlClass = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class"); - InitializeObjectAttributes(&ObjectAttributes, - &ControlClass, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&EnumRootKey, KEY_READ, &ObjectAttributes); - + + Status = IopOpenRegistryKeyEx(&EnumRootKey, NULL, + &ControlClass, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); @@ -667,12 +640,8 @@ } /* Open subkey */ - InitializeObjectAttributes(&ObjectAttributes, - &Class, - OBJ_CASE_INSENSITIVE, - EnumRootKey, - NULL); - Status = ZwOpenKey(&SubKey, KEY_READ, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&SubKey, EnumRootKey, + &Class, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Jan 2 16:33:40 2008 @@ -408,7 +408,6 @@ LPCWSTR RegistryPropertyName; UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT); UNICODE_STRING ValueName; - OBJECT_ATTRIBUTES ObjectAttributes; KEY_VALUE_PARTIAL_INFORMATION *ValueInformation; ULONG ValueInformationLength; HANDLE KeyHandle, EnumRootHandle; @@ -445,9 +444,8 @@ DPRINT("Registry property %S\n", RegistryPropertyName); /* Open Enum key */ - InitializeObjectAttributes(&ObjectAttributes, &EnumRoot, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&EnumRootHandle, 0, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&EnumRootHandle, NULL, + &EnumRoot, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("Error opening ENUM_ROOT, Status=0x%08x\n", Status); @@ -455,13 +453,12 @@ } /* Open instance key */ - InitializeObjectAttributes(&ObjectAttributes, &DeviceNode->InstancePath, - OBJ_CASE_INSENSITIVE, EnumRootHandle, NULL); - - Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&KeyHandle, EnumRootHandle, + &DeviceNode->InstancePath, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("Error opening InstancePath, Status=0x%08x\n", Status); + ZwClose(EnumRootHandle); return Status; } @@ -686,10 +683,7 @@ /* * Open the base key. */ - - InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(DevInstRegKey, DesiredAccess, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(DevInstRegKey, NULL, &KeyName, DesiredAccess); if (!NT_SUCCESS(Status)) { DPRINT1("IoOpenDeviceRegistryKey(%wZ): Base key doesn't exist, exiting... (Status 0x%08lx)\n", &KeyName, Status); @@ -1100,14 +1094,7 @@ *Handle = NULL; /* Open root key for device instances */ - InitializeObjectAttributes(&ObjectAttributes, - &EnumU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&hParent, - KEY_CREATE_SUB_KEY, - &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&hParent, NULL, &EnumU, KEY_CREATE_SUB_KEY); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey('%wZ') failed with status 0x%08lx\n", &EnumU, Status); @@ -1611,7 +1598,6 @@ UNICODE_STRING KeyName; UNICODE_STRING KeyValue; UNICODE_STRING ValueName; - OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hKey = NULL; ULONG crc32; NTSTATUS Status; @@ -1643,8 +1629,7 @@ wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); wcscat(KeyNameBuffer, DeviceNode->Parent->InstancePath.Buffer); RtlInitUnicodeString(&KeyName, KeyNameBuffer); - InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&hKey, KEY_QUERY_VALUE | KEY_SET_VALUE, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&hKey, NULL, &KeyName, KEY_QUERY_VALUE | KEY_SET_VALUE); if (!NT_SUCCESS(Status)) goto cleanup; RtlInitUnicodeString(&ValueName, L"ParentIdPrefix"); @@ -2704,8 +2689,7 @@ if (RelativePath) { - InitializeObjectAttributes(&ObjectAttributes, RelativePath, OBJ_KERNEL_HANDLE, hBaseKey, NULL); - Status = ZwOpenKey(&hDevicesKey, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&hDevicesKey, hBaseKey, RelativePath, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) { DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); @@ -2759,11 +2743,9 @@ /* Open device key */ DeviceName.Length = DeviceName.MaximumLength = (USHORT)pDeviceInformation->NameLength; DeviceName.Buffer = pDeviceInformation->Name; - InitializeObjectAttributes(&ObjectAttributes, &DeviceName, OBJ_KERNEL_HANDLE, hDevicesKey, NULL); - Status = ZwOpenKey( - &hDeviceKey, - KEY_QUERY_VALUE + (EnumerateSubKeys ? KEY_ENUMERATE_SUB_KEYS : 0), - &ObjectAttributes); + + Status = IopOpenRegistryKeyEx(&hDeviceKey, hDevicesKey, &DeviceName, + KEY_QUERY_VALUE + (EnumerateSubKeys ? KEY_ENUMERATE_SUB_KEYS : 0)); if (!NT_SUCCESS(Status)) { DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); @@ -3281,8 +3263,7 @@ } else { - InitializeObjectAttributes(&ObjectAttributes, &MultiKeyPathU, OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&hEnum, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&hEnum, NULL, &MultiKeyPathU, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) { /* Nothing to do, don't return with an error status */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Wed Jan 2 16:33:40 2008 @@ -280,7 +280,6 @@ IN PDEVICE_OBJECT DeviceObject) { PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - OBJECT_ATTRIBUTES ObjectAttributes; PKEY_BASIC_INFORMATION KeyInfo = NULL, SubKeyInfo = NULL; UNICODE_STRING LegacyU = RTL_CONSTANT_STRING(L"LEGACY_"); UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM L"\\" REGSTR_KEY_ROOTENUM); @@ -318,17 +317,10 @@ goto cleanup; } - InitializeObjectAttributes( - &ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwOpenKey(&KeyHandle, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&KeyHandle, NULL, &KeyName, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey(%wZ) failed with status 0x%08lx\n", &KeyName, Status); + DPRINT("IopOpenRegistryKeyEx(%wZ) failed with status 0x%08lx\n", &KeyName, Status); goto cleanup; } @@ -370,16 +362,10 @@ } /* Open the key */ - InitializeObjectAttributes( - &ObjectAttributes, - &SubKeyName, - 0, /* Attributes */ - KeyHandle, - NULL); /* Security descriptor */ - Status = ZwOpenKey(&SubKeyHandle, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&SubKeyHandle, KeyHandle, &SubKeyName, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + DPRINT("IopOpenRegistryKeyEx() failed with status 0x%08lx\n", Status); break; } @@ -438,16 +424,10 @@ } /* Open registry key to fill other informations */ - InitializeObjectAttributes( - &ObjectAttributes, - &Device->InstanceID, - 0, /* Attributes */ - SubKeyHandle, - NULL); /* Security descriptor */ - Status = ZwOpenKey(&DeviceKeyHandle, KEY_READ, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&DeviceKeyHandle, SubKeyHandle, &Device->InstanceID, KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + DPRINT("IopOpenRegistryKeyEx() failed with status 0x%08lx\n", Status); break; }

16 years, 8 months

[pschweitzer] 31559: [FORMATTING] Fix indentation

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jan 2 14:04:48 2008 New Revision: 31559 URL: http://svn.reactos.org/svn/reactos?rev=31559&view=rev Log: [FORMATTING] Fix indentation Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c Wed Jan 2 14:04:48 2008 @@ -36,8 +36,8 @@ static NTSTATUS NtfsGetFsVolumeInformation(PDEVICE_OBJECT DeviceObject, - PFILE_FS_VOLUME_INFORMATION FsVolumeInfo, - PULONG BufferLength) + PFILE_FS_VOLUME_INFORMATION FsVolumeInfo, + PULONG BufferLength) { DPRINT("NtfsGetFsVolumeInformation() called\n"); DPRINT("FsVolumeInfo = %p\n", FsVolumeInfo); @@ -46,12 +46,12 @@ DPRINT("Vpb %p\n", DeviceObject->Vpb); DPRINT("Required length %lu\n", - sizeof(FILE_FS_VOLUME_INFORMATION) + DeviceObject->Vpb->VolumeLabelLength); + sizeof(FILE_FS_VOLUME_INFORMATION) + DeviceObject->Vpb->VolumeLabelLength); DPRINT("LabelLength %hu\n", - DeviceObject->Vpb->VolumeLabelLength); + DeviceObject->Vpb->VolumeLabelLength); DPRINT("Label %*.S\n", - DeviceObject->Vpb->VolumeLabelLength / sizeof(WCHAR), - DeviceObject->Vpb->VolumeLabel); + DeviceObject->Vpb->VolumeLabelLength / sizeof(WCHAR), + DeviceObject->Vpb->VolumeLabel); if (*BufferLength < sizeof(FILE_FS_VOLUME_INFORMATION)) return STATUS_INFO_LENGTH_MISMATCH; @@ -63,8 +63,8 @@ FsVolumeInfo->VolumeSerialNumber = DeviceObject->Vpb->SerialNumber; FsVolumeInfo->VolumeLabelLength = DeviceObject->Vpb->VolumeLabelLength; memcpy(FsVolumeInfo->VolumeLabel, - DeviceObject->Vpb->VolumeLabel, - DeviceObject->Vpb->VolumeLabelLength); + DeviceObject->Vpb->VolumeLabel, + DeviceObject->Vpb->VolumeLabelLength); /* dummy entries */ FsVolumeInfo->VolumeCreationTime.QuadPart = 0; @@ -81,8 +81,8 @@ static NTSTATUS NtfsGetFsAttributeInformation(PDEVICE_EXTENSION DeviceExt, - PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, - PULONG BufferLength) + PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, + PULONG BufferLength) { DPRINT("NtfsGetFsAttributeInformation()\n"); DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo); @@ -113,8 +113,8 @@ static NTSTATUS NtfsGetFsSizeInformation(PDEVICE_OBJECT DeviceObject, - PFILE_FS_SIZE_INFORMATION FsSizeInfo, - PULONG BufferLength) + PFILE_FS_SIZE_INFORMATION FsSizeInfo, + PULONG BufferLength) { PDEVICE_EXTENSION DeviceExt; NTSTATUS Status = STATUS_SUCCESS; @@ -142,7 +142,7 @@ static NTSTATUS NtfsGetFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, - PULONG BufferLength) + PULONG BufferLength) { DPRINT("NtfsGetFsDeviceInformation()\n"); DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo); @@ -167,7 +167,7 @@ NTSTATUS STDCALL NtfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { FS_INFORMATION_CLASS FsInformationClass; PIO_STACK_LOCATION Stack; @@ -186,33 +186,33 @@ DPRINT("SystemBuffer %p\n", SystemBuffer); switch (FsInformationClass) - { - case FileFsVolumeInformation: - Status = NtfsGetFsVolumeInformation(DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FileFsAttributeInformation: - Status = NtfsGetFsAttributeInformation(DeviceObject->DeviceExtension, - SystemBuffer, - &BufferLength); - break; - - case FileFsSizeInformation: - Status = NtfsGetFsSizeInformation(DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FileFsDeviceInformation: - Status = NtfsGetFsDeviceInformation(SystemBuffer, - &BufferLength); - break; - - default: - Status = STATUS_NOT_SUPPORTED; - } + { + case FileFsVolumeInformation: + Status = NtfsGetFsVolumeInformation(DeviceObject, + SystemBuffer, + &BufferLength); + break; + + case FileFsAttributeInformation: + Status = NtfsGetFsAttributeInformation(DeviceObject->DeviceExtension, + SystemBuffer, + &BufferLength); + break; + + case FileFsSizeInformation: + Status = NtfsGetFsSizeInformation(DeviceObject, + SystemBuffer, + &BufferLength); + break; + + case FileFsDeviceInformation: + Status = NtfsGetFsDeviceInformation(SystemBuffer, + &BufferLength); + break; + + default: + Status = STATUS_NOT_SUPPORTED; + } Irp->IoStatus.Status = Status; if (NT_SUCCESS(Status)) @@ -228,7 +228,7 @@ NTSTATUS STDCALL NtfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { DPRINT("NtfsSetVolumeInformation() called\n");

16 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008