Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31253: - Use CmPrepareKey only in cmlib, since it's a cmlib hack.
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sat Dec 15 21:25:08 2007 New Revision: 31253 URL: http://svn.reactos.org/svn/reactos?rev=31253&view=rev Log: - Use CmPrepareKey only in cmlib, since it's a cmlib hack. Modified: trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/ntoskrnl/config/cmcontrl.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Sat Dec 15 21:25:08 2007 @@ -503,6 +503,8 @@ return Status; } + if (Operation != HINIT_CREATE) CmPrepareHive(Hive); + return Status; } Modified: trunk/reactos/ntoskrnl/config/cmcontrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcontrl.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmcontrl.c (original) +++ trunk/reactos/ntoskrnl/config/cmcontrl.c Sat Dec 15 21:25:08 2007 @@ -138,9 +138,6 @@ /* Sanity check, flat hives don't have release routines */ ASSERT(SystemHive->ReleaseCellRoutine == NULL); - /* FIXME: Prepare it */ - CmPrepareHive(SystemHive); - /* Set the Root Cell */ RootCell = ((PHBASE_BLOCK)SystemHiveData)->RootCell; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat Dec 15 21:25:08 2007 @@ -216,7 +216,6 @@ /* ROS: Init root key cell and prepare the hive */ if (Operation == HINIT_CREATE) CmCreateRootNode(&NewHive->Hive, L""); - CmPrepareHive(&NewHive->Hive); /* Duplicate the hive name */ NewHive->FileFullPath.Buffer = ExAllocatePoolWithTag(PagedPool, @@ -670,7 +669,6 @@ &HiveName, 2); if (!NT_SUCCESS(Status)) return FALSE; - CmPrepareHive(&SystemHive->Hive); /* Set the hive filename */ RtlCreateUnicodeString(&SystemHive->FileFullPath,

1 0

[fireball] 31252: - Implement NtCreateKey using the new parse routine. - NtOpenKey should only return the key handle if the operation was successful. - Point to new parse routine, and rename it to CmParseKey instead of CmParseKey2 which was used during the test phase. - Delete all of the "cm" directory, this code is now fully gone; the new Configuration Manager is in place. - Move cm.h and cm_x.h to include/internal where they belong to and fix all their includers.
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sat Dec 15 21:14:41 2007 New Revision: 31252 URL: http://svn.reactos.org/svn/reactos?rev=31252&view=rev Log: - Implement NtCreateKey using the new parse routine. - NtOpenKey should only return the key handle if the operation was successful. - Point to new parse routine, and rename it to CmParseKey instead of CmParseKey2 which was used during the test phase. - Delete all of the "cm" directory, this code is now fully gone; the new Configuration Manager is in place. - Move cm.h and cm_x.h to include/internal where they belong to and fix all their includers. Added: trunk/reactos/ntoskrnl/include/internal/cm.h - copied unchanged from r31245, trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/include/internal/cm_x.h (contents, props changed) - copied, changed from r31245, trunk/reactos/ntoskrnl/config/cm_x.h Removed: trunk/reactos/ntoskrnl/cm/ trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cm_x.h Modified: trunk/reactos/ntoskrnl/config/cmalloc.c trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmboot.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmcheck.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmconfig.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmcontrl.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmdata.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmdelay.c trunk/reactos/ntoskrnl/config/cmhook.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmindex.c (contents, props changed) trunk/reactos/ntoskrnl/config/cminit.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmkcbncb.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmkeydel.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmlazy.c trunk/reactos/ntoskrnl/config/cmmapvw.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmname.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmparse.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmse.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmsecach.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmsysini.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmvalche.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmvalue.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmwraprs.c (contents, props changed) trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (contents, props changed) trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c (contents, props changed) trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ntkrnlmp.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… Removed: trunk/reactos/ntoskrnl/config/cm_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm_x.h?rev… Modified: trunk/reactos/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmalloc.c?… Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… Modified: trunk/reactos/ntoskrnl/config/cmboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmboot.c?r… Modified: trunk/reactos/ntoskrnl/config/cmcheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcheck.c?… Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… Modified: trunk/reactos/ntoskrnl/config/cmcontrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcontrl.c… Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… Modified: trunk/reactos/ntoskrnl/config/cmhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhook.c?r… Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… Modified: trunk/reactos/ntoskrnl/config/cmkeydel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkeydel.c… Modified: trunk/reactos/ntoskrnl/config/cmlazy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmlazy.c?r… Modified: trunk/reactos/ntoskrnl/config/cmmapvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmmapvw.c?… Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… Modified: trunk/reactos/ntoskrnl/config/cmse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmse.c?rev… Modified: trunk/reactos/ntoskrnl/config/cmsecach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsecach.c… Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… Modified: trunk/reactos/ntoskrnl/config/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmwraprs.c… Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/powerpc/cm… Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=312… Copied: trunk/reactos/ntoskrnl/include/internal/cm_x.h (from r31245, trunk/reactos/ntoskrnl/config/cm_x.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp.rbuild?r… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r…

1 0

[fireball] 31251: - Implement BIOS access routines in HAL. - Implement HalResetDisplay using those routines. - Uncomment a display reset in bootvid (as real Windows bootvid does). - Remove 1 sec delay from the shutdown thread. - As a result, no more red screen flashing at the end of the 1st stage, shutdown quotes are displayed again, and BSODs are shown correctly.
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sat Dec 15 20:15:48 2007 New Revision: 31251 URL: http://svn.reactos.org/svn/reactos?rev=31251&view=rev Log: - Implement BIOS access routines in HAL. - Implement HalResetDisplay using those routines. - Uncomment a display reset in bootvid (as real Windows bootvid does). - Remove 1 sec delay from the shutdown thread. - As a result, no more red screen flashing at the end of the 1st stage, shutdown quotes are displayed again, and BSODs are shown correctly. Added: trunk/reactos/hal/halx86/generic/bios.c (with props) trunk/reactos/hal/halx86/generic/v86.s (with props) Modified: trunk/reactos/drivers/base/bootvid/bootvid.c trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.c (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.c Sat Dec 15 20:15:48 2007 @@ -420,10 +420,8 @@ /* Now check if we have to set the mode */ if (SetMode) { - // - // Reset the display - // - //HalResetDisplay(); + /* Reset the display */ + HalResetDisplay(); curr_x = 0; curr_y = 0; @@ -463,7 +461,7 @@ curr_y = 0; /* Clear the screen with HAL if we were asked to */ - //if (HalReset) HalResetDisplay(); + if (HalReset) HalResetDisplay(); /* Re-initialize the VGA Display */ VgaInterpretCmdStream(AT_Initialization); Added: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c (added) +++ trunk/reactos/hal/halx86/generic/bios.c Sat Dec 15 20:15:48 2007 @@ -1,0 +1,237 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/bios.c + * PURPOSE: BIOS Access Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +UCHAR HalpIopmSaveBuffer[0x2000]; +ULONG HalpSavedPfn; +HARDWARE_PTE HalpSavedPte; +ULONG HalpGpfHandler; +ULONG HalpBopHandler; +USHORT HalpSavedIopmBase; +PUCHAR HalpSavedIoMap; +ULONG HalpSavedEsp0; + +#define GetPdeAddress(x) (PHARDWARE_PTE)(((((ULONG_PTR)(x)) >> 22) << 2) + 0xC0300000) +#define GetPteAddress(x) (PHARDWARE_PTE)(((((ULONG_PTR)(x)) >> 12) << 2) + 0xC0000000) + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +HalpStoreAndClearIopm(IN PUCHAR IoMap) +{ + ULONG i; + + /* Backup the old I/O Map */ + RtlCopyMemory(HalpIopmSaveBuffer, IoMap, 0x2000); + + /* Erase the current one */ + for (i = 0; i < 0x2000; i++) IoMap[i] = 0; + for (i = 0x2000; i < 0x2004; i++) IoMap[i] = 0xFF; +} + +VOID +NTAPI +HalpRestoreIopm(IN PUCHAR IoMap) +{ + ULONG i; + + /* Restore the backed up copy, and initialize it */ + RtlCopyMemory(IoMap, HalpIopmSaveBuffer, 0x2000); + for (i = 0x2000; i < 0x2004; i++) IoMap[i] = 0xFF; +} + +VOID +NTAPI +HalpMapRealModeMemory(VOID) +{ + PHARDWARE_PTE Pte, V86Pte; + ULONG i; + + /* Get the page table directory for the lowest meg of memory */ + Pte = GetPdeAddress(0); + HalpSavedPfn = Pte->PageFrameNumber; + HalpSavedPte = *Pte; + + /* Map it to the HAL reserved region and make it valid */ + Pte->Valid = 1; + Pte->Write = 1; + Pte->Owner = 1; + Pte->PageFrameNumber = (GetPdeAddress(0xFFC00000))->PageFrameNumber; + + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); + + /* Now loop the first meg of memory */ + for (i = 0; i < 0x100000; i += PAGE_SIZE) + { + /* Identity map it */ + Pte = GetPteAddress((PVOID)i); + Pte->PageFrameNumber = i >> PAGE_SHIFT; + Pte->Valid = 1; + Pte->Write = 1; + Pte->Owner = 1; + } + + /* Now get the entry for our real mode V86 code and the target */ + Pte = GetPteAddress(0x20000); + V86Pte = GetPteAddress(&HalpRealModeStart); + do + { + /* Map the physical address into our real-mode region */ + Pte->PageFrameNumber = V86Pte->PageFrameNumber; + + /* Keep going until we've reached the end of our region */ + Pte++; + V86Pte++; + } while (V86Pte <= GetPteAddress(&HalpRealModeEnd)); + + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); +} + +VOID +NTAPI +HalpSwitchToRealModeTrapHandlers(VOID) +{ + ULONG Handler; + + /* Save the current Invalid Opcode and General Protection Fault Handlers */ + HalpGpfHandler = ((((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset << 16) & + 0xFFFF0000) | + (((PKIPCR)KeGetPcr())->IDT[13].Offset & 0xFFFF); + HalpBopHandler = ((((PKIPCR)KeGetPcr())->IDT[6].ExtendedOffset << 16) & + 0xFFFF0000) | + (((PKIPCR)KeGetPcr())->IDT[6].Offset & 0xFFFF); + + /* Now set our own GPF handler to handle exceptions while in real mode */ + Handler = (ULONG_PTR)HalpTrap0D; + ((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset = + (USHORT)((Handler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[13].Offset = (USHORT)Handler; + + /* And our own invalid opcode handler to detect the BOP to get us out */ + Handler = (ULONG_PTR)HalpTrap06; + ((PKIPCR)KeGetPcr())->IDT[6].ExtendedOffset = + (USHORT)((Handler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[6].Offset = (USHORT)Handler; +} + +VOID +NTAPI +HalpSetupRealModeIoPermissionsAndTask(VOID) +{ + /* Save a copy of the I/O Map and delete it */ + HalpSavedIoMap = (PUCHAR)&(KeGetPcr()->TSS->IoMaps[0]); + HalpStoreAndClearIopm(HalpSavedIoMap); + + /* Save the IOPM and switch to the real-mode one */ + HalpSavedIopmBase = KeGetPcr()->TSS->IoMapBase; + KeGetPcr()->TSS->IoMapBase = KiComputeIopmOffset(1); + + /* Save our stack pointer */ + HalpSavedEsp0 = KeGetPcr()->TSS->Esp0; +} + +VOID +NTAPI +HalpRestoreTrapHandlers(VOID) +{ + /* We're back, restore the handlers we over-wrote */ + ((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset = + (USHORT)((HalpGpfHandler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[13].Offset = (USHORT)HalpGpfHandler; + ((PKIPCR)KeGetPcr())->IDT[6].ExtendedOffset = + (USHORT)((HalpBopHandler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[6].Offset = (USHORT)HalpBopHandler; +} + +VOID +NTAPI +HalpRestoreIoPermissionsAndTask(VOID) +{ + /* Restore the stack pointer */ + KeGetPcr()->TSS->Esp0 = HalpSavedEsp0; + + /* Restore the I/O Map */ + HalpRestoreIopm(HalpSavedIoMap); + + /* Restore the IOPM */ + KeGetPcr()->TSS->IoMapBase = HalpSavedIopmBase; +} + +VOID +NTAPI +HalpUnmapRealModeMemory(VOID) +{ + ULONG i; + PHARDWARE_PTE Pte; + + /* Loop the first meg of memory */ + for (i = 0; i < 0x100000; i += PAGE_SIZE) + { + /* Invalidate each PTE */ + Pte = GetPteAddress((PVOID)i); + Pte->Valid = 0; + Pte->Write = 0; + Pte->PageFrameNumber = 0; + } + + /* Restore the PDE for the lowest megabyte of memory */ + Pte = GetPdeAddress(0); + *Pte = HalpSavedPte; + Pte->PageFrameNumber = HalpSavedPfn; + + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); +} + +BOOLEAN +NTAPI +HalpBiosDisplayReset(VOID) +{ + ULONG Flags = 0; + + /* Disable interrupts */ + Ke386SaveFlags(Flags); + _disable(); + + /* Map memory available to the V8086 real-mode code */ + HalpMapRealModeMemory(); + + /* Use special invalid opcode and GPF trap handlers */ + HalpSwitchToRealModeTrapHandlers(); + + /* Configure the IOPM and TSS */ + HalpSetupRealModeIoPermissionsAndTask(); + + /* Now jump to real mode */ + HalpBiosCall(); + + /* Restore kernel trap handlers */ + HalpRestoreTrapHandlers(); + + /* Restore TSS and IOPM */ + HalpRestoreIoPermissionsAndTask(); + + /* Restore low memory mapping */ + HalpUnmapRealModeMemory(); + + /* Restore interrupts if they were previously enabled */ + Ke386RestoreFlags(Flags); + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/hal/halx86/generic/bios.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Sat Dec 15 20:15:48 2007 @@ -7,6 +7,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <file>beep.c</file> + <file>bios.c</file> <file>bus.c</file> <file>cmos.c</file> <file>dma.c</file> @@ -20,6 +21,7 @@ <file>sysinfo.c</file> <file>timer.c</file> <file>systimer.S</file> + <file>v86.s</file> <pch>../include/hal.h</pch> </module> <module name="hal_generic_up" type="objectlibrary"> Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Sat Dec 15 20:15:48 2007 @@ -109,6 +109,7 @@ HalInitPnpDriver = NULL; // FIXME: TODO HalGetDmaAdapter = HalpGetDmaAdapter; HalGetInterruptTranslator = NULL; // FIXME: TODO + HalResetDisplay = HalpBiosDisplayReset; /* Initialize the hardware lock (CMOS) */ KeInitializeSpinLock(&HalpSystemHardwareLock); Added: trunk/reactos/hal/halx86/generic/v86.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/v86.s?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/v86.s (added) +++ trunk/reactos/hal/halx86/generic/v86.s Sat Dec 15 20:15:48 2007 @@ -1,0 +1,417 @@ +/* + * FILE: hal/halx86/generic/bios.S + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: V8086 Real-Mode BIOS Thunking + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.h> +#include <internal/i386/asmmacro.S> +.intel_syntax noprefix + +// +// HAL BIOS Frame +// +#define HALP_BIOS_FRAME_SS 0x00 +#define HALP_BIOS_FRAME_ESP 0x04 +#define HALP_BIOS_FRAME_EFLAGS 0x08 +#define HALP_BIOS_FRAME_CS 0x0C +#define HALP_BIOS_FRAME_EIP 0x10 +#define HALP_BIOS_FRAME_TRAP_FRAME 0x14 +#define HALP_BIOS_FRAME_CS_LIMIT 0x18 +#define HALP_BIOS_FRAME_CS_BASE 0x1C +#define HALP_BIOS_FRAME_CS_FLAGS 0x20 +#define HALP_BIOS_FRAME_SS_LIMIT 0x24 +#define HALP_BIOS_FRAME_SS_BASE 0x28 +#define HALP_BIOS_FRAME_SS_FLAGS 0x2C +#define HALP_BIOS_FRAME_PREFIX 0x30 +#define HALP_BIOS_FRAME_LENGTH 0x34 + +/* GLOBALS *******************************************************************/ + +_HalpSavedEsp: + .long 0 + +_UnhandledMsg: + .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" + +/* FUNCTIONS *****************************************************************/ + +.globl _HalpBiosCall@0 +.func HalpBiosCall@0 +_HalpBiosCall@0: + + /* Set up stack pointer */ + push ebp + mov ebp, esp + + /* Build a trap frame */ + pushfd + push edi + push esi + push ebx + push ds + push es + push fs + push gs + push offset _HalpRealModeEnd + + /* Save the stack */ + mov _HalpSavedEsp, esp + + /* Turn off alignment faults */ + mov eax, cr0 + and eax, ~CR0_AM + mov cr0, eax + + /* Setup a new stack */ + mov esi, fs:KPCR_TSS + mov eax, esp + sub eax, NPX_FRAME_LENGTH + mov [esi+KTSS_ESP0], eax + + /* Save V86 registers */ + push 0 + push 0 + push 0 + push 0 + push 0x2000 + + /* Get linear delta between stack and code */ + mov eax, offset _HalpRealModeEnd-4 + sub eax, offset _HalpRealModeStart + + /* Get offset of code */ + mov edx, offset _HalpRealModeStart + and edx, 0xFFF + + /* Add offset to linear address and save the new V86 SP */ + add eax, edx + push eax + + /* Start building interrupt frame. Setup V86 EFLAGS and IOPL 3 */ + pushfd + or dword ptr [esp], EFLAGS_V86_MASK + or dword ptr [esp], 0x3000 + + /* Push the CS and IP */ + push 0x2000 + push edx + + /* Do the interrupt return (jump to V86 mode) */ + iretd + +.globl _HalpRealModeStart +_HalpRealModeStart: + + /* Set mode 13 */ + mov ax, 0x12 + .byte 0 + .byte 0 + + /* Do the interrupt */ + int 0x10 + + /* BOP to exit V86 mode */ + .byte 0xC4 + .byte 0xC4 + + /* The stack lives here */ +.align 4 + .space 2048 +.globl _HalpRealModeEnd +_HalpRealModeEnd: + + /* We're back, clean up the trap frame */ + pop gs + pop fs + pop es + pop ds + pop ebx + pop esi + pop edi + popfd + + /* Return to caller */ + pop ebp + ret 0 +.endfunc + +.globl _HalpOpcodeInvalid@0 +.func HalpOpcodeInvalid@0 +_HalpOpcodeInvalid@0: + + /* Unhandled */ + UNHANDLED_PATH + + /* Nothing to return */ + xor eax, eax + ret 0 +.endfunc + +.globl _HalpPushInt@0 +.func HalpPushInt@0 +_HalpPushInt@0: + + /* Save EBX */ + push ebx + + /* Get SS offset and base */ + mov edx, [esi+HALP_BIOS_FRAME_ESP] + mov ebx, [esi+HALP_BIOS_FRAME_SS_BASE] + + /* Convert to 16-bits */ + and edx, 0xFFFF + sub dx, 2 + + /* Get EFLAGS and write them into the linear address of SP */ + mov ax, word ptr [esi+HALP_BIOS_FRAME_EFLAGS] + mov [ebx+edx], ax + sub dx, 2 + + /* Get CS segment and write it into SP */ + mov ax, word ptr [esi+HALP_BIOS_FRAME_CS] + mov [ebx+edx], ax + sub dx, 2 + + /* Get IP and write it into SP */ + mov ax, word ptr [esi+HALP_BIOS_FRAME_EIP] + mov [ebx+edx], ax + + /* Get new IP value (the interrupt ID is in ECX, so this is in the IVT) */ + mov eax, [ecx*4] + push eax + + /* Now save the new IP */ + movzx eax, ax + mov [esi+HALP_BIOS_FRAME_EIP], eax + + /* Save the new CS of this IP */ + pop eax + shr eax, 16 + mov [esi+HALP_BIOS_FRAME_CS], eax + + /* Update the stack pointer after our manual interrupt frame construction */ + mov word ptr [esi+HALP_BIOS_FRAME_ESP], dx + + /* Get CS and convert it to linear format */ + mov eax, [esi+HALP_BIOS_FRAME_CS] + shl eax, 4 + mov [esi+HALP_BIOS_FRAME_CS_BASE], eax + mov dword ptr [esi+HALP_BIOS_FRAME_CS_LIMIT], 0xFFFF + mov dword ptr [esi+HALP_BIOS_FRAME_CS_FLAGS], 0 + + /* Return success and restore EBX */ + mov eax, 1 + pop ebx + ret 0 +.endfunc + +.globl _HalpOpcodeINTnn@0 +.func HalpOpcodeINTnn@0 +_HalpOpcodeINTnn@0: + + /* Save non-volatiles and stack */ + push ebp + push esi + push ebx + + /* Get SS and convert it to linear format */ + mov eax, [esi+HALP_BIOS_FRAME_SS] + shl eax, 4 + mov [esi+HALP_BIOS_FRAME_SS_BASE], eax + mov dword ptr [esi+HALP_BIOS_FRAME_SS_LIMIT], 0xFFFF + mov dword ptr [esi+HALP_BIOS_FRAME_SS_FLAGS], 0 + + /* Increase IP and check if we're past the CS limit */ + inc dword ptr [esi+HALP_BIOS_FRAME_EIP] + mov edi, [esi+HALP_BIOS_FRAME_EIP] + cmp edi, [esi+HALP_BIOS_FRAME_CS_LIMIT] + ja EipLimitReached + + /* Convert IP to linear address and read the interrupt number */ + add edi, [esi+HALP_BIOS_FRAME_CS_BASE] + movzx ecx, byte ptr [edi] + + /* Increase EIP and do the interrupt, check for status */ + inc dword ptr [esi+HALP_BIOS_FRAME_EIP] + call _HalpPushInt@0 + test eax, 0xFFFF + jz Done + + /* Update the trap frame */ + mov ebp, [esi+HALP_BIOS_FRAME_TRAP_FRAME] + mov eax, [esi+HALP_BIOS_FRAME_SS] + mov [ebp+KTRAP_FRAME_SS], eax + mov eax, [esi+HALP_BIOS_FRAME_ESP] + mov [ebp+KTRAP_FRAME_ESP], eax + mov eax, [esi+HALP_BIOS_FRAME_CS] + mov [ebp+KTRAP_FRAME_CS], eax + mov eax, [esi+HALP_BIOS_FRAME_EFLAGS] + mov [ebp+KTRAP_FRAME_EFLAGS], eax + + /* Set success code */ + mov eax, 1 + +Done: + /* Restore volatiles */ + pop ebx + pop edi + pop ebp + ret 0 + +EipLimitReached: + /* Set failure code */ + xor eax, eax + jmp Done +.endfunc + +.globl _HalpDispatchV86Opcode@0 +.func HalpDispatchV86Opcode@0 +_HalpDispatchV86Opcode@0: + + /* Make space for the HAL BIOS Frame on the stack */ + push ebp + mov ebp, esp + sub esp, HALP_BIOS_FRAME_LENGTH + + /* Save non-volatiles */ + push esi + push edi + + /* Save pointer to the trap frame */ + mov esi, [ebp] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_TRAP_FRAME], esi + + /* Save SS */ + movzx eax, word ptr [esi+KTRAP_FRAME_SS] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_SS], eax + + /* Save ESP */ + mov eax, [esi+KTRAP_FRAME_ESP] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_ESP], eax + + /* Save EFLAGS */ + mov eax, [esi+KTRAP_FRAME_EFLAGS] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_EFLAGS], eax + + /* Save CS */ + movzx eax, word ptr [esi+KTRAP_FRAME_CS] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_CS], eax + + /* Save EIP */ + mov eax, [esi+KTRAP_FRAME_EIP] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_EIP], eax + + /* No prefix */ + xor eax, eax + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_PREFIX], eax + + /* Set pointer to HAL BIOS Frame */ + lea esi, [ebp-HALP_BIOS_FRAME_LENGTH] + + /* Convert CS to linear format */ + mov eax, [esi+HALP_BIOS_FRAME_CS] + shl eax, 4 + mov [esi+HALP_BIOS_FRAME_CS_BASE], eax + mov dword ptr [esi+HALP_BIOS_FRAME_CS_LIMIT], 0xFFFF + mov dword ptr [esi+HALP_BIOS_FRAME_CS_FLAGS], 0 + + /* Make sure IP is within the CS Limit */ + mov edi, [esi+HALP_BIOS_FRAME_EIP] + cmp edi, [esi+HALP_BIOS_FRAME_CS_LIMIT] + ja DispatchError + + /* Convert IP to linear address and read the opcode */ + add edi, [esi+HALP_BIOS_FRAME_CS_BASE] + mov dl, [edi] + + /* We only deal with interrupts */ + cmp dl, 0xCD + je DispatchInt + + /* Anything else is invalid */ + call _HalpOpcodeInvalid@0 + jmp DispatchError + +DispatchInt: + /* Handle dispatching the interrupt */ + call _HalpOpcodeINTnn@0 + test eax, 0xFFFF + jz DispatchReturn + + /* Update the trap frame EIP */ + mov edi, [ebp-0x20] + mov eax, [ebp-0x24] + mov [edi+KTRAP_FRAME_EIP], eax + + /* Set success code */ + mov eax, 1 + +DispatchReturn: + /* Restore registers and return */ + pop edi + pop esi + mov esp, ebp + pop ebp + ret 0 + +DispatchError: + /* Set failure code and return */ + xor eax, eax + jmp DispatchReturn +.endfunc + +.func Ki16BitStackException +_Ki16BitStackException: + + /* Save stack */ + push ss + push esp + + /* Go to kernel mode thread stack */ + mov eax, PCR[KPCR_CURRENT_THREAD] + add esp, [eax+KTHREAD_INITIAL_STACK] + + /* Switch to good stack segment */ + UNHANDLED_PATH +.endfunc + +.globl _HalpTrap0D@0 +.func HalpTrap0D@0 +TRAP_FIXUPS htd_a, htd_t, DoFixupV86, DoFixupAbios +_HalpTrap0D@0: + + /* Enter trap */ + TRAP_PROLOG htd_a, htd_t + + /* Check if this is a V86 trap */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz DoDispatch + + /* Unhandled */ + UNHANDLED_PATH + +DoDispatch: + /* Handle the opcode */ + call _HalpDispatchV86Opcode@0 + + /* Exit the interrupt */ + jmp _Kei386EoiHelper@0 +.endfunc + +.globl _HalpTrap06@0 +.func HalpTrap06@0 +_HalpTrap06@0: + + /* Restore DS/ES segments */ + mov eax, KGDT_R3_DATA | RPL_MASK + mov ds, ax + mov es, ax + + /* Restore ESP and return */ + mov esp, _HalpSavedEsp + ret 0 +.endfunc Propchange: trunk/reactos/hal/halx86/generic/v86.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h (original) +++ trunk/reactos/hal/halx86/include/halp.h Sat Dec 15 20:15:48 2007 @@ -115,6 +115,48 @@ IN OUT PVOID Buffer ); +// +// BIOS Routines +// +BOOLEAN +NTAPI +HalpBiosDisplayReset( + VOID +); + +ULONG +NTAPI +HalpBorrowTss( + VOID +); + +ULONG +NTAPI +HalpReturnTss( + ULONG SavedTss +); + +VOID +NTAPI +HalpBiosCall( + VOID +); + +VOID +NTAPI +HalpTrap0D( + VOID +); + +VOID +NTAPI +HalpTrap06( + VOID +); + +extern PVOID HalpRealModeStart; +extern PVOID HalpRealModeEnd; + extern KSPIN_LOCK HalpSystemHardwareLock; #endif /* __INTERNAL_HAL_HAL_H */ Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Sat Dec 15 20:15:48 2007 @@ -107,6 +107,16 @@ // HAL Variables // #define INITIAL_STALL_COUNT 0x64 + +// +// IOPM Definitions +// +#define IO_ACCESS_MAP_NONE 0 +#define IOPM_OFFSET FIELD_OFFSET(KTSS, IoMaps[0].IoMap) +#define KiComputeIopmOffset(MapNumber) \ + (MapNumber == IO_ACCESS_MAP_NONE) ? \ + (USHORT)(sizeof(KTSS)) : \ + (USHORT)(FIELD_OFFSET(KTSS, IoMaps[MapNumber-1].IoMap)) // // Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c Sat Dec 15 20:15:48 2007 @@ -48,7 +48,6 @@ ShutdownThreadMain(PVOID Context) { SHUTDOWN_ACTION Action = (SHUTDOWN_ACTION)Context; - LARGE_INTEGER Waittime; static PCH FamousLastWords[] = { @@ -167,15 +166,12 @@ } PspShutdownProcessManager(); - Waittime.QuadPart = (LONGLONG)-10000000; /* 1sec */ - KeDelayExecutionThread(KernelMode, FALSE, &Waittime); - + CmShutdownSystem(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); MiShutdownMemoryManager(); - if (Action == ShutdownNoReboot) { Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Sat Dec 15 20:15:48 2007 @@ -111,6 +111,7 @@ PCHAR CommandLine; BOOLEAN CustomLogo = FALSE; ULONG i; + extern BOOLEAN ExpInTextModeSetup; /* Quit if we're already installed */ if (InbvBootDriverInstalled) return TRUE; @@ -123,6 +124,9 @@ CommandLine = _strupr(LoaderBlock->LoadOptions); CustomLogo = strstr(CommandLine, "BOOTLOGO") ? TRUE: FALSE; } + + /* For SetupLDR, don't reset the BIOS Display -- FIXME! */ + if (ExpInTextModeSetup) CustomLogo = TRUE; /* Initialize the video */ InbvBootDriverInstalled = VidInitialize(!CustomLogo);

1 0

[spetreolle] 31250: french translation for usetup
by spetreolle＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: spetreolle Date: Sat Dec 15 19:52:40 2007 New Revision: 31250 URL: http://svn.reactos.org/svn/reactos?rev=31250&view=rev Log: french translation for usetup Added: trunk/reactos/base/setup/usetup/lang/fr-FR.h (with props) Modified: trunk/reactos/base/setup/usetup/mui.c Added: 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 (added) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Sat Dec 15 19:52:40 2007 @@ -1,0 +1,937 @@ +#ifndef LANG_FR_FR_H__ +#define LANG_FR_FR_H__ + +static MUI_ENTRY frFRWelcomePageEntries[] = +{ + { + 6, + 8, + "Bienvenue à l'installation de ReactOS", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "Cette partie de l'installation copie le Système d'Exploitation ReactOS", + TEXT_NORMAL + }, + { + 6, + 12, + "sur votre ordinateur et le prépare à la 2e partie de l'installation.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Appuyez sur ENTER pour installer ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Appuyez sur R pour réparer ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Appuyez sur L pour les Termes et Conditions de Licence ReactOS", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Appuyez sur F3 pour quitter sans installer ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "Pour plus d'informations sur ReactOS, veuillez visiter :", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER = Continuer R = Réparer F3 = Quitter", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRIntroPageEntries[] = +{ + { + 4, + 3, + "Installation de ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "L'Installation de ReactOS est en phase de développement.", + TEXT_NORMAL + }, + { + 6, + 9, + "Elle ne supporte pas encore toutes les fonctions d'une application", + TEXT_NORMAL + }, + { + 6, + 10, + " d'installation entièrement utilisable.", + TEXT_NORMAL + }, + { + 6, + 12, + "Les limitations suivantes s'appliquent:", + TEXT_NORMAL + }, + { + 8, + 13, + "- L'installation ne peut gérer plus d'une partition primaire par disque.", + TEXT_NORMAL + }, + { + 8, + 14, + "- L'installation ne peut effacer une partition primaire d'un disque", + TEXT_NORMAL + }, + { + 8, + 15, + " tant que des partitions secondaires existent sur ce disque.", + TEXT_NORMAL + }, + { + 8, + 16, + "- L'installation ne peut effacer la première partition secondaire", + TEXT_NORMAL + }, + { + 8, + 17, + " tant que des autres partitions secondaires existent sur ce disque.", + TEXT_NORMAL + }, + { + 8, + 18, + "- L'installation supporte uniquement le système de fichiers FAT.", + TEXT_NORMAL + }, + { + 8, + 19, + "- Les vérifications de système de fichers ne sont pas implémentées.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Appuyez sur ENTER pour installer ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Appuyez sur F3 pour quitter sans installer ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continuer F3 = Quitter", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRLicensePageEntries[] = +{ + { + 6, + 6, + "Licence:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "The ReactOS System is licensed under the terms of the", + TEXT_NORMAL + }, + { + 8, + 9, + "GNU GPL with parts containing code from other compatible", + TEXT_NORMAL + }, + { + 8, + 10, + "licenses such as the X11 or BSD and GNU LGPL licenses.", + TEXT_NORMAL + }, + { + 8, + 11, + "All software that is part of the ReactOS system is", + TEXT_NORMAL + }, + { + 8, + 12, + "therefore released under the GNU GPL as well as maintaining", + TEXT_NORMAL + }, + { + 8, + 13, + "the original license.", + TEXT_NORMAL + }, + { + 8, + 15, + "This software comes with NO WARRANTY or restrictions on usage", + TEXT_NORMAL + }, + { + 8, + 16, + "save applicable local and international law. The licensing of", + TEXT_NORMAL + }, + { + 8, + 17, + "ReactOS only covers distribution to third parties.", + TEXT_NORMAL + }, + { + 8, + 18, + "If for some reason you did not receive a copy of the", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU General Public License with ReactOS please visit", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Warranty:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "This is free software; see the source for copying conditions.", + TEXT_NORMAL + }, + { + 8, + 25, + "There is NO warranty; not even for MERCHANTABILITY or", + TEXT_NORMAL + }, + { + 8, + 26, + "FITNESS FOR A PARTICULAR PURPOSE", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Retour", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRDevicePageEntries[] = +{ + { + 6, + 8, + "La liste ci-dessous montre les réglages matériels actuels.", + TEXT_NORMAL + }, + { + 8, + 11, + " Ordinateur:", + TEXT_NORMAL + }, + { + 8, + 12, + " Affichage:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Clavier:", + TEXT_NORMAL + }, + { + 8, + 14, + "Réglage Clavier:", + TEXT_NORMAL + }, + { + 8, + 16, + " Accepter:", + TEXT_NORMAL + }, + { + 25, + 16, "Accepter ces réglages matériels", + TEXT_NORMAL + }, + { + 6, + 19, + "Vous pouvez changer les réglages matériels en appuyant sur HAUT ou BAS", + TEXT_NORMAL + }, + { + 6, + 20, + "pour selectionner une entrée.", + TEXT_NORMAL + }, + { + 6, + 21, + "Appuyez sur ENTER pour choisir un autre réglage.", + TEXT_NORMAL + }, + { + 6, + 23, + "Quand tous les réglages sont corrects, sélectionner \"Accepter", + TEXT_NORMAL + }, + { + 6, + 24, + "ces réglages matériels\" et appuyer sur ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continuer F3 = Quitter", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRRepairPageEntries[] = +{ + { + 6, + 8, + "L'Installation de ReactOS est en phase de développement.", + TEXT_NORMAL + }, + { + 6, + 9, + "Elle ne supporte pas encore toutes les fonctions d'une application", + TEXT_NORMAL + }, + { + 6, + 10, + "d'installation entièrement utilisable.", + TEXT_NORMAL + }, + { + 6, + 12, + "Les fonctions de réparation ne sont pas implémentées pour l'instant.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Appuyez sur U pour mettre à jour l'OS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Appuyez sur R pour la Console de Réparation.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Appuyez sur ESC pour retourner à la page principale.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Appuyez sur ENTER pour redémarrer votre ordinateur.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Page principale ENTER = Redémarrer", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY frFRComputerPageEntries[] = +{ + { + 6, + 8, + "Vous voulez changer le type d'ordinateur installé.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Appuyez sur HAUT ou BAS pour sélectionner le type d'ordinateur.", + TEXT_NORMAL + }, + { + 8, + 11, + " Puis appuyez sur ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Appuyez sur ESC pour revenir à la page précédente sans changer", + TEXT_NORMAL + }, + { + 8, + 14, + " le type d'ordinateur.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continuer ESC = Annuler F3 = Quitter", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRFlushPageEntries[] = +{ + { + 10, + 6, + "Le système s'assure quer toutes les données sont écrites sur le disque", + TEXT_NORMAL + }, + { + 10, + 8, + "Cela peut prendre une minute", + TEXT_NORMAL + }, + { + 10, + 9, + "Quand cela sera fini, votre ordinateur redémarrera automatiquement", + TEXT_NORMAL + }, + { + 0, + 0, + " Vidage du cache", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRQuitPageEntries[] = +{ + { + 10, + 6, + "ReactOS n'est pas complètement installé", + TEXT_NORMAL + }, + { + 10, + 8, + "Enlever la disquette du lecteur A: et", + TEXT_NORMAL + }, + { + 10, + 9, + "tous les CDROMs des lecteurs de CD.", + TEXT_NORMAL + }, + { + 10, + 11, + "Appuyez sur ENTER pour redémarrer votre ordinateur.", + TEXT_NORMAL + }, + { + 0, + 0, + " Veuillez attendre ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRDisplayPageEntries[] = +{ + { + 6, + 8, + "Vous voulez changer le type d'écran à installer.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Appuyez sur HAUT ou BAS pour sélectionner le type d'écran.", + TEXT_NORMAL + }, + { + 8, + 11, + " Appuez sur ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Appuyez sur ESC pour revenir à la page précédente sans changer", + TEXT_NORMAL + }, + { + 8, + 14, + " le type d'écran.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continuer ESC = Annuler F3 = Quitter", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRSuccessPageEntries[] = +{ + { + 10, + 6, + "Les composants standards de ReactOS ont été installés avec succès.", + TEXT_NORMAL + }, + { + 10, + 8, + "Enlever la disquette du lecteur A: et", + TEXT_NORMAL + }, + { + 10, + 9, + "tous les CDROMs des lecteurs de CD.", + TEXT_NORMAL + }, + { + 10, + 11, + "Appuyez sur ENTER pour redémarrer votre ordinateur.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Redémarrer l'ordinateur", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRBootPageEntries[] = +{ + { + 6, + 8, + "Setup ne peut installer le chargeur sur le disque dur", + TEXT_NORMAL + }, + { + 6, + 9, + "de votre ordinateur", + TEXT_NORMAL + }, + { + 6, + 13, + "Veuillez insérer une disquette formatée dans le lecteur A: et", + TEXT_NORMAL + }, + { + 6, + 14, + "appuyez sur ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Continuer F3 = Quitter", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +MUI_ERROR frFRErrorEntries[] = +{ + { + //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" + }, + { + //ERROR_NO_HDD + "Setup could not find a harddisk.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Setup could not find its source drive.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Setup failed to load the file TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Setup found a corrupt TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_BOOT, + "failed to install FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_COMPUTER, + "Setup failed to load the computer type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_DISPLAY, + "Setup failed to load the display settings list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KEYBOARD, + "Setup failed to load the keyboard type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Setup failed to load the keyboard layout list.\n", + "ENTER = Reboot computer" + }, + { + //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" + }, + { + //ERROR_NEW_PARTITION, + "You can not create a new Partition inside\n" + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "You can not delete unpartitioned disk space!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_FLOPPY, + "No disk in drive A:.", + "ENTER = Continue" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Reboot computer" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to set the initialize the registry.", + "ENTER = Reboot computer" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Reboot computer" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_SETUPDATA, + "Setup failed to find the 'SetupData' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_PTABLE, + "Setup failed to write partition tables.\n" + "ENTER = Reboot computer" + }, + { + NULL, + NULL + } +}; + + +MUI_PAGE frFRPages[] = +{ + { + LANGUAGE_PAGE, + LanguagePageEntries + }, + { + START_PAGE, + frFRWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + frFRIntroPageEntries + }, + { + LICENSE_PAGE, + frFRLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + frFRDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + frFRRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + frFRComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + frFRDisplayPageEntries + }, + { + FLUSH_PAGE, + frFRFlushPageEntries + }, + { + QUIT_PAGE, + frFRQuitPageEntries + }, + { + SUCCESS_PAGE, + frFRSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + frFRBootPageEntries + }, + { + -1, + NULL + } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/fr-FR.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/setup/usetup/lang/fr-FR.h ------------------------------------------------------------------------------ svn:mime-type = text/plain 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 Sat Dec 15 19:52:40 2007 @@ -3,16 +3,22 @@ #include "mui.h" #include "lang/en-US.h" +#include "lang/de-DE.h" #include "lang/es-ES.h" -#include "lang/de-DE.h" +#include "lang/fr-FR.h" #include "lang/ru-RU.h" #include "lang/sv-SE.h" #include "lang/uk-UA.h" + static MUI_LANGUAGE LanguageList[] = { { "English (USA)", enUSPages + }, + { + "French (France)", + frFRPages }, { "German",

1 0

[dreimer] 31249: eeevil trailing spaces :D
by dreimer＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: dreimer Date: Sat Dec 15 19:30:15 2007 New Revision: 31249 URL: http://svn.reactos.org/svn/reactos?rev=31249&view=rev Log: eeevil trailing spaces :D Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.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/ru-RU.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c 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 Sat Dec 15 19:30:15 2007 @@ -760,7 +760,7 @@ LicensePage(PINPUT_RECORD Ir) { MUIDisplayPage(LICENSE_PAGE); - + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -943,7 +943,7 @@ CONSOLE_InvertTextXY (24, Line, 48, 1); - if (RepairUpdateFlag) + if (RepairUpdateFlag) { return SELECT_PARTITION_PAGE; } 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 Sat Dec 15 19:30:15 2007 @@ -34,7 +34,7 @@ TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Druecken Sie L, um die Lizenzabkommen von ReactOS zu lesen", TEXT_NORMAL @@ -46,14 +46,14 @@ TEXT_NORMAL }, { - 6, + 6, 23, "Fuer weitere Informationen, besuchen Sie bitte:", TEXT_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_HIGHLIGHT }, @@ -74,31 +74,31 @@ static MUI_ENTRY deDEIntroPageEntries[] = { { - 4, + 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_UNDERLINE }, { - 6, - 8, + 6, + 8, "Das ReactOS Setup ist noch in einer fruehen Entwicklungsphase. Es unter-", TEXT_NORMAL }, { - 6, + 6, 9, "stuetzt noch nicht alle Funktionen eines vollstaendig nutzbaren Setups.", TEXT_NORMAL }, { - 6, + 6, 12, "Folgende Begrenzungen sind vorhanden:", TEXT_NORMAL }, { - 8, + 8, 13, "- Setup kann nur eine primaere Partition auf einer HDD verwalten.", TEXT_NORMAL @@ -128,32 +128,32 @@ TEXT_NORMAL }, { - 8, - 18, + 8, + 18, "- Setup unterstuetzt nur FAT Dateisysteme.", TEXT_NORMAL }, { - 8, + 8, 19, "- Dateisystemueberpruefung ist noch nicht implementiert.", TEXT_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 Druecken Sie ENTER, um ReactOS zu installieren.", TEXT_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 Druecken Sie F3, um das Setup zu beenden.", TEXT_NORMAL }, { 0, - 0, + 0, " ENTER = Fortsetzen F3 = Beenden", TEXT_STATUS }, @@ -239,43 +239,43 @@ "GNU General Public License with ReactOS please visit", TEXT_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_HIGHLIGHT }, - { + { 8, 22, "Warranty:", TEXT_HIGHLIGHT }, - { + { 8, 24, "This is free software; see the source for copying conditions.", TEXT_NORMAL }, - { + { 8, 25, "There is NO warranty; not even for MERCHANTABILITY or", TEXT_NORMAL }, - { + { 8, 26, "FITNESS FOR A PARTICULAR PURPOSE", TEXT_NORMAL }, - { + { 0, 0, " ENTER = Zurueck", TEXT_STATUS }, - { + { 0, 0, NULL, @@ -286,7 +286,7 @@ static MUI_ENTRY deDEDevicePageEntries[] = { { - 6, + 6, 8, "Die untere Liste zeigt die derzeitigen Geraeteeinstellungen.", TEXT_NORMAL @@ -322,7 +322,7 @@ TEXT_NORMAL }, { - 25, + 25, 16, "Diese Geraeteeinstellungen akzeptieren", TEXT_NORMAL }, @@ -333,25 +333,25 @@ TEXT_NORMAL }, { - 6, - 20, + 6, + 20, "Dann druecken Sie ENTER, um eine Alternative Einstellung auszuwaehlen", TEXT_NORMAL }, { - 6, + 6, 21, " ", TEXT_NORMAL }, { - 6, - 23, + 6, + 23, "Wenn alle Einstellungen korrekt sind, waehlen Sie \"Diese Geraete-", TEXT_NORMAL }, { - 6, + 6, 24, "einstellungen akzeptieren\" und druecken Sie ENTER.", TEXT_NORMAL @@ -373,49 +373,49 @@ static MUI_ENTRY deDERepairPageEntries[] = { { - 6, + 6, 8, "Das ReactOS Setup ist noch in einer fruehen Entwicklungsphase. Es unter-", TEXT_NORMAL }, { - 6, + 6, 9, "stuetzt noch nicht alle Funktionen eines vollstaendig nutzbaren Setups.", TEXT_NORMAL }, { - 6, + 6, 12, "Die Reparaturfunktionen sind noch nicht implementiert.", TEXT_NORMAL }, { - 8, + 8, 15, "\x07 Druecken Sie U, um ReactOS zu aktualisieren.", TEXT_NORMAL }, { - 8, + 8, 17, "\x07 Druecken Sie R, fuer die Wiederherstellungskonsole.", TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Druecken Sie ESC, um zur Hauptseite zurueckzukehren.", TEXT_NORMAL }, { - 8, + 8, 21, "\x07 Druecken Sie ENTER, um den Computer neuzustarten.", TEXT_NORMAL }, { - 0, + 0, 0, " ESC = Hauptseite ENTER = Neustarten", TEXT_STATUS @@ -440,7 +440,7 @@ 10, "\x07 Druecken Sie die HOCH- oder RUNTER-Taste um den gewuenschten", TEXT_NORMAL - }, + }, { 8, 11, @@ -840,7 +840,7 @@ { //ERROR_CABINET_SECTION, "Setup konnte die 'Ordner' Sektion im\n" - "Cabinet nicht finden.\n", + "Cabinet nicht finden.\n", "ENTER = Computer neustarten" }, { 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 Sat Dec 15 19:30:15 2007 @@ -57,7 +57,7 @@ TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Press L to view the ReactOS Licensing Terms and Conditions", TEXT_NORMAL @@ -69,14 +69,14 @@ TEXT_NORMAL }, { - 6, + 6, 23, "For more information on ReactOS, please visit:", TEXT_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_HIGHLIGHT }, @@ -97,31 +97,31 @@ static MUI_ENTRY enUSIntroPageEntries[] = { { - 4, + 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_UNDERLINE }, { - 6, - 8, + 6, + 8, "ReactOS Setup is in an early development phase. It does not yet", TEXT_NORMAL }, { - 6, + 6, 9, "support all the functions of a fully usable setup application.", TEXT_NORMAL }, { - 6, + 6, 12, "The following limitations apply:", TEXT_NORMAL }, { - 8, + 8, 13, "- Setup can not handle more than one primary partition per disk.", TEXT_NORMAL @@ -151,32 +151,32 @@ TEXT_NORMAL }, { - 8, - 18, + 8, + 18, "- Setup supports FAT file systems only.", TEXT_NORMAL }, { - 8, + 8, 19, "- File system checks are not implemented yet.", TEXT_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 Press ENTER to install ReactOS.", TEXT_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 Press F3 to quit without installing ReactOS.", TEXT_NORMAL }, { 0, - 0, + 0, " ENTER = Continue F3 = Quit", TEXT_STATUS }, @@ -262,43 +262,43 @@ "GNU General Public License with ReactOS please visit", TEXT_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_HIGHLIGHT }, - { + { 8, 22, "Warranty:", TEXT_HIGHLIGHT }, - { + { 8, 24, "This is free software; see the source for copying conditions.", TEXT_NORMAL }, - { + { 8, 25, "There is NO warranty; not even for MERCHANTABILITY or", TEXT_NORMAL }, - { + { 8, 26, "FITNESS FOR A PARTICULAR PURPOSE", TEXT_NORMAL }, - { + { 0, 0, " ENTER = Return", TEXT_STATUS }, - { + { 0, 0, NULL, @@ -309,7 +309,7 @@ static MUI_ENTRY enUSDevicePageEntries[] = { { - 6, + 6, 8, "The list below shows the current device settings.", TEXT_NORMAL @@ -345,7 +345,7 @@ TEXT_NORMAL }, { - 25, + 25, 16, "Accept these device settings", TEXT_NORMAL }, @@ -356,25 +356,25 @@ TEXT_NORMAL }, { - 6, - 20, + 6, + 20, "to select an entry. Then press the ENTER key to select alternative", TEXT_NORMAL }, { - 6, + 6, 21, "settings.", TEXT_NORMAL }, { - 6, - 23, + 6, + 23, "When all settings are correct, select \"Accept these device settings\"", TEXT_NORMAL }, { - 6, + 6, 24, "and press ENTER.", TEXT_NORMAL @@ -396,49 +396,49 @@ static MUI_ENTRY enUSRepairPageEntries[] = { { - 6, + 6, 8, "ReactOS Setup is in an early development phase. It does not yet", TEXT_NORMAL }, { - 6, + 6, 9, "support all the functions of a fully usable setup application.", TEXT_NORMAL }, { - 6, + 6, 12, "The repair functions are not implemented yet.", TEXT_NORMAL }, { - 8, + 8, 15, "\x07 Press U for Updating OS.", TEXT_NORMAL }, { - 8, + 8, 17, "\x07 Press R for the Recovery Console.", TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Press ESC to return to the main page.", TEXT_NORMAL }, { - 8, + 8, 21, "\x07 Press ENTER to reboot your computer.", TEXT_NORMAL }, { - 0, + 0, 0, " ESC = Main page ENTER = Reboot", TEXT_STATUS @@ -463,7 +463,7 @@ 10, "\x07 Press the UP or DOWN key to select the desired computer type.", TEXT_NORMAL - }, + }, { 8, 11, @@ -863,7 +863,7 @@ { //ERROR_CABINET_SECTION, "Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", + "in the cabinet.\n", "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 Sat Dec 15 19:30:15 2007 @@ -34,7 +34,7 @@ TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Presione L para ver las condiciones y términos de licencia", TEXT_NORMAL @@ -46,14 +46,14 @@ TEXT_NORMAL }, { - 6, + 6, 23, "Para más información sobre ReactOS, visite por favor:", TEXT_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_HIGHLIGHT }, @@ -74,31 +74,31 @@ static MUI_ENTRY esESIntroPageEntries[] = { { - 4, + 4, 3, " Instalación de ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { - 6, - 8, + 6, + 8, "El instalador de ReactOS se encuentra en una etapa preliminar.", TEXT_NORMAL }, { - 6, + 6, 9, "Aún no posee todas las funciones de un instalador.", TEXT_NORMAL }, { - 6, + 6, 12, "Se presentan las siguientes limitaciones:", TEXT_NORMAL }, { - 8, + 8, 13, "- El instalador no soporta más de una partición primaria por disco.", TEXT_NORMAL @@ -128,32 +128,32 @@ TEXT_NORMAL }, { - 8, - 18, + 8, + 18, "- El instalador soporta solamente el sistema de archivos FAT.", TEXT_NORMAL }, { - 8, + 8, 19, "- El comprobador de integridad del sistema de archivos no está aún implementado.", TEXT_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 Presione ENTER para instalar ReactOS.", TEXT_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 Presione F3 para salir sin instalar ReactOS.", TEXT_NORMAL }, { 0, - 0, + 0, " ENTER = Continuar F3 = Salir", TEXT_STATUS }, @@ -239,43 +239,43 @@ "GNU General Public License con ReactOS por favor visite", TEXT_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_HIGHLIGHT }, - { + { 8, 22, "Garantía:", TEXT_HIGHLIGHT }, - { + { 8, 24, "Este es software libre; vea el código para las condiciones de copia.", TEXT_NORMAL }, - { + { 8, 25, "NO existe garantía; ni siquiera para MERCANTIBILIDAD", TEXT_NORMAL }, - { + { 8, 26, "o el cumplimiento de algún propósito particular", TEXT_NORMAL }, - { + { 0, 0, " ENTER = Regresar", TEXT_STATUS }, - { + { 0, 0, NULL, @@ -286,7 +286,7 @@ static MUI_ENTRY esESDevicePageEntries[] = { { - 6, + 6, 8, "La lista inferior muestra la configuración del dispositivo actual.", TEXT_NORMAL @@ -322,7 +322,7 @@ TEXT_NORMAL }, { - 25, + 25, 16, "Aceptar la configuración de los dispositivos", TEXT_NORMAL }, @@ -333,25 +333,25 @@ TEXT_NORMAL }, { - 6, - 20, + 6, + 20, "para elegir. Luego presione ENTER para cambiar a una configuración", TEXT_NORMAL }, { - 6, + 6, 21, "alternativa.", TEXT_NORMAL }, { - 6, - 23, + 6, + 23, "Cuando la configuración sea correcta, elija \"Aceptar la configuración", TEXT_NORMAL }, { - 6, + 6, 24, "de los dispostivos\" y presione ENTER.", TEXT_NORMAL @@ -373,49 +373,49 @@ static MUI_ENTRY esESRepairPageEntries[] = { { - 6, + 6, 8, "El instalador de ReactOS se encuentra en una etapa preliminar.", TEXT_NORMAL }, { - 6, + 6, 9, "Aún no posee todas las funciones de un instalador.", TEXT_NORMAL }, { - 6, + 6, 12, "Las funciones de reparación no han sido aún implementadas.", TEXT_NORMAL }, { - 8, + 8, 15, "\x07 Presione U para actualizar el SO.", TEXT_NORMAL }, { - 8, + 8, 17, "\x07 Presione R para la consola de recuperación.", TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Presione ESC para volver al menú principal.", TEXT_NORMAL }, { - 8, + 8, 21, "\x07 Presione ENTER para reiniciar su computadora.", TEXT_NORMAL }, { - 0, + 0, 0, "ESC = Menú inicial ENTER = Reiniciar", TEXT_STATUS @@ -440,7 +440,7 @@ 10, "\x07 Presione las teclas ARRIBA y ABAJO para elegir el tipo.", TEXT_NORMAL - }, + }, { 8, 11, 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 Sat Dec 15 19:30:15 2007 @@ -56,7 +56,7 @@ TEXT_NORMAL }, { - 8, + 8, 19, "\x07 ¦¬¨â¥ L ¤«ï ¯à®á¬®âà «¨æ¥§¨®®£® á®£« è¥¨ï ReactOS", TEXT_NORMAL @@ -68,14 +68,14 @@ TEXT_NORMAL }, { - 6, + 6, 23, "«ï ¤®¯®«¨â¥«ì®© ¨ä®à¬ æ¨¨ ® ReactOS ¯®á¥â¨â¥:", TEXT_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_HIGHLIGHT }, @@ -96,31 +96,31 @@ static MUI_ENTRY ruRUIntroPageEntries[] = { { - 4, + 4, 3, " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { - 6, - 8, + 6, + 8, "ReactOS å®¤¨âáï ¢ à ¥© áâ ¤¨¨ à §à ¡®âª¨ ¨ ¥ ¯®¤¤¥à¦¨¢ ¥â ¢á¥", TEXT_NORMAL }, { - 6, + 6, 9, "äãªæ¨¨ ¤«ï ¯®«®© á®¢¬¥áâ¨¬®áâ¨ á ãâ ¢«¨¢ ¥¬ë¬¨ ¯à¨«®¦¥¨ï¬¨.", TEXT_NORMAL }, { - 6, + 6, 12, "¬¥îâáï á«¥¤ãîé¨¥ ®£à ¨ç¥¨ï:", TEXT_NORMAL }, { - 8, + 8, 13, "- áâ ®¢ª ¢®§¬®¦ â®«ìª® ¯¥à¢¨çë© à §¤¥« ¤¨áª ", TEXT_NORMAL @@ -150,32 +150,32 @@ TEXT_NORMAL }, { - 8, - 18, + 8, + 18, "- à¨ ãáâ ®¢ª¥ ¯®¤¤¥à¦¨¢ ¥âáï â®«ìª® ä ©«®¢ ï á¨áâ¥¬ FAT.", TEXT_NORMAL }, { - 8, + 8, 19, "- à®¢¥àª ä ©«®¢®© á¨áâ¥¬ë ¥ ®áãé¥áâ¢«ï¥âáï.", TEXT_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 ¦¬¨â¥ ¢¢®¤ ¤«ï ãáâ ®¢ª¨ ReactOS.", TEXT_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 ¦¬¨â¥ F3 ¤«ï ¢ëå®¤ ¨§ ãáâ ®¢ª¨ ReactOS.", TEXT_NORMAL }, { 0, - 0, + 0, " = à®¤®«¦¥¨¥ F3 = ëå®¤", TEXT_STATUS }, @@ -261,43 +261,43 @@ "«¨æ¥§¨®®£® á®£« è¥¨ï GNU ¢¬¥áâ¥ á ReactOS, ¯®á¥â¨â¥", TEXT_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_HIGHLIGHT }, - { + { 8, 22, " à â¨¨:", TEXT_HIGHLIGHT }, - { + { 8, 24, "â® á¢®¡®¤®¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥; á¬. ¨áâ®ç¨ª ¤«ï ¯à®á¬®âà ¯à ¢.", TEXT_NORMAL }, - { + { 8, 25, " ; ¥â £ à â¨¨ ¨«¨", TEXT_NORMAL }, - { + { 8, 26, " ", TEXT_NORMAL }, - { + { 0, 0, " = ®§¢à â", TEXT_STATUS }, - { + { 0, 0, NULL, @@ -308,7 +308,7 @@ static MUI_ENTRY ruRUDevicePageEntries[] = { { - 6, + 6, 8, " á¯¨áª¥ ¨¦¥ ¯à¨¢¥¤¥ë ãáâà®©áâ¢ ¨ ¨å ¯ à ¬¥âàë.", TEXT_NORMAL @@ -344,7 +344,7 @@ TEXT_NORMAL }, { - 25, + 25, 16, "à¨¬¥¨âì ¤ ë¥ ¯ à ¬¥âàë ãáâà®©áâ¢", TEXT_NORMAL }, @@ -355,25 +355,25 @@ TEXT_NORMAL }, { - 6, - 20, + 6, + 20, "¤«ï ¢ë¤¥«¥¨ï í«¥¬¥â ¨ ª« ¢¨èã ¤«ï ¢ë¡®à ¤àã£¨å ¢ à¨ â®¢", TEXT_NORMAL }, { - 6, + 6, 21, "¯ à ¬¥âà®¢.", TEXT_NORMAL }, { - 6, - 23, + 6, + 23, "®£¤ ¢á¥ ¯ à ¬¥âàë ®¯à¥¤¥«¥ë, ¢ë¡¥à¨â¥ \"à¨¬¥¨âì ¤ ë¥ ¯ à ¬¥âàë ãáâà®©áâ¢\"", TEXT_NORMAL }, { - 6, + 6, 24, "¨ ¦¬¨â¥ .", TEXT_NORMAL @@ -395,49 +395,49 @@ static MUI_ENTRY ruRURepairPageEntries[] = { { - 6, + 6, 8, "ReactOS å®¤¨âáï ¢ à ¥© áâ ¤¨¨ à §à ¡®âª¨ ¨ ¥ ¯®¤¤¥à¦¨¢ ¥â ¢á¥", TEXT_NORMAL }, { - 6, + 6, 9, "äãªæ¨¨ ¤«ï ¯®«®© á®¢¬¥áâ¨¬®áâ¨ á ãâ ¢«¨¢ ¥¬ë¬¨ ¯à¨«®¦¥¨ï¬¨.", TEXT_NORMAL }, { - 6, + 6, 12, "ãªæ¨ï ¢®áâ ®¢«¥¨ï ¢ ¤ ë¬ ¬®¬¥â ®âáãâáâ¢ã¥â.", TEXT_NORMAL }, { - 8, + 8, 15, "\x07 ¦¬¨â¥ U ¤«ï ®¡®¢«¥¨ï .", TEXT_NORMAL }, { - 8, + 8, 17, "\x07 ¦¬¨â¥ R ¤«ï § ¯ãáª ª®á®«¨ ¢®áâ ®¢«¥¨ï.", TEXT_NORMAL }, { - 8, + 8, 19, "\x07 ¦¬¨â¥ ESC ¤«ï ¢®§¢à â £« ¢ãî áâà ¨æã.", TEXT_NORMAL }, { - 8, + 8, 21, "\x07 ¦¬¨â¥ ¤«ï ¯¥à¥§ £àã§ª¨ ª®¬¯ìîâ¥à .", TEXT_NORMAL }, { - 0, + 0, 0, " ESC = « ¢ ï áâà ¨æ = ¥à¥§ £àã§ª ", TEXT_STATUS @@ -462,7 +462,7 @@ 10, "\x07 ¦¬¨â¥ ª« ¢¨èã ¨«¨ ¤«ï ¢ë¡®à ¯à¥¤¯®çâ¨â¥«ì®£® â¨¯ ª®¬¯ìîâ¥à .", TEXT_NORMAL - }, + }, { 8, 11, 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 Sat Dec 15 19:30:15 2007 @@ -34,7 +34,7 @@ TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Íàòèñí³òü <L> ùîá ïåðåãëÿíóòè ë³öåíç³éí³ óìîâè ReactOS", TEXT_NORMAL @@ -46,14 +46,14 @@ TEXT_NORMAL }, { - 6, + 6, 23, "Äëÿ á³ëüø êîíêðåòíî¿ ³íôîðìàö³¿ ïðî ReactOS, áóäü ëàñêà â³äâ³äàéòå:", TEXT_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org/uk/", TEXT_HIGHLIGHT }, @@ -74,31 +74,31 @@ static MUI_ENTRY ukUAIntroPageEntries[] = { { - 4, + 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_UNDERLINE }, { - 6, - 8, + 6, + 8, "ReactOS Setup is in an early development phase. It does not yet", TEXT_NORMAL }, { - 6, + 6, 9, "support all the functions of a fully usable setup application.", TEXT_NORMAL }, { - 6, + 6, 12, "The following limitations apply:", TEXT_NORMAL }, { - 8, + 8, 13, "- Setup can not handle more than one primary partition per disk.", TEXT_NORMAL @@ -128,32 +128,32 @@ TEXT_NORMAL }, { - 8, - 18, + 8, + 18, "- Setup supports FAT file systems only.", TEXT_NORMAL }, { - 8, + 8, 19, "- File system checks are not implemented yet.", TEXT_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 Press ENTER to install ReactOS.", TEXT_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 Press F3 to quit without installing ReactOS.", TEXT_NORMAL }, { 0, - 0, + 0, " ENTER = Continue F3 = Quit", TEXT_STATUS }, @@ -239,43 +239,43 @@ "GNU General Public License with ReactOS please visit", TEXT_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_HIGHLIGHT }, - { + { 8, 22, "Warranty:", TEXT_HIGHLIGHT }, - { + { 8, 24, "This is free software; see the source for copying conditions.", TEXT_NORMAL }, - { + { 8, 25, "There is NO warranty; not even for MERCHANTABILITY or", TEXT_NORMAL }, - { + { 8, 26, "FITNESS FOR A PARTICULAR PURPOSE", TEXT_NORMAL }, - { + { 0, 0, " ENTER = Return", TEXT_STATUS }, - { + { 0, 0, NULL, @@ -286,7 +286,7 @@ static MUI_ENTRY ukUADevicePageEntries[] = { { - 6, + 6, 8, "The list below shows the current device settings.", TEXT_NORMAL @@ -322,7 +322,7 @@ TEXT_NORMAL }, { - 25, + 25, 16, "Accept these device settings", TEXT_NORMAL }, @@ -333,25 +333,25 @@ TEXT_NORMAL }, { - 6, - 20, + 6, + 20, "to select an entry. Then press the ENTER key to select alternative", TEXT_NORMAL }, { - 6, + 6, 21, "settings.", TEXT_NORMAL }, { - 6, - 23, + 6, + 23, "When all settings are correct, select \"Accept these device settings\"", TEXT_NORMAL }, { - 6, + 6, 24, "and press ENTER.", TEXT_NORMAL @@ -373,49 +373,49 @@ static MUI_ENTRY ukUARepairPageEntries[] = { { - 6, + 6, 8, "ReactOS Setup is in an early development phase. It does not yet", TEXT_NORMAL }, { - 6, + 6, 9, "support all the functions of a fully usable setup application.", TEXT_NORMAL }, { - 6, + 6, 12, "The repair functions are not implemented yet.", TEXT_NORMAL }, { - 8, + 8, 15, "\x07 Press U for Updating OS.", TEXT_NORMAL }, { - 8, + 8, 17, "\x07 Press R for the Recovery Console.", TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Press ESC to return to the main page.", TEXT_NORMAL }, { - 8, + 8, 21, "\x07 Press ENTER to reboot your computer.", TEXT_NORMAL }, { - 0, + 0, 0, " ESC = Main page ENTER = Reboot", TEXT_STATUS @@ -440,7 +440,7 @@ 10, "\x07 Press the UP or DOWN key to select the desired computer type.", TEXT_NORMAL - }, + }, { 8, 11, 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 Sat Dec 15 19:30:15 2007 @@ -111,7 +111,7 @@ NULL, NULL, POPUP_WAIT_NONE); - return; + return; } index = 0; @@ -144,14 +144,14 @@ { if (ErrorNum >= ERROR_LAST_ERROR_CODE) { - PopupError("invalid error number provided", + PopupError("invalid error number provided", "press enter to continue", Ir, POPUP_WAIT_ENTER); return; } - + PopupError(enUSErrorEntries[ErrorNum].ErrorText, enUSErrorEntries[ErrorNum].ErrorStatus, Ir,

1 0

[janderwald] 31248: - swedish translation of usetup by Stefan Ginsberg stefan__100__@hotmail.com - IRC: Stefan100
by janderwald＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: janderwald Date: Sat Dec 15 19:25:42 2007 New Revision: 31248 URL: http://svn.reactos.org/svn/reactos?rev=31248&view=rev Log: - swedish translation of usetup by Stefan Ginsberg stefan__100__(a)hotmail.com - IRC: Stefan100 Added: trunk/reactos/base/setup/usetup/lang/sv-SE.h (with props) Modified: trunk/reactos/base/setup/usetup/mui.c Added: 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 (added) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Sat Dec 15 19:25:42 2007 @@ -1,0 +1,732 @@ +#ifndef LANG_SV_SE_H__ +#define LANG_SV_SE_H__ + +static MUI_ENTRY svSEWelcomePageEntries[] = +{ + { + 6, + 8, + "Välkommen till ReactOS Setup!", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "Denna del av installationen kopierar ReactOS till eran", + TEXT_NORMAL + }, + { + 6, + 12, + "dator och förbereder den andra delen av installationen.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Tryck på ENTER för att installera ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Tryck på R för att reparera ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Tryck på L för att läsa licensavtalet till ReactOS.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Tryck på F3 för att avbryta installationen av ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "För mer information om ReactOS, besök:", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER = Fortsätt R = Reparera F3 = Avbryt", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup är i en tidig utvecklingsfas och saknar därför ett antal", + TEXT_NORMAL + }, + { + 6, + 9, + "funktioner som kan förväntas av ett fullt användbart setup-program.", + TEXT_NORMAL + }, + { + 6, + 12, + "Följande begränsningar gäller:", + TEXT_NORMAL + }, + { + 8, + 13, + "- Setup kan ej hantera mer än 1 primär partition per hårddisk.", + TEXT_NORMAL + }, + { + 8, + 14, + "- Setup kan ej radera en primär partition från en hårddisk", + TEXT_NORMAL + }, + { + 8, + 15, + " om utökade partitioner existerar på hårddisken.", + TEXT_NORMAL + }, + { + 8, + 16, + "- Setup kan ej radera den första utökade partitionen från en hårddisk", + TEXT_NORMAL + }, + { + 8, + 17, + " om andra utökade partitioner existerar på hårddisken.", + TEXT_NORMAL + }, + { + 8, + 18, + "- Setup stöder endast filsystem av typen FAT.", + TEXT_NORMAL + }, + { + 8, + 19, + "- Kontrollering av hårddiskens filsystem stöds (ännu) ej.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Tryck på ENTER för att installera ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Tryck på F3 för att avbryta installationen.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt F3 = Avbryt", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSELicensePageEntries[] = +{ + { + 6, + 6, + "Licensering:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "ReactOS är licenserad under GNU GPL med delar", + TEXT_NORMAL + }, + { + 8, + 9, + "av den medföljande koden licenserad under GPL-förenliga", + TEXT_NORMAL + }, + { + 8, + 10, + "licenser såsom X11-, BSD- och GNU LGPL-licenserna.", + TEXT_NORMAL + }, + { + 8, + 11, + "All mjukvara som är del av ReactOS är publicerad", + TEXT_NORMAL + }, + { + 8, + 12, + "under GNU GPL, men även den ursprungliga", + TEXT_NORMAL + }, + { + 8, + 13, + "licensen är upprätthållen.", + TEXT_NORMAL + }, + { + 8, + 15, + "Denna mjukvara har INGEN GARANTI eller begränsing på användning", + TEXT_NORMAL + }, + { + 8, + 16, + "bortsett från tillämplig lokal och internationell lag. Licenseringen av", + TEXT_NORMAL + }, + { + 8, + 17, + "ReactOS täcker endast distrubering till tredje part.", + TEXT_NORMAL + }, + { + 8, + 18, + "Om Ni av någon anledning ej fått en kopia av", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU General Public License med ReactOS, besök", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Garanti:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "Detta är gratis mjukvara; se källkoden för restriktioner angående kopiering.", + TEXT_NORMAL + }, + { + 8, + 25, + "INGEN GARANTI ges; inte ens för SÄLJBARHET eller PASSANDE FÖR ETT", + TEXT_NORMAL + }, + { + 8, + 26, + "SPECIELLT SYFTE. ALL ANVÄNDNING SKER PÅ EGEN RISK!", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Återvänd", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEDevicePageEntries[] = +{ + { + 6, + 8, + "Listan nedanför visar inställningarna för maskinvaran.", + TEXT_NORMAL + }, + { + 8, + 11, + " Dator:", + TEXT_NORMAL + }, + { + 8, + 12, + " Bildskärm:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Tangentbord:", + TEXT_NORMAL + }, + { + 8, + 14, + "Tangentbordslayout:", + TEXT_NORMAL + }, + { + 8, + 16, + " Acceptera:", + TEXT_NORMAL + }, + { + 25, + 16, "Acceptera dessa maskinvaruinställningar", + TEXT_NORMAL + }, + { + 6, + 19, + "Ändra inställningarna genom att trycka på UPP- och NED-piltangenterna", + TEXT_NORMAL + }, + { + 6, + 20, + "för att markera en inställning, och tryck på ENTER för att välja", + TEXT_NORMAL + }, + { + 6, + 21, + "inställningen.", + TEXT_NORMAL + }, + { + 6, + 23, + "När alla inställningar är korrekta, välj \"Acceptera dessa maskinvaruinställningar\"", + TEXT_NORMAL + }, + { + 6, + 24, + "och tryck på ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt F3 = Avbryt", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSERepairPageEntries[] = +{ + { + 6, + 8, + "ReactOS Setup är i en tidig utvecklingsfas och saknar därför ett antal", + TEXT_NORMAL + }, + { + 6, + 9, + "funktioner som kan förväntas av ett fullt användbart setup-program.", + TEXT_NORMAL + }, + { + 6, + 12, + "Reparations- och uppdateringsfunktionerna fungerar ej.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Tryck på U för att uppdatera ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Tryck på R för Återställningskonsolen.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Tryck på ESC för att återvända till föregående sida.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Tryck på ENTER för att starta om datorn.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Gå till föregående sida ENTER = Starta om datorn", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY svSEComputerPageEntries[] = +{ + { + 6, + 8, + "Ändra vilken typ av dator som ska installeras.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Använd UPP- och NED-piltangenterna för att välja önskad datortyp.", + TEXT_NORMAL + }, + { + 8, + 11, + " Tryck sen på ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Tryck på ESC för att återvända till den föregående sidan utan", + TEXT_NORMAL + }, + { + 8, + 14, + " att ändra datortypen.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt ESC = Återvänd F3 = Avbryt", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEFlushPageEntries[] = +{ + { + 10, + 6, + "Datorn försäkrar sig om att all data är lagrad på hårdisken.", + TEXT_NORMAL + }, + { + 10, + 8, + "Detta kommer att ta en stund.", + TEXT_NORMAL + }, + { + 10, + 9, + "När detta är färdigt kommer datorn att startas om automatiskt.", + TEXT_NORMAL + }, + { + 0, + 0, + " Rensar cachen", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEQuitPageEntries[] = +{ + { + 10, + 6, + "Installationen av ReactOS har inte slutförts.", + TEXT_NORMAL + }, + { + 10, + 8, + "Se till att ingen floppy-disk finns i floppy-läsare A:", + TEXT_NORMAL + }, + { + 10, + 9, + "och tag ur alla skivor från CD/DVD-läsarna.", + TEXT_NORMAL + }, + { + 10, + 11, + "Tryck på ENTER för att starta om datorn.", + TEXT_NORMAL + }, + { + 0, + 0, + " Var god vänta ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEDisplayPageEntries[] = +{ + { + 6, + 8, + "Ändra vilken typ av bildskärmsinställning som ska installeras.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Använd UPP- och NED-piltangenterna för att välja önskad inställning.", + TEXT_NORMAL + }, + { + 8, + 11, + " Tryck sedan på ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Tryck på ESC för att återvända till den föregående sidan utan", + TEXT_NORMAL + }, + { + 8, + 14, + " att ändra bildskärmsinställningen.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt ESC = Återvänd F3 = Avbryt", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSESuccessPageEntries[] = +{ + { + 10, + 6, + "ReactOS har nu installerats på datorn.", + TEXT_NORMAL + }, + { + 10, + 8, + "Se till att ingen floppy-disk finns i floppy-läsare A:", + TEXT_NORMAL + }, + { + 10, + 9, + "och tag ur alla skivor från CD/DVD-läsarna.", + TEXT_NORMAL + }, + { + 10, + 11, + "Tryck på ENTER för att starta om datorn.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Starta om datorn", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEBootPageEntries[] = +{ + { + 6, + 8, + "Setup misslyckades med att installera bootloadern på datorns", + TEXT_NORMAL + }, + { + 6, + 9, + "hårddisk", + TEXT_NORMAL + }, + { + 6, + 13, + "Var god sätt in en formatterad floppy-disk i läsare A: och", + TEXT_NORMAL + }, + { + 6, + 14, + "tryck på ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Fortsätt F3 = Avbryt", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +MUI_PAGE svSEPages[] = +{ + { + LANGUAGE_PAGE, + LanguagePageEntries + }, + { + START_PAGE, + svSEWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + svSEIntroPageEntries + }, + { + LICENSE_PAGE, + svSELicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + svSEDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + svSERepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + svSEComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + svSEDisplayPageEntries + }, + { + FLUSH_PAGE, + svSEFlushPageEntries + }, + { + QUIT_PAGE, + svSEQuitPageEntries + }, + { + SUCCESS_PAGE, + svSESuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + svSEBootPageEntries + }, + { + -1, + NULL + } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/sv-SE.h ------------------------------------------------------------------------------ svn:eol-style = native 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 Sat Dec 15 19:25:42 2007 @@ -5,9 +5,9 @@ #include "lang/en-US.h" #include "lang/es-ES.h" #include "lang/de-DE.h" +#include "lang/ru-RU.h" +#include "lang/sv-SE.h" #include "lang/uk-UA.h" -#include "lang/ru-RU.h" - static MUI_LANGUAGE LanguageList[] = { { @@ -25,6 +25,10 @@ { "Spanish", esESPages + }, + { + "Swedish", + svSEPages }, { "Ukrainian",

1 0

[dreimer] 31247: Updated German USetup localisation. (Not tested yet, if the string are too long.)
by dreimer＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: dreimer Date: Sat Dec 15 19:21:12 2007 New Revision: 31247 URL: http://svn.reactos.org/svn/reactos?rev=31247&view=rev Log: Updated German USetup localisation. (Not tested yet, if the string are too long.) Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h 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 Sat Dec 15 19:21:12 2007 @@ -673,6 +673,199 @@ }; +MUI_ERROR deDEErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS ist nicht vollstaendig auf Ihrem System installiert.\n" + "Wenn Sie das Setup jetzt beenden, muessen Sie das\n" + "Setup erneut starten, um ROS zu installieren.\n" + "\n" + " \x07 Druecken Sie ENTER um das Setup Fortzusetzen.\n" + " \x07 Druecken Sie F3 um das Setup zu beenden.", + "F3 = Beenden ENTER = Fortsetzen" + }, + { + //ERROR_NO_HDD + "Setup konnte keine Festplatte finden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Setup konnte das Quelllaufwerk nicht finden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Setup konnte TXTSETUP.SIF nicht finden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Setup fand eine korrupte TXTSETUP.SIF.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup fand eine ungueltige Signatur in TXTSETUP.SIF.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup konnte keine Laufwerksinformationen abfragen.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_WRITE_BOOT, + "Setup konnte den FAT Bootcode nicht auf der Partition installieren.", + "ENTER = Computer neustarten" + }, + { + //ERROR_LOAD_COMPUTER, + "Setup konnte die Computertypenliste nicht laden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_LOAD_DISPLAY, + "Setup konnte die Displayeinstellungsliste nicht laden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_LOAD_KEYBOARD, + "Setup konnte die Tastaturtypenliste nicht laden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Setup konnte die Tastaturlayoutliste nicht laden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_WARN_PARTITION, + "Setup hat mindestens eine Festplatte mit einer inkompatiblen Partitionstabelle\n" + "welche nicht richtig verwendet werden koennen!\n" + "\n" + "Partitionen zu erstellen/loeschen kann die Partitionstabelle zerstoeren.\n" + "\n" + " \x07 Druecken Sie F3 um das Setup zu beenden." + " \x07 Druecken Sie ENTER um das Setup Fortzusetzen.", + "F3 = Beenden ENTER = Fortsetzen" + }, + { + //ERROR_NEW_PARTITION, + "Sie koennen keine neue Partition in einer bereits\n" + "vohandenen Partition erstellen!\n" + "\n" + " * * Eine beliebige Taste zum Fortsetzen druecken.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "Sie koennen unpartitionieren Speicher nicht loeschen!\n" + "\n" + " * Eine beliebige Taste zum Fortsetzen druecken.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup konnte den FAT Bootcode nicht auf der Partition installieren.", + "ENTER = Computer neustarten" + }, + { + //ERROR_NO_FLOPPY, + "Keine Diskette in Laufwerk A:.", + "ENTER = Fortsetzen" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup konnte das Tastaturlayout nicht aktualisieren.", + "ENTER = Computer neustarten" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup konnte die Display-Registrywerte nicht aktualisieren.", + "ENTER = Computer neustarten" + }, + { + //ERROR_IMPORT_HIVE, + "Setup konnte keine Hive Datei importieren.", + "ENTER = Computer neustarten" + }, + { + //ERROR_FIND_REGISTRY + "Setup konnte die Registrydateien nicht finden.", + "ENTER = Computer neustarten" + }, + { + //ERROR_CREATE_HIVE, + "Setup konnte die Registry-Hives nicht erstellen.", + "ENTER = Computer neustarten" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup konnte die Registry nicht initialisieren.", + "ENTER = Computer neustarten" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet hat keine gueltige .inf Datei.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet nicht gefunden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet hat kein Setup Skript.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_COPY_QUEUE, + "Setup konnte die Liste mit zu kopierenden Dateien nicht finden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_CREATE_DIR, + "Setup konnte die Installationspfade nicht erstellen.", + "ENTER = Computer neustarten" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup konnte die 'Ordner' Sektion in\n" + "TXTSETUP.SIF nicht finden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_CABINET_SECTION, + "Setup konnte die 'Ordner' Sektion im\n" + "Cabinet nicht finden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup konnte den Installationspfad nicht erstellen.", + "ENTER = Computer neustarten" + }, + { + //ERROR_FIND_SETUPDATA, + "Setup konnte die 'SetupData' Sektion in\n" + "TXTSETUP.SIF nicht finden.\n", + "ENTER = Computer neustarten" + }, + { + //ERROR_WRITE_PTABLE, + "Setup konnte die Partitionstabellen nicht schreiben.\n" + "ENTER = Computer neustarten" + }, + { + NULL, + NULL + } +}; + + MUI_PAGE deDEPages[] = { {

1 0

[fireball] 31246: - Add eol-style:native.
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sat Dec 15 19:18:49 2007 New Revision: 31246 URL: http://svn.reactos.org/svn/reactos?rev=31246&view=rev Log: - Add eol-style:native. Modified: trunk/reactos/ntoskrnl/fstub/disksup.c (contents, props changed) trunk/reactos/ntoskrnl/fstub/fstubex.c (contents, props changed) trunk/reactos/ntoskrnl/fstub/halstub.c (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… Modified: trunk/reactos/ntoskrnl/fstub/halstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/halstub.c?r…

1 0

[janderwald] 31245: - sorry for breaking build
by janderwald＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: janderwald Date: Sat Dec 15 19:08:01 2007 New Revision: 31245 URL: http://svn.reactos.org/svn/reactos?rev=31245&view=rev Log: - sorry for breaking build Added: trunk/reactos/base/setup/usetup/errorcode.h (with props) Added: 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 (added) +++ trunk/reactos/base/setup/usetup/errorcode.h Sat Dec 15 19:08:01 2007 @@ -1,0 +1,56 @@ +#ifndef ERROR_CODE_H__ +#define ERROR_CODE_H__ + + +typedef enum +{ + ERROR_NOT_INSTALLED = 0, + ERROR_NO_HDD, + ERROR_NO_SOURCE_DRIVE, + ERROR_LOAD_TXTSETUPSIF, + ERROR_CORRUPT_TXTSETUPSIF, + ERROR_SIGNATURE_TXTSETUPSIF, + ERROR_DRIVE_INFORMATION, + ERROR_WRITE_BOOT, + ERROR_LOAD_COMPUTER, + ERROR_LOAD_DISPLAY, + ERROR_LOAD_KEYBOARD, + ERROR_LOAD_KBLAYOUT, + ERROR_WARN_PARTITION, + ERROR_NEW_PARTITION, + ERROR_DELETE_SPACE, + ERROR_INSTALL_BOOTCODE, + ERROR_NO_FLOPPY, + ERROR_UPDATE_KBSETTINGS, + ERROR_UPDATE_DISPLAY_SETTINGS, + ERROR_IMPORT_HIVE, + ERROR_FIND_REGISTRY, + ERROR_CREATE_HIVE, + ERROR_INITIALIZE_REGISTRY, + ERROR_INVALID_CABINET_INF, + ERROR_CABINET_MISSING, + ERROR_CABINET_SCRIPT, + ERROR_COPY_QUEUE, + ERROR_CREATE_DIR, + ERROR_TXTSETUP_SECTION, + ERROR_CABINET_SECTION, + ERROR_CREATE_INSTALL_DIR, + ERROR_FIND_SETUPDATA, + ERROR_WRITE_PTABLE, + + ERROR_LAST_ERROR_CODE +}ERROR_NUMBER; + +typedef struct +{ + CHAR * ErrorText; + CHAR * ErrorStatus; +}MUI_ERROR; + + +VOID +MUIDisplayError(ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent); + + + +#endif Propchange: trunk/reactos/base/setup/usetup/errorcode.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 31244: - move static errocodes to header - translation of errorcodes is not yet ready
by janderwald＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: janderwald Date: Sat Dec 15 17:24:02 2007 New Revision: 31244 URL: http://svn.reactos.org/svn/reactos?rev=31244&view=rev Log: - move static errocodes to header - translation of errorcodes is not yet ready Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/usetup.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 Sat Dec 15 17:24:02 2007 @@ -368,15 +368,7 @@ ConfirmQuit(PINPUT_RECORD Ir) { BOOL Result = FALSE; - - PopupError("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", - NULL, POPUP_WAIT_NONE); + MUIDisplayError(ERROR_NOT_INSTALLED, NULL, POPUP_WAIT_NONE); while(TRUE) { @@ -628,17 +620,13 @@ if (!NT_SUCCESS (Status)) { CONSOLE_PrintTextXY(6, 15, "NtQuerySystemInformation() failed (Status 0x%08lx)", Status); - PopupError("Setup could not retrieve system drive information.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_DRIVE_INFORMATION, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } if (Sdi.NumberOfDisks == 0) { - PopupError("Setup could not find a harddisk.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_NO_HDD, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -649,9 +637,7 @@ if (!NT_SUCCESS(Status)) { CONSOLE_PrintTextXY(6, 15, "GetSourcePaths() failed (Status 0x%08lx)", Status); - PopupError("Setup could not find its source drive.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_NO_SOURCE_DRIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } #if 0 @@ -673,18 +659,14 @@ &ErrorLine); if (SetupInf == INVALID_HANDLE_VALUE) { - PopupError("Setup failed to load the file TXTSETUP.SIF.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_LOAD_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } /* Open 'Version' section */ if (!SetupFindFirstLineW (SetupInf, L"Version", L"Signature", &Context)) { - PopupError("Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -692,18 +674,14 @@ /* Get pointer 'Signature' key */ if (!INF_GetData (&Context, NULL, &Value)) { - PopupError("Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } /* Check 'Signature' string */ if (_wcsicmp(Value, L"$ReactOS$") != 0) { - PopupError("Setup found an invalid signature in TXTSETUP.SIF.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_SIGNATURE_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -916,9 +894,7 @@ ComputerList = CreateComputerTypeList(SetupInf); if (ComputerList == NULL) { - PopupError("Setup failed to load the computer type list.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_LOAD_COMPUTER, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } } @@ -929,9 +905,7 @@ DisplayList = CreateDisplayDriverList(SetupInf); if (DisplayList == NULL) { - PopupError("Setup failed to load the display settings list.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_LOAD_DISPLAY, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } } @@ -942,9 +916,7 @@ KeyboardList = CreateKeyboardDriverList(SetupInf); if (KeyboardList == NULL) { - PopupError("Setup failed to load the keyboard type list.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_LOAD_KEYBOARD, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } } @@ -956,9 +928,7 @@ if (LayoutList == NULL) { /* FIXME: report error */ - PopupError("Setup failed to load the keyboard layout list.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_LOAD_KBLAYOUT, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } } @@ -1284,15 +1254,7 @@ if (WarnLinuxPartitions == TRUE && CheckForLinuxFdiskPartitions (PartitionList) == TRUE) { - PopupError ("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", - NULL, POPUP_WAIT_NONE); + MUIDisplayError(ERROR_WARN_PARTITION, NULL, POPUP_WAIT_NONE); while (TRUE) { CONSOLE_ConInKey (Ir); @@ -1382,13 +1344,7 @@ { if (PartitionList->CurrentPartition->Unpartitioned == FALSE) { - PopupError ("You can not create a new Partition inside\n" - "of an already existing Partition!\n" - "\n" - " * Press any key to continue.", - NULL, - Ir, POPUP_WAIT_ANY_KEY); - + MUIDisplayError(ERROR_NEW_PARTITION, Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; } @@ -1398,12 +1354,7 @@ { if (PartitionList->CurrentPartition->Unpartitioned == TRUE) { - PopupError ("You can not delete unpartitioned disk space!\n" - "\n" - " * Press any key to continue.", - NULL, - Ir, POPUP_WAIT_ANY_KEY); - + MUIDisplayError(ERROR_DELETE_SPACE, Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; } @@ -2223,10 +2174,7 @@ if (WritePartitionsToDisk (PartitionList) == FALSE) { DPRINT ("WritePartitionsToDisk() failed\n"); - - PopupError ("Setup failed to write partition tables.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -2476,10 +2424,7 @@ /* Search for 'DefaultPath' in the 'SetupData' section */ if (!SetupFindFirstLineW (SetupInf, L"SetupData", L"DefaultPath", &Context)) { - PopupError("Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_FIND_SETUPDATA, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -2762,9 +2707,7 @@ if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); - PopupError("Setup could not create the install directory.", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_CREATE_INSTALL_DIR, Ir, POPUP_WAIT_ENTER); return(FALSE); } @@ -2773,16 +2716,12 @@ if (!SetupFindFirstLineW(InfFile, L"Directories", NULL, &DirContext)) { if (SourceCabinet) - { - PopupError("Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); - } - else - { - PopupError("Setup failed to find the 'Directories' section\n" - "in TXTSETUP.SIF.\n", "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + { + MUIDisplayError(ERROR_CABINET_SECTION, Ir, POPUP_WAIT_ENTER); + } + else + { + MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER); } return(FALSE); } @@ -2818,9 +2757,7 @@ if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); - PopupError("Setup could not create install directories.", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_CREATE_DIR, Ir, POPUP_WAIT_ENTER); return(FALSE); } } @@ -2849,9 +2786,7 @@ SetupFileQueue = SetupOpenFileQueue(); if (SetupFileQueue == NULL) { - PopupError("Setup failed to open the copy file queue.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_COPY_QUEUE, Ir, POPUP_WAIT_ENTER); return(QUIT_PAGE); } @@ -2891,19 +2826,14 @@ InfFileData = CabinetGetCabinetReservedArea(&InfFileSize); if (InfFileData == NULL) { - PopupError("Cabinet has no setup script.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_CABINET_SCRIPT, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } } else { DPRINT("Cannot open cabinet: %S.\n", CabinetGetCabinetName()); - - PopupError("Cabinet not found.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_CABINET_MISSING, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -2914,9 +2844,7 @@ &ErrorLine); if (InfHandle == INVALID_HANDLE_VALUE) { - PopupError("Cabinet has no valid inf file.\n", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_INVALID_CABINET_INF, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3104,9 +3032,7 @@ if (!SetInstallPathValue(&DestinationPath)) { DPRINT("SetInstallPathValue() failed\n"); - PopupError("Setup failed to set the initialize the registry.", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_INITIALIZE_REGISTRY, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3116,9 +3042,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtInitializeRegistry() failed (Status %lx)\n", Status); - PopupError("Setup failed to create the registry hives.", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_CREATE_HIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } #else @@ -3131,9 +3055,7 @@ if (!SetupFindFirstLineW(SetupInf, L"HiveInfs.Install", NULL, &InfContext)) { DPRINT1("SetupFindFirstLine() failed\n"); - PopupError("Setup failed to find the registry data files.", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_FIND_REGISTRY, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3164,9 +3086,7 @@ { DPRINT("Importing %S failed\n", File); - PopupError("Setup failed to import a hive file.", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_IMPORT_HIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } } @@ -3176,9 +3096,7 @@ CONSOLE_SetStatusText(" Updating display registry settings..."); if (!ProcessDisplayRegistry(SetupInf, DisplayList)) { - PopupError("Setup failed to update display registry settings.", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_UPDATE_DISPLAY_SETTINGS, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3186,9 +3104,7 @@ CONSOLE_SetStatusText(" Updating keyboard layout settings..."); if (!ProcessKeyboardLayoutRegistry(LayoutList)) { - PopupError("Setup failed to update keyboard layout settings.", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3366,9 +3282,7 @@ { if (DoesFileExist(L"\\Device\\Floppy0", L"\\") == FALSE) { - PopupError("No disk in drive A:.", - "ENTER = Continue", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); return BOOT_LOADER_FLOPPY_PAGE; } @@ -3408,9 +3322,7 @@ PartitionType); if (!NT_SUCCESS(Status)) { - PopupError("Setup failed to install the FAT bootcode on the system partition.", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3418,9 +3330,7 @@ } else { - PopupError("failed to install FAT bootcode on the system partition.", - "ENTER = Reboot computer", - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } 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 Sat Dec 15 17:24:02 2007 @@ -696,6 +696,199 @@ }; +MUI_ERROR enUSErrorEntries[] = +{ + { + //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" + }, + { + //ERROR_NO_HDD + "Setup could not find a harddisk.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Setup could not find its source drive.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Setup failed to load the file TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Setup found a corrupt TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_BOOT, + "failed to install FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_COMPUTER, + "Setup failed to load the computer type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_DISPLAY, + "Setup failed to load the display settings list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KEYBOARD, + "Setup failed to load the keyboard type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Setup failed to load the keyboard layout list.\n", + "ENTER = Reboot computer" + }, + { + //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" + }, + { + //ERROR_NEW_PARTITION, + "You can not create a new Partition inside\n" + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "You can not delete unpartitioned disk space!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_FLOPPY, + "No disk in drive A:.", + "ENTER = Continue" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Reboot computer" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to set the initialize the registry.", + "ENTER = Reboot computer" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Reboot computer" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_SETUPDATA, + "Setup failed to find the 'SetupData' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_PTABLE, + "Setup failed to write partition tables.\n" + "ENTER = Reboot computer" + }, + { + NULL, + NULL + } +}; + + MUI_PAGE enUSPages[] = { { 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 Sat Dec 15 17:24:02 2007 @@ -1,4 +1,5 @@ #include "usetup.h" +#include "errorcode.h" #include "mui.h" #include "lang/en-US.h" @@ -133,3 +134,22 @@ index++; }while(entry[index].Buffer != NULL); } + +VOID +MUIDisplayError(ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent) +{ + if (ErrorNum >= ERROR_LAST_ERROR_CODE) + { + PopupError("invalid error number provided", + "press enter to continue", + Ir, + POPUP_WAIT_ENTER); + + return; + } + + PopupError(enUSErrorEntries[ErrorNum].ErrorText, + enUSErrorEntries[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 Sat Dec 15 17:24:02 2007 @@ -21,7 +21,6 @@ MUI_PAGE * MuiPages; }MUI_LANGUAGE; - #define TEXT_NORMAL 0 #define TEXT_HIGHLIGHT 1 #define TEXT_UNDERLINE 2 Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h (original) +++ trunk/reactos/base/setup/usetup/usetup.h Sat Dec 15 17:24:02 2007 @@ -72,7 +72,7 @@ #include "settings.h" #include "host.h" #include "mui.h" - +#include "errorcode.h" extern HANDLE ProcessHeap; extern UNICODE_STRING SourceRootPath;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs