Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[ros-arm-bringup] 32324: Fix comments in ksarm.h -- they must be C89.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 19:32:13 2008 New Revision: 32324 URL: http://svn.reactos.org/svn/reactos?rev=32324&view=rev Log: Fix comments in ksarm.h -- they must be C89. Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Tue Feb 12 19:32:13 2008 @@ -4,6 +4,13 @@ #if __GNUC__ >=3 #pragma GCC system_header #endif + + +// +//Lockdown TLB entries +// +#define PCR_ENTRY, 0 +#define PDR_ENTRY, 2 #define KeArchHaltProcessor() KeArmHaltProcessor() Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h Tue Feb 12 19:32:13 2008 @@ -1,31 +1,25 @@ -// -// CPSR Values -// +/* + * CPSR Values + */ .equ CPSR_IRQ_DISABLE, 0x80 .equ CPSR_FIQ_DISABLE, 0x40 .equ CPSR_THUMB_ENABLE, 0x20 -// -// C1 Register Values -// +/* + * C1 Register Values + */ .equ C1_MMU_CONTROL, 0x01 .equ C1_ALIGNMENT_CONTROL, 0x02 .equ C1_DCACHE_CONTROL, 0x04 .equ C1_ICACHE_CONTROL, 0x1000 .equ C1_VECTOR_CONTROL, 0x2000 -// -// Loader Parameter Block Offsets -// +/* + * Loader Parameter Block Offsets + */ .equ LpbKernelStack, 0x18 -// -// PCR -// +/* + * PCR + */ .equ KiPcr, 0xFFFFF000 - -// -// Lockdown TLB entries -// -.equ PCR_ENTRY 0 -.equ PDR_ENTRY 2

1 0

[ros-arm-bringup] 32323: Write initialization code in assembly -- we load the kernel stack from FreeLDR and jump to C code. We now have a file for C-code initialization (no reason to use assembly). We now have some basic TLB routines and intrinsics (not tested). We also detect if we are running on V4 or V6, and set the TLB and ASID counts respectively.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 19:22:01 2008 New Revision: 32323 URL: http://svn.reactos.org/svn/reactos?rev=32323&view=rev Log: Write initialization code in assembly -- we load the kernel stack from FreeLDR and jump to C code. We now have a file for C-code initialization (no reason to use assembly). We now have some basic TLB routines and intrinsics (not tested). We also detect if we are running on V4 or V6, and set the TLB and ASID counts respectively. Added: trunk/reactos/ntoskrnl/ke/arm/kiinit.c (with props) Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/ke/arm/boot.s trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Tue Feb 12 19:22:01 2008 @@ -26,6 +26,15 @@ { ARM_ID_CODE_REGISTER Value; __asm__ __volatile__ ("mrc p15, 0, %0, c0, c0, 0" : "=r"(Value.AsUlong) : : "cc"); + return Value; +} + +FORCEINLINE +ARM_LOCKDOWN_REGISTER +KeArmLockdownRegisterGet(VOID) +{ + ARM_LOCKDOWN_REGISTER Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c10, c0, 0" : "=r"(Value.AsUlong) : : "cc"); return Value; } @@ -61,4 +70,26 @@ __asm__ __volatile__ ("mcr p15, 0, %0, c3, c0, 0" : : "r"(DomainRegister.AsUlong) : "cc"); } +FORCEINLINE +VOID +KeArmLockdownRegisterSet(IN ARM_LOCKDOWN_REGISTER LockdownRegister) +{ + __asm__ __volatile__ ("mcr p15, 0, %0, c10, c0, 0" : : "r"(LockdownRegister.AsUlong) : "cc"); +} + +FORCEINLINE +VOID +KeArmFlushTlb(VOID) +{ + __asm__ __volatile__ ("mcr p15, 0, %0, c8, c7, 0" : : "r"(0) : "cc"); +} + +FORCEINLINE +VOID +KeArmInvalidateTlbEntry(IN PVOID Address) +{ + __asm__ __volatile__ ("mcr p15, 0, %0, c8, c7, 1" : : "r"(Address) : "cc"); +} + + #endif Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Tue Feb 12 19:22:01 2008 @@ -99,6 +99,18 @@ ULONG AsUlong; } ARM_CACHE_REGISTER, *PARM_CACHE_REGISTER; +typedef union _ARM_LOCKDOWN_REGISTER +{ + struct + { + ULONG Preserve:1; + ULONG Ignored:25; + ULONG Victim:3; + ULONG Reserved:3; + }; + ULONG AsUlong; +} ARM_LOCKDOWN_REGISTER, *PARM_LOCKDOWN_REGISTER; + typedef enum _ARM_DOMAINS { Domain0, Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h Tue Feb 12 19:22:01 2008 @@ -1,9 +1,31 @@ +// +// CPSR Values +// .equ CPSR_IRQ_DISABLE, 0x80 .equ CPSR_FIQ_DISABLE, 0x40 .equ CPSR_THUMB_ENABLE, 0x20 +// +// C1 Register Values +// .equ C1_MMU_CONTROL, 0x01 .equ C1_ALIGNMENT_CONTROL, 0x02 .equ C1_DCACHE_CONTROL, 0x04 .equ C1_ICACHE_CONTROL, 0x1000 .equ C1_VECTOR_CONTROL, 0x2000 + +// +// Loader Parameter Block Offsets +// +.equ LpbKernelStack, 0x18 + +// +// PCR +// +.equ KiPcr, 0xFFFFF000 + +// +// Lockdown TLB entries +// +.equ PCR_ENTRY 0 +.equ PDR_ENTRY 2 Modified: trunk/reactos/ntoskrnl/ke/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/boot.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/boot.s (original) +++ trunk/reactos/ntoskrnl/ke/arm/boot.s Tue Feb 12 19:22:01 2008 @@ -15,8 +15,13 @@ PROLOG_END KiSystemStartup // - // Do stuff! + // Switch to boot kernel stack // - b . + ldr sp, [a2, #LpbKernelStack] + + // + // Go to C code + // + b KiInitializeSystem ENTRY_END KiSystemStartup Added: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c (added) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c Tue Feb 12 19:22:01 2008 @@ -1,0 +1,128 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/arm/kiinit.c + * PURPOSE: Implements the kernel entry point for ARM machines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +BOOLEAN KeIsArmV6; +ULONG KeFixedTbEntries; +ULONG KeNumberProcessIds; +ULONG KeNumberTbEntries; + +#define __ARMV6__ KeIsArmV6 + +/* FUNCTIONS ******************************************************************/ + +VOID +KiFlushSingleTb(IN BOOLEAN Invalid, + IN PVOID Virtual) +{ + // + // Just invalidate it + // + KeArmInvalidateTlbEntry(Virtual); +} + +VOID +KeFillFixedEntryTb(IN ARM_PTE Pte, + IN PVOID Virtual, + IN ULONG Index) +{ + ARM_LOCKDOWN_REGISTER LockdownRegister; + ULONG OldVictimCount; + ULONG Temp; + UNREFERENCED_PARAMETER(Pte); + UNREFERENCED_PARAMETER(Index); + + // + // On ARM, we can't set the index ourselves, so make sure that we are not + // locking down more than 8 entries. + // + KeFixedTbEntries++; + ASSERT(KeFixedTbEntries <= 8); + + // + // Flush the address + // + KiFlushSingleTb(TRUE, Virtual); + + // + // Read lockdown register and set the preserve bit + // + LockdownRegister = KeArmLockdownRegisterGet(); + LockdownRegister.Preserve = TRUE; + OldVictimCount = LockdownRegister.Victim; + KeArmLockdownRegisterSet(LockdownRegister); + + // + // Now force a miss + // + Temp = *(PULONG)Virtual; + + // + // Read lockdown register and clear the preserve bit + // + LockdownRegister = KeArmLockdownRegisterGet(); + LockdownRegister.Preserve = FALSE; + ASSERT(LockdownRegister.Victim == OldVictimCount + 1); + KeArmLockdownRegisterSet(LockdownRegister); +} + +VOID +KeFlushTb(VOID) +{ + // + // Flush the entire TLB + // + KeArmFlushTlb(); +} + +VOID +KiInitializeSystem(IN ULONG Magic, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + // + // Detect ARM version (Architecture 6 is the ARMv5TE-J, go figure!) + // + KeIsArmV6 = KeArmIdCodeRegisterGet().Architecture == 7; + + // + // Set the number of TLB entries and ASIDs + // + KeNumberTbEntries = 64; + if (__ARMV6__) + { + // + // 256 ASIDs on v6/v7 + // + KeNumberProcessIds = 256; + } + else + { + // + // The TLB is VIVT on v4/v5 + // + KeNumberProcessIds = 0; + } + + // + // Flush the TLB + // + KeFlushTb(); + + // + // + // + + while (TRUE); +} Propchange: trunk/reactos/ntoskrnl/ke/arm/kiinit.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/ke/arm/kiinit.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Tue Feb 12 19:22:01 2008 @@ -60,6 +60,7 @@ <if property="ARCH" value="arm"> <directory name="arm"> <file first="true">boot.s</file> + <file>kiinit.c</file> <file>stubs_asm.s</file> <file>stubs.c</file> </directory>

1 0

[dreimer] 32322: Beginnings to allow to translate all other Strings. Translators, PLEEASE wait until I am ready before you file Bugs, you can already start to translate, but do not post Bugreports until I am ready adding the last hidden ones. Thanks to Johannes Anderwald for explaining me why it made more Problems than fix stuff to translate some strings and how to fix it.
by dreimer＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: dreimer Date: Tue Feb 12 17:52:36 2008 New Revision: 32322 URL: http://svn.reactos.org/svn/reactos?rev=32322&view=rev Log: Beginnings to allow to translate all other Strings. Translators, PLEEASE wait until I am ready before you file Bugs, you can already start to translate, but do not post Bugreports until I am ready adding the last hidden ones. Thanks to Johannes Anderwald for explaining me why it made more Problems than fix stuff to translate some strings and how to fix it. Modified: trunk/reactos/base/setup/usetup/chkdsk.c trunk/reactos/base/setup/usetup/format.c trunk/reactos/base/setup/usetup/fslist.c 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/fr-FR.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/chkdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/chkdsk.c… ============================================================================== --- trunk/reactos/base/setup/usetup/chkdsk.c (original) +++ trunk/reactos/base/setup/usetup/chkdsk.c Tue Feb 12 17:52:36 2008 @@ -67,7 +67,7 @@ 10, 24, TRUE, - "Setup is checking your disk"); + MUIGetString(STRING_CHECKINGDISK)); ProgressSetStepCount(ChkdskProgressBar, 100); Modified: trunk/reactos/base/setup/usetup/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/format.c… ============================================================================== --- trunk/reactos/base/setup/usetup/format.c (original) +++ trunk/reactos/base/setup/usetup/format.c Tue Feb 12 17:52:36 2008 @@ -99,7 +99,7 @@ 10, 24, TRUE, - "Setup is formatting your disk"); + MUIGetString(STRING_FORMATTINGDISK)); ProgressSetStepCount(FormatProgressBar, 100); Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c (original) +++ trunk/reactos/base/setup/usetup/fslist.c Tue Feb 12 17:52:36 2008 @@ -163,9 +163,9 @@ if (Item->FileSystem) { if (Item->QuickFormat) - sprintf(Buffer, " Format partition as %S file system (quick format) ", Item->FileSystem); + sprintf(Buffer, MUIGetString(STRING_FORMATDISK1), Item->FileSystem); else - sprintf(Buffer, " Format partition as %S file system ", Item->FileSystem); + sprintf(Buffer, MUIGetString(STRING_FORMATDISK2), Item->FileSystem); } else sprintf(Buffer, " Keep current file system (no changes) "); 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 Tue Feb 12 17:52:36 2008 @@ -686,7 +686,7 @@ UINT ErrorLine; SIZE_T ReturnSize; - CONSOLE_SetStatusText(" Please wait..."); + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); /* Check whether a harddisk is available */ @@ -1024,7 +1024,7 @@ CONSOLE_SetTextXY(25, 13, GetGenericListEntry(KeyboardList)->Text); CONSOLE_SetTextXY(25, 14, GetGenericListEntry(LayoutList)->Text); - CONSOLE_InvertTextXY (24, Line, 48, 1); + CONSOLE_InvertTextXY(24, Line, 48, 1); if (RepairUpdateFlag) { @@ -1038,7 +1038,7 @@ if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - CONSOLE_NormalTextXY (24, Line, 48, 1); + CONSOLE_NormalTextXY(24, Line, 48, 1); if (Line == 14) Line = 16; @@ -1047,12 +1047,12 @@ else Line++; - CONSOLE_InvertTextXY (24, Line, 48, 1); + CONSOLE_InvertTextXY(24, Line, 48, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - CONSOLE_NormalTextXY (24, Line, 48, 1); + CONSOLE_NormalTextXY(24, Line, 48, 1); if (Line == 11) Line = 16; @@ -1061,7 +1061,7 @@ else Line--; - CONSOLE_InvertTextXY (24, Line, 48, 1); + CONSOLE_InvertTextXY(24, Line, 48, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1327,7 +1327,7 @@ while (TRUE) { - CONSOLE_ConInKey (Ir); + CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1370,11 +1370,11 @@ if (PartitionList->CurrentPartition == NULL || PartitionList->CurrentPartition->Unpartitioned == TRUE) { - CONSOLE_SetStatusText (MUIGetString(STRING_INSTALLCREATEPARTITION)); + CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION)); } else { - CONSOLE_SetStatusText (MUIGetString(STRING_INSTALLDELETEPARTITION)); + CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLDELETEPARTITION)); } CONSOLE_ConInKey(Ir); @@ -1523,7 +1523,7 @@ while (TRUE) { - CONSOLE_ConInKey (&Ir); + CONSOLE_ConInKey(&Ir); if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir.Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1604,9 +1604,9 @@ DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition; - CONSOLE_SetStatusText (MUIGetString(STRING_PLEASEWAIT)); - - CONSOLE_SetTextXY (6, 8, MUIGetString(STRING_CHOOSENEWPARTITION)); + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); + + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSENEWPARTITION)); #if 0 if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ @@ -1627,7 +1627,7 @@ if (DiskEntry->DriverName.Length > 0) { - CONSOLE_PrintTextXY (6, 10, + CONSOLE_PrintTextXY(6, 10, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ.", DiskSize, Unit, @@ -1639,7 +1639,7 @@ } else { - CONSOLE_PrintTextXY (6, 10, + CONSOLE_PrintTextXY(6, 10, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu).", DiskSize, Unit, @@ -1649,14 +1649,14 @@ DiskEntry->Id); } - CONSOLE_SetTextXY (6, 12, "Please enter the size of the new partition in megabytes."); + CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); #if 0 - CONSOLE_PrintTextXY (8, 10, "Maximum size of the new partition is %I64u MB", + CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", PartitionList->CurrentPartition->UnpartitionedLength / (1024*1024)); #endif - CONSOLE_SetStatusText (MUIGetString(STRING_CREATEPARTITION)); + CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); PartEntry = PartitionList->CurrentPartition; while (TRUE) @@ -1797,7 +1797,7 @@ if (PartType == NULL) { - CONSOLE_PrintTextXY (6, 10, + CONSOLE_PrintTextXY(6, 10, " %c%c Type %lu %I64u %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', @@ -1807,7 +1807,7 @@ } else { - CONSOLE_PrintTextXY (6, 10, + CONSOLE_PrintTextXY(6, 10, " %c%c %s %I64u %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', @@ -1835,7 +1835,7 @@ if (DiskEntry->DriverName.Length > 0) { - CONSOLE_PrintTextXY (6, 12, + CONSOLE_PrintTextXY(6, 12, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ.", DiskSize, Unit, @@ -1847,7 +1847,7 @@ } else { - CONSOLE_PrintTextXY (6, 12, + CONSOLE_PrintTextXY(6, 12, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu).", DiskSize, Unit, @@ -1859,7 +1859,7 @@ while (TRUE) { - CONSOLE_ConInKey (Ir); + CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1984,23 +1984,23 @@ DiskEntry->Id, &DiskEntry->DriverName); - CONSOLE_SetTextXY(6, 12, "This Partition will be formatted next."); + CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); PartEntry->AutoCreate = FALSE; } else if (PartEntry->New == TRUE) { - CONSOLE_SetTextXY(6, 8, "You chose to install ReactOS on a new or unformatted Partition."); - CONSOLE_SetTextXY(6, 10, "This Partition will be formatted next."); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART)); + CONSOLE_SetTextXY(6, 10, MUIGetString(STRING_PARTFORMAT)); } else { - CONSOLE_SetTextXY(6, 8, "Setup install ReactOS onto Partition"); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART)); if (PartType == NULL) { - CONSOLE_PrintTextXY (8, 10, + CONSOLE_PrintTextXY(8, 10, "%c%c Type %lu %I64u %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', @@ -2010,7 +2010,7 @@ } else { - CONSOLE_PrintTextXY (8, 10, + CONSOLE_PrintTextXY(8, 10, "%c%c %s %I64u %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', @@ -2062,7 +2062,7 @@ while (TRUE) { - CONSOLE_ConInKey (Ir); + CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -2152,7 +2152,7 @@ } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN || IsUnattendedSetup) /* ENTER */ { - CONSOLE_SetStatusText (" Please wait ..."); + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); if (PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED) { @@ -2208,7 +2208,7 @@ CheckActiveBootPartition (PartitionList); #ifndef NDEBUG - CONSOLE_PrintTextXY (6, 12, + CONSOLE_PrintTextXY(6, 12, "Disk: %I64u Cylinder: %I64u Track: %I64u", DiskEntry->DiskSize, DiskEntry->CylinderSize, @@ -2226,7 +2226,7 @@ { for (i = 0; i < 4; i++) { - CONSOLE_PrintTextXY (6, Line, + CONSOLE_PrintTextXY(6, Line, "%2u: %2u %c %12I64u %12I64u %2u %c", i, PartEntry->PartInfo[i].PartitionNumber, @@ -2363,7 +2363,7 @@ } #ifndef NDEBUG - CONSOLE_SetStatusText (" Done. Press any key ..."); + CONSOLE_SetStatusText(" Done. Press any key ..."); CONSOLE_ConInKey(Ir); #endif @@ -2404,9 +2404,9 @@ RtlCreateUnicodeString(&SystemRootPath, PathBuffer); DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); - CONSOLE_SetTextXY(6, 8, "Setup is now checking the selected partition."); - - CONSOLE_SetStatusText(" Please wait..."); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); + + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); /* WRONG: first filesystem is not necesseraly the one of the current partition! */ CurrentFileSystem = CONTAINING_RECORD(FileSystemList->ListHead.Flink, FILE_SYSTEM_ITEM, ListEntry); @@ -2421,7 +2421,7 @@ CurrentFileSystem->FileSystem); PopupError(Buffer, - "F3= Quit ENTER = Continue", + MUIGetString(STRING_QUITCONTINUE), NULL, POPUP_WAIT_NONE); while(TRUE) @@ -2452,7 +2452,7 @@ "(Status 0x%08lx).\n", Status); PopupError(Buffer, - "ENTER = Reboot computer", + MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; @@ -2605,8 +2605,8 @@ if (!SetupFindFirstLineW (InfFile, SectionName, NULL, &FilesContext)) { char Buffer[128]; - sprintf(Buffer, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n", SectionName); - PopupError(Buffer, "ENTER = Reboot computer", Ir, POPUP_WAIT_ENTER); + sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); + PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); return(FALSE); } @@ -2682,8 +2682,8 @@ if (!SetupFindFirstLineW (InfFile, SectionName, NULL, &FilesContext)) { char Buffer[128]; - sprintf(Buffer, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n", SectionName); - PopupError(Buffer, "ENTER = Reboot computer", Ir, POPUP_WAIT_ENTER); + sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); + PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); return FALSE; } @@ -3131,7 +3131,7 @@ #endif /* Update registry */ - CONSOLE_SetStatusText(" Updating registry hives..."); + CONSOLE_SetStatusText(MUIGetString(STRING_REGHIVEUPDATE)); if (!SetupFindFirstLineW(SetupInf, L"HiveInfs.Install", NULL, &InfContext)) { @@ -3161,7 +3161,7 @@ continue; } - CONSOLE_SetStatusText(" Importing %S...", File); + CONSOLE_SetStatusText(MUIGetString(STRING_IMPORTFILE), File); if (!ImportRegistryFile(File, Section, Delete)) { @@ -3173,7 +3173,7 @@ } while (SetupFindNextLine (&InfContext, &InfContext)); /* Update display registry settings */ - CONSOLE_SetStatusText(" Updating display registry settings..."); + CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYETTINGSUPDATE)); if (!ProcessDisplayRegistry(SetupInf, DisplayList)) { MUIDisplayError(ERROR_UPDATE_DISPLAY_SETTINGS, Ir, POPUP_WAIT_ENTER); @@ -3181,7 +3181,7 @@ } /* Set the locale */ - CONSOLE_SetStatusText(" Updating locale settings..."); + CONSOLE_SetStatusText(MUIGetString(STRING_LOCALESETTINGSUPDATE)); if (!ProcessLocaleRegistry(LanguageList)) { MUIDisplayError(ERROR_UPDATE_LOCALESETTINGS, Ir, POPUP_WAIT_ENTER); @@ -3189,7 +3189,7 @@ } /* Update keyboard layout settings */ - CONSOLE_SetStatusText(" Updating keyboard layout settings..."); + CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); if (!ProcessKeyboardLayoutRegistry(LayoutList)) { MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); @@ -3197,7 +3197,7 @@ } /* Add codepage information to registry */ - CONSOLE_SetStatusText(" Adding codepage information to registry..."); + CONSOLE_SetStatusText(MUIGetString(STRING_CODEPAGEINFOUPDATE)); if (!AddCodePage()) { MUIDisplayError(ERROR_ADDING_CODEPAGE, Ir, POPUP_WAIT_ENTER); @@ -3207,7 +3207,7 @@ /* Update the mounted devices list */ SetMountedDeviceValues(PartitionList); - CONSOLE_SetStatusText(" Done..."); + CONSOLE_SetStatusText(MUIGetString(STRING_DONE)); return BOOT_LOADER_PAGE; } @@ -3220,7 +3220,7 @@ BOOLEAN InstallOnFloppy; USHORT Line = 12; - CONSOLE_SetStatusText(" Please wait..."); + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); PartitionType = PartitionList->ActiveBootPartition->PartInfo[0].PartitionType; @@ -3286,7 +3286,7 @@ } MUIDisplayPage(BOOT_LOADER_PAGE); - CONSOLE_InvertTextXY (8, Line, 60, 1); + CONSOLE_InvertTextXY(8, Line, 60, 1); while(TRUE) { @@ -3295,24 +3295,24 @@ if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - CONSOLE_NormalTextXY (8, Line, 60, 1); + CONSOLE_NormalTextXY(8, Line, 60, 1); Line++; if (Line<12) Line=14; if (Line>14) Line=12; - CONSOLE_InvertTextXY (8, Line, 60, 1); + CONSOLE_InvertTextXY(8, Line, 60, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - CONSOLE_NormalTextXY (8, Line, 60, 1); + CONSOLE_NormalTextXY(8, Line, 60, 1); Line--; if (Line<12) Line=14; if (Line>14) Line=12; - CONSOLE_InvertTextXY (8, Line, 60, 1); + CONSOLE_InvertTextXY(8, Line, 60, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -3478,7 +3478,7 @@ LanguageList = NULL; } - CONSOLE_SetStatusText(" ENTER = Reboot computer"); + CONSOLE_SetStatusText(MUIGetString(STRING_REBOOTCOMPUTER2)); while(TRUE) { @@ -3541,9 +3541,9 @@ if (!CONSOLE_Init()) { - PrintString("Unable to open the console\n\n"); - PrintString("The most common cause of this is using an USB keyboard\n"); - PrintString("USB keyboards are not fully supported yet\n"); + PrintString(MUIGetString(STRING_CONSOLEFAIL1)); + PrintString(MUIGetString(STRING_CONSOLEFAIL2)); + PrintString(MUIGetString(STRING_CONSOLEFAIL3)); /* Raise a hard error (crash the system/BSOD) */ NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 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 Tue Feb 12 17:52:36 2008 @@ -1253,13 +1253,13 @@ { 6, 8, - "Setup is updating the system configuration. ", - TEXT_NORMAL - }, - { - 0, - 0, - " Creating registry hives...", + "Setup aktualisiert die Systemkonfiguration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Registry Hives erstellen...", TEXT_STATUS }, { @@ -1576,28 +1576,74 @@ MUI_STRING deDEStrings[] = { + {STRING_PLEASEWAIT, + " Bitte warten..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Installieren C = Partition erstellen F3 = Beenden"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installieren D = Partition lschen F3 = Beenden"}, {STRING_PARTITIONSIZE, "Gráe der neuen Partition:"}, - {STRING_PLEASEWAIT, - " Bitte warten..."}, {STRING_CHOOSENEWPARTITION, "Sie haben beschlossen eine neue Partition zu erstellen auf"}, + {STRING_HDDSIZE, + "Bitte geben Sie die Gráe der neuen Partition in Megabyte ein."}, {STRING_CREATEPARTITION, " ENTER = Partition erstellen ESC = Abbruch F3 = Beenden"}, + {STRING_PARTFORMAT, + "Diese Partition wird als nchstes formatiert."}, + {STRING_NONFORMATTEDPART, + "Sie wollen ReactOS auf einer neuen/unformatieren Partition installieren."}, + {STRING_INSTALLONPART, + "Setup installiert ReactOS auf diese Partition"}, + {STRING_CHECKINGPART, + "Setup berprft die ausgewhlte Partition."}, + {STRING_QUITCONTINUE, + "F3 = Beenden ENTER = Fortsetzen"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Computer neustarten"}, + {STRING_TXTSETUPFAILED, + "Setup konnte die '%S' Sektion\nin TXTSETUP.SIF nicht finden.\n"}, {STRING_COPYING, " \xB3 Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, {STRING_PAGEDMEM, - "Paged Memory"}, + "Ausgel. Speicher"}, {STRING_NONPAGEDMEM, - "Nonpaged Memory"}, + "Nicht ausgel. Speicher"}, {STRING_FREEMEM, - "Free Memory"}, + "Freier Speicher"}, + {STRING_REGHIVEUPDATE, + " Registry hives werden aktualisiert..."}, + {STRING_IMPORTFILE, + " Importiere %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Bildschirm-Registryeinstellungen werden aktualisiert..."}, + {STRING_LOCALESETTINGSUPDATE, + " Lokalisierungseinstellungen werden aktualisiert..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Tastaturlayout Einstellungen werden aktualisiert..."}, + {STRING_CODEPAGEINFOUPDATE, + " Codepage Informationen werden hinzugefgt..."}, + {STRING_DONE, + " Fertig..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Computer neustarten"}, + {STRING_CONSOLEFAIL1, + "Konsole konnte nicht geffnet werden\n\n"}, + {STRING_CONSOLEFAIL2, + "Der hufigste Grund hierfr ist die Verwendung einer USB Tastautur\n"}, + {STRING_CONSOLEFAIL3, + "USB Tastaturen werden noch nicht vollstndig untersttzt\n"}, + {STRING_FORMATTINGDISK, + "Setup formatiert Ihre Festplatte"}, + {STRING_CHECKINGDISK, + "Setup überprüft Ihre Festplatte"}, + {STRING_FORMATDISK1, + " Formatiere Partition als %S Dateisystem (Schnell) "}, + {STRING_FORMATDISK2, + " Formatiere Partition als %S Dateisystem "}, {0, 0} }; 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 Tue Feb 12 17:52:36 2008 @@ -1570,18 +1570,34 @@ MUI_STRING enUSStrings[] = { + {STRING_PLEASEWAIT, + " Please wait..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Install C = Create Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Install D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Size of new partition:"}, - {STRING_PLEASEWAIT, - " Please wait..."}, {STRING_CHOOSENEWPARTITION, "You have chosen to create a new partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1592,6 +1608,36 @@ "Nonpaged Memory"}, {STRING_FREEMEM, "Free Memory"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Tue Feb 12 17:52:36 2008 @@ -1582,18 +1582,34 @@ MUI_STRING frFRStrings[] = { + {STRING_PLEASEWAIT, + " Veuillez patienter..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Installer C = Créer Partition F3 = Quitter"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installer D = Supprimer Partition F3 = Quitter"}, {STRING_PARTITIONSIZE, "Taille de la nouvelle partition :"}, - {STRING_PLEASEWAIT, - " Veuillez patienter..."}, {STRING_CHOOSENEWPARTITION, "Vous avez choisi de créer une nouvelle partition sur"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Créer Partition ESC = Annuler F3 = Quitter"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1604,6 +1620,36 @@ "Mémoire non paginée"}, {STRING_FREEMEM, "Mémoire libre"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Tue Feb 12 17:52:36 2008 @@ -1578,18 +1578,34 @@ MUI_STRING plPLStrings[] = { + {STRING_PLEASEWAIT, + " Prosz© czeka..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Instalacja C = Utworzenie Partycji F3 = Wyjcie"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalacja D = Skasowanie Partycji F3 = Wyjcie"}, {STRING_PARTITIONSIZE, "Rozmiar nowej partycji:"}, - {STRING_PLEASEWAIT, - " Prosz© czeka..."}, {STRING_CHOOSENEWPARTITION, "Wybrane: utworzenie nowej partycji na"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Utworzenie Partycji ESC = Anulowanie F3 = Wyjcie"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 Kopiowanie plik¢w: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1600,6 +1616,36 @@ "Niestronicowanej"}, {STRING_FREEMEM, "Dost©pnej"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, {0, 0} }; 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 Tue Feb 12 17:52:36 2008 @@ -1570,18 +1570,34 @@ MUI_STRING ruRUStrings[] = { + {STRING_PLEASEWAIT, + " ®¦ «ã©áâ , ¯®¤®¦¤¨â¥..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = áâ ®¢¨âì C = ®§¤ âì à §¤¥« F3 = ëå®¤"}, {STRING_INSTALLDELETEPARTITION, " ENTER = áâ ®¢¨âì D = ¤ «¨âì à §¤¥« F3 = ëå®¤"}, {STRING_PARTITIONSIZE, " §¬¥à ®¢®£® à §¤¥« :"}, - {STRING_PLEASEWAIT, - " ®¦ «ã©áâ , ¯®¤®¦¤¨â¥..."}, {STRING_CHOOSENEWPARTITION, "ë å®â¨â¥ á®§¤ âì ®¢ë© à §¤¥« "}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = ®§¤ âì à §¤¥« ESC = â¬¥ F3 = ëå®¤"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 ®¯¨à®¢ ¨¥: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1592,6 +1608,36 @@ " ¥áâà ¨ç ï"}, {STRING_FREEMEM, "¢®¡®¤ ï ¯ ¬ïâì"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Tue Feb 12 17:52:36 2008 @@ -1575,18 +1575,34 @@ MUI_STRING skSKStrings[] = { + {STRING_PLEASEWAIT, + " Pokajte, pros¡m ..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Inçtalova C = Vytvori oblas F3 = Skoni"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Inçtalova D = Odstr ni oblas F3 = Skoni"}, {STRING_PARTITIONSIZE, "Vekos novej oblasti:"}, - {STRING_PLEASEWAIT, - " Pokajte, pros¡m ..."}, {STRING_CHOOSENEWPARTITION, "Zvolili Ste vytvorenie novej oblasti na"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Vytvori oblas ESC = Zruçi F3 = Skoni"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 Kop¡ruje sa s£bor: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1597,6 +1613,36 @@ "Nestr nkovan pam"}, {STRING_FREEMEM, "Von pam"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, {0, 0} }; 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 Tue Feb 12 17:52:36 2008 @@ -84,6 +84,31 @@ IN PINPUT_RECORD Ir, IN ULONG WaitEvent); +static +ULONG +FindLanguageIndex() +{ + ULONG lngIndex = 0; + + if (SelectedLanguageId == NULL) + { + return -1; + } + + do + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + return lngIndex; + } + + lngIndex++; + }while (LanguageList[lngIndex].MuiPages != NULL); + + return -1; +} + + static const MUI_ENTRY * FindMUIEntriesOfPage(IN ULONG PageNumber) @@ -145,6 +170,15 @@ FindMUIStringEntries(VOID) { ULONG lngIndex = 0; + + if (SelectedLanguageId == NULL) + { + /* language has not yet been selected + * default to english + */ + ASSERT(!_wcsicmp(LanguageList[lngIndex].LanguageDescriptor, L"English")); + return LanguageList[lngIndex].MuiStrings; + } do { @@ -261,6 +295,7 @@ { ULONG i; const MUI_STRING * entry; + CHAR szErr[100]; entry = FindMUIStringEntries(); if (entry) @@ -274,7 +309,9 @@ } } - PopupError("Error: Failed to find translated string", + sprintf(szErr, "Error: failed find string id %lu for language index %lu\n", Number, FindLanguageIndex()); + + PopupError(szErr, NULL, NULL, POPUP_WAIT_NONE); 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 Tue Feb 12 17:52:36 2008 @@ -69,17 +69,39 @@ LPSTR MUIGetString(ULONG Number); -#define STRING_INSTALLCREATEPARTITION 1 -#define STRING_INSTALLDELETEPARTITION 2 -#define STRING_CREATEPARTITION 3 +#define STRING_PLEASEWAIT 1 +#define STRING_INSTALLCREATEPARTITION 2 +#define STRING_INSTALLDELETEPARTITION 3 #define STRING_PARTITIONSIZE 4 -#define STRING_PLEASEWAIT 5 -#define STRING_CHOOSENEWPARTITION 6 -#define STRING_COPYING 7 -#define STRING_SETUPCOPYINGFILES 8 -#define STRING_PAGEDMEM 9 -#define STRING_NONPAGEDMEM 10 -#define STRING_FREEMEM 11 - +#define STRING_CHOOSENEWPARTITION 5 +#define STRING_HDDSIZE 6 +#define STRING_CREATEPARTITION 7 +#define STRING_PARTFORMAT 8 +#define STRING_NONFORMATTEDPART 9 +#define STRING_INSTALLONPART 10 +#define STRING_CHECKINGPART 11 +#define STRING_QUITCONTINUE 12 +#define STRING_REBOOTCOMPUTER 13 +#define STRING_TXTSETUPFAILED 14 +#define STRING_COPYING 15 +#define STRING_SETUPCOPYINGFILES 16 +#define STRING_PAGEDMEM 17 +#define STRING_NONPAGEDMEM 18 +#define STRING_FREEMEM 19 +#define STRING_REGHIVEUPDATE 20 +#define STRING_IMPORTFILE 21 +#define STRING_DISPLAYETTINGSUPDATE 22 +#define STRING_LOCALESETTINGSUPDATE 23 +#define STRING_KEYBOARDSETTINGSUPDATE 24 +#define STRING_CODEPAGEINFOUPDATE 25 +#define STRING_DONE 26 +#define STRING_REBOOTCOMPUTER2 27 +#define STRING_CONSOLEFAIL1 28 +#define STRING_CONSOLEFAIL2 29 +#define STRING_CONSOLEFAIL3 30 +#define STRING_FORMATTINGDISK 31 +#define STRING_CHECKINGDISK 32 +#define STRING_FORMATDISK1 33 +#define STRING_FORMATDISK2 34 #endif

1 0

[fireball] 32321: - Kernel's entrypoint is called NtProcessStartup right now, for ReactOS. If this is to be changed, it should be changed for all archs, not only for ARM.
by fireball＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: fireball Date: Tue Feb 12 16:34:33 2008 New Revision: 32321 URL: http://svn.reactos.org/svn/reactos?rev=32321&view=rev Log: - Kernel's entrypoint is called NtProcessStartup right now, for ReactOS. If this is to be changed, it should be changed for all archs, not only for ARM. Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Tue Feb 12 16:34:33 2008 @@ -1033,7 +1033,7 @@ switch ( type ) { case Kernel: - return "KiSystemStartup"; + return "NtProcessStartup"; case KernelModeDLL: case KernelModeDriver: return "DriverEntry@8";

1 0

[janderwald] 32320: - pass the correct path to _strip_gcc_deffile - automatically create directories for converted def files - fixes auto-def file generation
by janderwald＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: janderwald Date: Tue Feb 12 15:18:23 2008 New Revision: 32320 URL: http://svn.reactos.org/svn/reactos?rev=32320&view=rev Log: - pass the correct path to _strip_gcc_deffile - automatically create directories for converted def files - fixes auto-def file generation Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Tue Feb 12 15:18:23 2008 @@ -272,7 +272,7 @@ // don't do the work m_configurations.size() times if (module.importLibrary != NULL) { - intermediatedir = intdir + "\\" + module.output->relative_path + vcdir; + intermediatedir = module.output->relative_path + vcdir; importLib = _strip_gcc_deffile(module.importLibrary->source->name, module.importLibrary->source->relative_path, intermediatedir); } @@ -848,11 +848,14 @@ std::string MSVCBackend::_strip_gcc_deffile(std::string Filename, std::string sourcedir, std::string objdir) { - std::string NewFilename = objdir + "\\" + Filename; + std::string NewFilename = Environment::GetIntermediatePath () + "\\" + objdir + "\\" + Filename; // we don't like infinite loops - so replace it in two steps NewFilename = _replace_str(NewFilename, ".def", "_msvc.de"); NewFilename = _replace_str(NewFilename, "_msvc.de", "_msvc.def"); Filename = sourcedir + "\\" + Filename; + + Directory dir(objdir); + dir.GenerateTree(IntermediateDirectory, false); std::fstream in_file(Filename.c_str(), std::ios::in); std::fstream out_file(NewFilename.c_str(), std::ios::out);

1 0

[hpoussin] 32319: Fix assertion is pci/fdo.c
by hpoussin＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: hpoussin Date: Tue Feb 12 14:16:05 2008 New Revision: 32319 URL: http://svn.reactos.org/svn/reactos?rev=32319&view=rev Log: Fix assertion is pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c (original) +++ trunk/reactos/drivers/bus/pci/pdo.c Tue Feb 12 14:16:05 2008 @@ -410,8 +410,8 @@ RtlZeroMemory(ResourceList, ListSize); ResourceList->ListSize = ListSize; ResourceList->InterfaceType = PCIBus; - ResourceList->BusNumber = DeviceExtension->PciDevice->BusNumber; - ResourceList->SlotNumber = DeviceExtension->PciDevice->SlotNumber.u.AsULONG; + ResourceList->BusNumber = 0; + ResourceList->SlotNumber = 0; ResourceList->AlternativeLists = 1; ResourceList->List[0].Version = 1; @@ -591,6 +591,7 @@ Descriptor->Type = CmResourceTypeBusNumber; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceList->BusNumber = Descriptor->u.BusNumber.MinBusNumber = Descriptor->u.BusNumber.MaxBusNumber = DeviceExtension->PciDevice->PciConfig.u.type1.SecondaryBus; Descriptor->u.BusNumber.Length = 1; @@ -712,7 +713,7 @@ RtlZeroMemory(ResourceList, ListSize); ResourceList->Count = 1; ResourceList->List[0].InterfaceType = PCIBus; - ResourceList->List[0].BusNumber = DeviceExtension->PciDevice->BusNumber; + ResourceList->List[0].BusNumber = 0; PartialList = &ResourceList->List[0].PartialResourceList; PartialList->Version = 1; @@ -820,6 +821,7 @@ Descriptor->Type = CmResourceTypeBusNumber; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceList->List[0].BusNumber = Descriptor->u.BusNumber.Start = DeviceExtension->PciDevice->PciConfig.u.type1.SecondaryBus; Descriptor->u.BusNumber.Length = 1; Descriptor->u.BusNumber.Reserved = 0;

1 0

[ros-arm-bringup] 32318: We now define the cache and id registers in CP15 (C0 Opcode 0 and 1). We now setup ARM cache information in the loader block. We now allocate the kernel, interrupt and abort stacks, as well as the idle thread and process, and boot PRCB. We now allocate the PCR and PDR pages. We now send the command line to the kernel in the LoaderBlock's load options.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 12:41:21 2008 New Revision: 32318 URL: http://svn.reactos.org/svn/reactos?rev=32318&view=rev Log: We now define the cache and id registers in CP15 (C0 Opcode 0 and 1). We now setup ARM cache information in the loader block. We now allocate the kernel, interrupt and abort stacks, as well as the idle thread and process, and boot PRCB. We now allocate the PCR and PDR pages. We now send the command line to the kernel in the LoaderBlock's load options. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Tue Feb 12 12:41:21 2008 @@ -20,6 +20,32 @@ LOADER_PARAMETER_EXTENSION ArmExtension; extern ARM_TRANSLATION_TABLE ArmTranslationTable; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; + +ULONG SizeBits[] = +{ + -1, // INVALID + -1, // INVALID + 1 << 12, // 4KB + 1 << 13, // 8KB + 1 << 14, // 16KB + 1 << 15, // 32KB + 1 << 16, // 64KB + 1 << 17 // 128KB +}; + +ULONG AssocBits[] = +{ + -1, // INVALID + -1, // INVALID + 4 // 4-way associative +}; + +ULONG LenBits[] = +{ + -1, // INVALID + -1, // INVALID + 8 // 8 words per line (32 bytes) +}; /* FUNCTIONS ******************************************************************/ @@ -115,6 +141,9 @@ VOID ArmPrepareForReactOS(IN BOOLEAN Setup) { + ARM_CACHE_REGISTER CacheReg; + PVOID Base; + // // Initialize the loader block // @@ -153,8 +182,63 @@ // // - // TODO: Setup ARM-specific block - // + // Send the command line + // + ArmLoaderBlock.LoadOptions = reactos_kernel_cmdline; + + // + // Setup cache information + // + CacheReg = KeArmCacheRegisterGet(); + ArmLoaderBlock.u.Arm.FirstLevelDcacheSize = SizeBits[CacheReg.DSize]; + ArmLoaderBlock.u.Arm.FirstLevelDcacheFillSize = LenBits[CacheReg.DLength]; + ArmLoaderBlock.u.Arm.FirstLevelDcacheFillSize <<= 2; + ArmLoaderBlock.u.Arm.FirstLevelIcacheSize = SizeBits[CacheReg.ISize]; + ArmLoaderBlock.u.Arm.FirstLevelIcacheFillSize = LenBits[CacheReg.ILength]; + ArmLoaderBlock.u.Arm.FirstLevelIcacheFillSize <<= 2; + ArmLoaderBlock.u.Arm.SecondLevelDcacheSize = + ArmLoaderBlock.u.Arm.SecondLevelDcacheFillSize = + ArmLoaderBlock.u.Arm.SecondLevelIcacheSize = + ArmLoaderBlock.u.Arm.SecondLevelIcacheFillSize = 0; + + // + // Allocate the Interrupt stack + // + Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupDpcStack); + ArmLoaderBlock.u.Arm.InterruptStack = KSEG0_BASE | (ULONG)Base; + + // + // Allocate the Kernel Boot stack + // + Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupKernelStack); + ArmLoaderBlock.KernelStack = KSEG0_BASE | (ULONG)Base; + + // + // Allocate the Abort stack + // + Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupPanicStack); + ArmLoaderBlock.u.Arm.PanicStack = KSEG0_BASE | (ULONG)Base; + + // + // Allocate the PCRs (1MB each for now!) + // + Base = MmAllocateMemoryWithType(2 * 1024 * 1024, LoaderStartupPcrPage); + ArmLoaderBlock.u.Arm.PcrPage = (ULONG)Base >> TTB_SHIFT; + ArmLoaderBlock.u.Arm.PcrPage2 = ArmLoaderBlock.u.Arm.PcrPage + 1; + + // + // Allocate PDR pages + // + Base = MmAllocateMemoryWithType(3 * 1024 * 1024, LoaderStartupPdrPage); + ArmLoaderBlock.u.Arm.PdrPage = (ULONG)Base >> TTB_SHIFT; + + // + // Set initial PRCB, Thread and Process on the last PDR page + // + Base = (PVOID)((ULONG)Base + 2 * 1024 * 1024); + ArmLoaderBlock.Prcb = KSEG0_BASE | (ULONG)Base; + ArmLoaderBlock.Process = ArmLoaderBlock.Prcb + sizeof(KPRCB); + ArmLoaderBlock.Thread = ArmLoaderBlock.Process + sizeof(EPROCESS); } VOID @@ -176,5 +260,6 @@ // // Initialize paging and load NTOSKRNL // + TuiPrintf("Kernel Command Line: %s\n", ArmLoaderBlock.LoadOptions); ArmSetupPagingAndJump(Magic); } Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Tue Feb 12 12:41:21 2008 @@ -21,6 +21,26 @@ } FORCEINLINE +ARM_ID_CODE_REGISTER +KeArmIdCodeRegisterGet(VOID) +{ + ARM_ID_CODE_REGISTER Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c0, c0, 0" : "=r"(Value.AsUlong) : : "cc"); + return Value; +} + + +FORCEINLINE +ARM_CACHE_REGISTER +KeArmCacheRegisterGet(VOID) +{ + ARM_CACHE_REGISTER Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c0, c0, 1" : "=r"(Value.AsUlong) : : "cc"); + return Value; +} + + +FORCEINLINE VOID KeArmControlRegisterSet(IN ARM_CONTROL_REGISTER ControlRegister) { Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Tue Feb 12 12:41:21 2008 @@ -65,6 +65,40 @@ ULONG AsUlong; } ARM_CONTROL_REGISTER, *PARM_CONTROL_REGISTER; +typedef union _ARM_ID_CODE_REGISTER +{ + struct + { + ULONG Revision:4; + ULONG PartNumber:12; + ULONG Architecture:4; + ULONG Variant:4; + ULONG Identifier:8; + }; + ULONG AsUlong; +} ARM_ID_CODE_REGISTER, *PARM_ID_CODE_REGISTER; + +typedef union _ARM_CACHE_REGISTER +{ + struct + { + ULONG ILength:2; + ULONG IMultipler:1; + ULONG IAssociativty:3; + ULONG ISize:4; + ULONG IReserved:2; + ULONG DLength:2; + ULONG DMultipler:1; + ULONG DAssociativty:3; + ULONG DSize:4; + ULONG DReserved:2; + ULONG Separate:1; + ULONG CType:4; + ULONG Reserved:3; + }; + ULONG AsUlong; +} ARM_CACHE_REGISTER, *PARM_CACHE_REGISTER; + typedef enum _ARM_DOMAINS { Domain0,

1 0

[dreimer] 32317: Bug 3053: some slovak translations by Mario Kacmar, kario@szm.sk Bug 3051: Italian resources update by Paolo Devoti, devotip@tiscali.it
by dreimer＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: dreimer Date: Tue Feb 12 11:44:41 2008 New Revision: 32317 URL: http://svn.reactos.org/svn/reactos?rev=32317&view=rev Log: Bug 3053: some slovak translations by Mario Kacmar, kario(a)szm.sk Bug 3051: Italian resources update by Paolo Devoti, devotip(a)tiscali.it Added: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc (with props) trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc (with props) trunk/reactos/dll/win32/user32/lang/it-IT.rc (with props) Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/setupapi/setupapi.rc trunk/reactos/dll/win32/user32/user32.rc Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Tue Feb 12 11:44:41 2008 @@ -584,7 +584,7 @@ { 0, 0, - "Svuotando la cache", + "Svuotamento della cache in corso", TEXT_STATUS }, { @@ -1579,3 +1579,4 @@ + Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc Tue Feb 12 11:44:41 2008 @@ -10,7 +10,7 @@ CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 - LTEXT "Seleziona un immagine da usare come sfondo per il tuo desktop:", + LTEXT "Selezionare un immagine da usare come sfondo per il tuo desktop:", IDC_STATIC, 8, 103, 180, 9 PUSHBUTTON "&Esplora...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 PUSHBUTTON "&Colore...", IDC_COLOR_BUTTON, 188, 177, 50, 15 @@ -99,7 +99,7 @@ CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + LTEXT "Trascinare le icone dei monitor in modo corrispondente alla disposizione fisica dei vostri monitor.",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Schermo:",1820,3,100,30,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 @@ -122,14 +122,14 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size:", -1, 14, 20, 222, 8 + LTEXT "Dimensione font:", -1, 14, 20, 222, 8 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 - GROUPBOX "Compatibility", -1, 7, 67, 237, 97 - LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 - AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 - AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 + GROUPBOX "Compatibilità", -1, 7, 67, 237, 97 + LTEXT "Alcuni programmi funzionano in modo irregolare se non riavviate il computer dopo una modifica delle impostazioni dei colori.\r\n\nDopo la modifica delle impostazioni dei colori:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Riavviare il computer prima di applicare le nuove impostazioni dei colori.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Applicare le nuove impostazioni dei colori senza riavviare.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Chiedere prima di applicare le nuove impostazioni dei colori.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU @@ -143,7 +143,7 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Colegato", ID_MENU_ATTACHED + MENUITEM "&Collegato", ID_MENU_ATTACHED MENUITEM "&Primario", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identifica", ID_MENU_IDENTIFY Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc Tue Feb 12 11:44:41 2008 @@ -9,16 +9,16 @@ BEGIN GROUPBOX "Ripetizione caratteri", -1, 5, 5, 230, 130 ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 - LTEXT "Ritardo della ripetizione", -1, 40, 15, 50, 10 + LTEXT "Ritardo della ripetizione", -1, 40, 15, 150, 10 LTEXT "Lungo", -1, 40, 30, 20, 10 LTEXT "Corto", -1, 200, 30, 20, 10 CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 - LTEXT "&Frequenza ripetizione", -1, 40, 70, 50, 10 - LTEXT "Lenta", -1, 40, 85, 20, 10 - LTEXT "Veloce", -1, 200, 85, 20, 10 - CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 - LTEXT "Clicca qui e tieni premuto un tasto per provare la frequenza di ripetizione:", -1, 15, 105, 150, 10 + LTEXT "&Frequenza ripetizione", -1, 40, 60, 150, 10 + LTEXT "Lenta", -1, 40, 75, 20, 10 + LTEXT "Veloce", -1, 200, 75, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 75, 130, 17 + LTEXT "Clicca qui e tieni premuto un tasto per provare la frequenza di ripetizione:", -1, 15, 105, 200, 20 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Frequenza di lampeggio del Cursore:", -1, 5, 145, 230, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 @@ -59,7 +59,7 @@ LTEXT "Assegna al tasto destro del mouse le funzioni principali come ad esempio la selezione e il trascinamento", -1, 10, 30, 150, 30 GROUPBOX "Velocità del doppio clic", -1, 5, 75, 230, 70 LTEXT "Fai doppio clic sulla cartella per verificare le impostazioni. Se la cartella non si apre o chiude, prova a usare una velocità minore.", -1, 10, 85, 150, 30 - LTEXT "Velocità: Lenta", -1, 10, 120, 90, 8 + LTEXT "Velocità: Lenta", -1, 10, 120, 90, 8 LTEXT "Veloce", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc Tue Feb 12 11:44:41 2008 @@ -48,19 +48,19 @@ BEGIN GROUPBOX "Riproduzione suoni", -1, 7,7,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,20,32,32 - LTEXT "&Dispositivo preimpostato:",-1,50,20,80,17 + LTEXT "&Dispositivo preimpostato:",-1,50,20,180,17 COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85,47,70,15 PUSHBUTTON "Ava&zate...", IDC_ADV2_BTN, 160,47,70,15 GROUPBOX "Registrazione dei suoni", -1, 7,75,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,88,32,32 - LTEXT "D&ispositivo preimpostato:",-1,50,88,80,17 + LTEXT "D&ispositivo preimpostato:",-1,50,88,180,17 COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "V&olume...", IDC_VOLUME2_BTN, 85,115,70,15 PUSHBUTTON "Avaza&te...", IDC_ADV1_BTN, 160,115,70,15 GROUPBOX "Riproduzione musica MIDI", -1, 7,145,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,158,32,32 - LTEXT "D&ispositivo preimpostato:",-1,50,158,80,17 + LTEXT "D&ispositivo preimpostato:",-1,50,158,180,17 COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "Volu&me...", IDC_VOLUME3_BTN, 85,185,70,15 PUSHBUTTON "Informazioni su...", IDC_ADV3_BTN, 160,185,70,15 @@ -75,13 +75,13 @@ LTEXT "Queste impostazioni controllano il volume e le impostazioni avanzate della riproduzione e della registrazione vocale per il dispositivo selezionato.",-1,8,7,230,40 GROUPBOX "Riproduzione vocale", -1, 7,37,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,50,32,32 - LTEXT "D&ispositivo preimpostato:",-1,50,50,80,17 + LTEXT "D&ispositivo preimpostato:",-1,50,50,180,17 COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85,77,70,15 PUSHBUTTON "&Avanzate...", IDC_ADV4_BTN, 160,77,70,15 GROUPBOX "Registrazione vocale", -1, 7,105,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,118,32,32 - LTEXT "&Dispositivo preimpostato:",-1,50,118,80,17 + LTEXT "&Dispositivo preimpostato:",-1,50,118,180,17 COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85,145,70,15 PUSHBUTTON "Ava&nzate...", IDC_ADV5_BTN, 160,145,70,15 @@ -98,135 +98,135 @@ IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Save Scheme As" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Save this sound scheme as:", -1, 7, 7, 212, 9 +CAPTION "Salvare schema come" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Salvare questo schema di suoni come:", -1, 7, 7, 212, 9 EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 93, 36, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 157, 36, 60, 14 + PUSHBUTTON "Annulla", IDCANCEL, 157, 36, 60, 14 END IDD_SPEAKERS DIALOG 0, 0, 257, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Speakers" +CAPTION "Altoparlanti" FONT 8, "MS Shell Dlg" BEGIN ICON 4379, -1, 7, 8, 20, 20 - LTEXT "Select the speaker setup that is most like the setup you have on your computer.", -1, 36, 8, 215, 27 + LTEXT "Selezionare l'assetto degli altoparlanti che assomiglia maggiormenta a quello del vostro computer.", -1, 36, 8, 215, 27 CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT - LTEXT "S&peaker setup:", 8502, 53, 169, 55, 10 + LTEXT "&Assetto degli altoparlanti:", 8502, 53, 169, 55, 10 COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END IDD_PERFORMANCE1 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These settings control how ReactOS plays audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 218, 23 - GROUPBOX "Audio playback", 8494, 7, 32, 243, 152 +CAPTION "Prestazioni" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Queste impostazioni controllano come viene riprodotto il suono da ReactOS. Possono aiutare a individuare problemi relativi all'audio.", 8492, 34, 7, 218, 23 + GROUPBOX "Riproduzione audio", 8494, 7, 32, 243, 152 ICON 4379, 8512, 8, 8, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 56, 111, 14 + LTEXT "Accelerazione &Hardware:", 8495, 13, 56, 111, 14 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 54, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 123, 103, 14 + LTEXT "&Qualita della conversione dei campionamenti:", 8496, 13, 123, 103, 14 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 7, 191, 110, 14 - LTEXT "None", 8497, 128, 56, 21, 10 - LTEXT "Full", 8498, 214, 56, 21, 9 - LTEXT "Good", 8499, 128, 123, 21, 10 - LTEXT "Best", 8500, 214, 123, 23, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 145, 227, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 78, 227, 22 + PUSHBUTTON "&Ripristinare i valori predefiniti", 5400, 7, 191, 110, 14 + LTEXT "Nessuno", 8497, 128, 56, 21, 10 + LTEXT "Completo", 8498, 214, 56, 21, 9 + LTEXT "Buono", 8499, 128, 123, 21, 10 + LTEXT "Ottimo", 8500, 214, 123, 23, 9 + LTEXT "Questa stringa descrive le impostazioni hardware per il dispositivo di registrazione", 5399, 13, 145, 227, 21 + LTEXT "Questa stringa descrive le impostazioni hardware per il dispositivo di riproduzione", 5398, 13, 78, 227, 22 END IDD_PERFORMANCE2 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These settings control how ReactOS records audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 217, 20 - GROUPBOX "Audio recording", 8494, 7, 29, 242, 122 +CAPTION "Prestazioni" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Queste impostazioni controllano come viene registrato il suono da ReactOS. Possono aiutare a individuare problemi relativi all'audio.", 8492, 34, 7, 217, 20 + GROUPBOX "Registrazione audio", 8494, 7, 29, 242, 122 ICON 4380, 8512, 8, 7, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 46, 103, 17 + LTEXT "Accelerazione &Hardware:", 8495, 13, 46, 103, 17 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 103, 103, 17 + LTEXT "&Qualita della conversione dei campionamenti:", 8496, 13, 103, 103, 17 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 9, 158, 110, 14 - LTEXT "None", 8497, 125, 46, 24, 10 - LTEXT "Full", 8498, 217, 46, 19, 9 - LTEXT "Good", 8499, 125, 103, 24, 10 - LTEXT "Best", 8500, 217, 103, 19, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 125, 222, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 68, 218, 24 + PUSHBUTTON "&Ripristinare i valori predefiniti", 5400, 9, 158, 110, 14 + LTEXT "Nessuno", 8497, 125, 46, 24, 10 + LTEXT "Completo", 8498, 217, 46, 19, 9 + LTEXT "Buono", 8499, 125, 103, 24, 10 + LTEXT "Ottimo", 8500, 217, 103, 19, 9 + LTEXT "Questa stringa descrive le impostazioni hardware per il dispositivo di registrazione", 5399, 13, 145, 227, 21 + LTEXT "Questa stringa descrive le impostazioni hardware per il dispositivo di riproduzione", 5398, 13, 78, 227, 22 END IDD_SETUP1 DIALOG 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Setup" +CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ReactOS Audio", 10243, 7, 5, 213, 192 ICON 4393, 10241, 26, 26, 20, 20 - LTEXT "This computer cannot play audio because the ReactOS Audio service is not enabled.", 10245, 60, 25, 150, 40 - AUTOCHECKBOX "&Enable ReactOS Audio", 10253, 60, 68, 150, 9 - LTEXT "Notes", 10246, 58, 87, 150, 11 - LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40 - LTEXT "2. After you enable ReactOS Audio you will have to restart the computer.", 10248, 60, 140, 150, 40 + LTEXT "Questo computer non può riprodurre l'audio perchè il servizio ReactOS Audio non è abilitato.", 10245, 60, 25, 150, 40 + AUTOCHECKBOX "&Abilitare ReactOS Audio", 10253, 60, 68, 150, 9 + LTEXT "Note", 10246, 58, 87, 150, 11 + LTEXT "1. Dovete essere un amministratore per abilitare questo servizio. Se non lo siete vi sarà richiesto un nome utente e password di un amministratore.", 10247, 60, 100, 150, 40 + LTEXT "2. Dopo aver abilitato ReactOS Audio dovrete riavviare il computer.", 10248, 60, 140, 150, 40 END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Multichannel" +CAPTION "Multicanale" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 - LTEXT "Low", 9473, 65, 31, 14, 8 + LTEXT "Basso", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 - LTEXT "High", 9474, 202, 31, 17, 8 - LTEXT "Low", 9477, 65, 50, 14, 8 + LTEXT "Alto", 9474, 202, 31, 17, 8 + LTEXT "Basso", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 - LTEXT "High", 9478, 202, 50, 17, 8 - LTEXT "Low", 9481, 65, 69, 14, 8 + LTEXT "Alto", 9478, 202, 50, 17, 8 + LTEXT "Basso", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 - LTEXT "High", 9482, 202, 69, 17, 8 - LTEXT "Low", 9485, 65, 88, 14, 8 + LTEXT "Alto", 9482, 202, 69, 17, 8 + LTEXT "Basso", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 - LTEXT "High", 9486, 202, 88, 17, 8 - LTEXT "Low", 9489, 65, 107, 14, 8 + LTEXT "Alto", 9486, 202, 88, 17, 8 + LTEXT "Basso", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 - LTEXT "High", 9490, 202, 107, 17, 8 - LTEXT "Low", 9493, 65, 126, 14, 8 + LTEXT "Alto", 9490, 202, 107, 17, 8 + LTEXT "Basso", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 - LTEXT "High", 9494, 202, 126, 17, 8 - LTEXT "Low", 9497, 65, 145, 14, 8 + LTEXT "Alto", 9494, 202, 126, 17, 8 + LTEXT "Basso", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 - LTEXT "High", 9498, 202, 145, 17, 8 - LTEXT "Low", 9501, 65, 164, 14, 8 + LTEXT "Alto", 9498, 202, 145, 17, 8 + LTEXT "Basso", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 - LTEXT "High", 9502, 202, 164, 17, 8 - AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 - PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 + LTEXT "Alto", 9502, 202, 164, 17, 8 + AUTOCHECKBOX "&Muovere tutti i cursori contemporaneamente", 9504, 5, 185, 216, 9 + PUSHBUTTON "&Ripristinare i valori predefiniti", 9505, 110, 199, 110, 14 END IDD_SETUP2 DIALOG 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Setup" +CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ReactOS Audio", 10259, 7, 5, 213, 192 ICON 4394, 10257, 25, 25, 20, 20 - LTEXT "The ReactOS Audio service is now enabled. However, audio may not function properly until you restart ReactOS. If you want to restart now, first save your work and close all programs.", 10261, 60, 25, 150, 50 - LTEXT "To restart ReactOS, click OK.", 10262, 60, 75, 150, 20 - LTEXT "If you Cancel, you will need to restart later for ReactOS Audio to function properly.", 10263, 60, 100, 150, 40 + LTEXT "Il servizio ReactOS Audio è abilitato. Comunque, l'audio potrebbe non funzionare correttamente fino al riavvio di ReactOS. Se volte riavviare ora, salvate il vostro lavoro e chiudete tutti i programmi.", 10261, 60, 25, 150, 50 + LTEXT "Per riavviare ReactOS, cliccare OK.", 10262, 60, 75, 150, 20 + LTEXT "Se cliccherete Annulla, sarà necessario riavviare successivamente perchè ReactOS Audio funzioni corettamente.", 10263, 60, 100, 150, 40 END STRINGTABLE @@ -235,33 +235,33 @@ IDS_CPLDESCRIPTION "Cambia lo schema dei suoni per il tuo computer o configura le impostazioni per gli altoparlanti e i dispositivi di registrazione." IDS_NO_SOUND "(None)" - 5825 "Program error" - 5826 "Close program" - 5827 "Critical Battery Alarm" - 5828 "Device Connect" - 5829 "Device Disconnect" - 5830 "Device Failed to Connect" - 5831 "Empty Recycle Bin" - 5832 "Low Battery Alarm" - 5833 "Maximize" - 5834 "Menu command" + 5825 "Errore del programma" + 5826 "Chiudere il programma" + 5827 "Allarme di batteria critica" + 5828 "Connessione del dispositivo" + 5829 "Disconnessione del dispositivo" + 5830 "Fallimento della connessione del dispositivo" + 5831 "Svuotare cestino" + 5832 "Allarme di batteria bassa" + 5833 "Massimizzare" + 5834 "Menu comandi" 5835 "Menu popup" - 5836 "Minimize" - 5837 "New Mail Notification" - 5838 "Start Navigation" - 5839 "Open program" - 5840 "Print Complete" - 5841 "Restore Down" - 5842 "Restore Up" - 5843 "Asterisk" - 5844 "Default sound" - 5845 "Exclamation" - 5846 "Exit ReactOS" - 5847 "Critical Stop" - 5848 "System Notification" - 5849 "Question" - 5850 "Start ReactOS" - 5851 "Start Menu" - 5852 "ReactOS Logoff" - 5853 "ReactOS Logon" -END + 5836 "Minimizzare" + 5837 "Notifica nuova email" + 5838 "Iniziare avigazione" + 5839 "Aprire programma" + 5840 "Stama completata" + 5841 "Ripristinare giù" + 5842 "Ripristinare su" + 5843 "Asterisco" + 5844 "Suono predefinito" + 5845 "Esclamazione" + 5846 "Uscire da ReactOS" + 5847 "Arresto critico" + 5848 "Notifica del sistema" + 5849 "Domanda" + 5850 "Avvio ReactOS" + 5851 "Menu avvio" + 5852 "Fine sessione di ReactOS" + 5853 "Inizio sessione di ReactOS" +END Added: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc Tue Feb 12 11:44:41 2008 @@ -1,0 +1,60 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 09-02-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Poèkajte, prosím ..." +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0,0,186,59 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Vitajte v systéme ReactOS" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + LTEXT "Stlaète kombináciu kláves Control-Alt-Delete",IDC_STATIC,16,18,144,14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Prihlásenie" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Zrui",IDCANCEL,115,122,50,14 + PUSHBUTTON "Vypnú",IDC_SHUTDOWN,179,122,50,14 + LTEXT "Meno pouívate¾a:",IDC_STATIC,36,75,40,8 + LTEXT "Heslo:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,261,51 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "Bezpeènos" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + PUSHBUTTON "Zrui",IDCANCEL,170,95,70,14 + PUSHBUTTON "Odhlási",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Vypnú",IDC_SHUTDOWN,170,76,70,14 + LTEXT "Èo chcete urobi?",IDC_STATIC,86,53,87,8 + PUSHBUTTON "Uzamknú poèítaè",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Správca úloh",IDC_TASKMGR,90,95,70,14 + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "Vitajte!" + IDS_LOCKEDSAS "Poèítaè je práve uzamknutý." + IDS_PRESSCTRLALTDELETE "Stlaète Control+Alt+Delete pre prihlásenie." + IDS_ASKFORUSER "Meno pouívate¾a: " + IDS_ASKFORPASSWORD "Heslo: " + IDS_FORCELOGOFF "Toto spôsobí odhlásenie aktuálneho pouívate¾a a stratu vetkých neuloených údajov. Chcete pokraèova?" +END Propchange: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc Tue Feb 12 11:44:41 2008 @@ -18,5 +18,6 @@ #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/es-ES.rc" Added: trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc Tue Feb 12 11:44:41 2008 @@ -1,0 +1,24 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 10-02-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopírujú sa súbory ..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Zrui", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Zdroj:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Cie¾:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUERY_REBOOT_TEXT "Pre dokonèenie intalácie je potrebné retartova poèítaè. Chcete pokraèova?" + IDS_QUERY_REBOOT_CAPTION "Retartova" +END Propchange: trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rc (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rc Tue Feb 12 11:44:41 2008 @@ -42,6 +42,7 @@ #include "lang/pl-PL.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/tr-TR.rc" Added: trunk/reactos/dll/win32/user32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/user32/lang/it-IT.rc (added) +++ trunk/reactos/dll/win32/user32/lang/it-IT.rc Tue Feb 12 11:44:41 2008 @@ -1,0 +1,75 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +///////////////////////////////////////////////////////////////////////////// +// +// Dialogs +// + +SELWINDOW DIALOGEX DISCARDABLE 20, 20, 220, 140 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Finestra di selezione" +BEGIN + LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Annulla", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +///////////////////////////////////////////////////////////////////////////// +// +// Menus +// + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Undo", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "&Taglia", WM_CUT + MENUITEM "&Copia", WM_COPY + MENUITEM "&Incolla", WM_PASTE + MENUITEM "&Rimuovi", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "&Seleziona tutto", EM_SETSEL + END +END + + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +BEGIN + MENUITEM "&Ripristina", 61728 + MENUITEM "&Muove", 61456 + MENUITEM "&Dimensione", 61440 + MENUITEM "Mi&nimizza", 61472 + MENUITEM "Ma&ssimizza", 61488 + MENUITEM SEPARATOR + MENUITEM "&Chiudi\tAlt-F4", 61536 +END + +///////////////////////////////////////////////////////////////////////////// +// +// Strings +// + +STRINGTABLE +BEGIN + IDS_ERROR, "Errore" + IDS_OK, "OK" + IDS_CANCEL, "Annulla" + IDS_ABORT, "&Interrompi" + IDS_RETRY, "&Riprova" + IDS_IGNORE, "&Ignora" + IDS_YES, "&Si" + IDS_NO, "&No" + IDS_HELP, "Aiuto" + IDS_TRYAGAIN, "&Prova ancora" + IDS_CONTINUE, "&Continua" +END + +STRINGTABLE +BEGIN + IDS_MDI_MOREWINDOWS, "&Altre finestre..." +END + Propchange: trunk/reactos/dll/win32/user32/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rc (original) +++ trunk/reactos/dll/win32/user32/user32.rc Tue Feb 12 11:44:41 2008 @@ -99,3 +99,4 @@ #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" +#include "lang/it-IT.rc"

1 0

[ros-arm-bringup] 32316: Real fix, this time, hopefully.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 09:51:39 2008 New Revision: 32316 URL: http://svn.reactos.org/svn/reactos?rev=32316&view=rev Log: Real fix, this time, hopefully. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Tue Feb 12 09:51:39 2008 @@ -44,6 +44,8 @@ #define FRAME_EDITED 0xFFF8 #ifndef __ASM__ + +#include "intrin_i.h" #define KeArchFnInit() Ke386FnInit() #define KeArchHaltProcessor() Ke386HaltProcessor()

1 0

[ros-arm-bringup] 32315: Fix for x86 build.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 09:38:41 2008 New Revision: 32315 URL: http://svn.reactos.org/svn/reactos?rev=32315&view=rev Log: Fix for x86 build. Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Tue Feb 12 09:38:41 2008 @@ -41,5 +41,4 @@ __asm__ __volatile__ ("mcr p15, 0, %0, c3, c0, 0" : : "r"(DomainRegister.AsUlong) : "cc"); } -#define KeArchHaltProcessor KeArmHaltProcessor #endif Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Tue Feb 12 09:38:41 2008 @@ -4,6 +4,8 @@ #if __GNUC__ >=3 #pragma GCC system_header #endif + +#define KeArchHaltProcessor() KeArmHaltProcessor() typedef union _ARM_TTB_REGISTER { Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Tue Feb 12 09:38:41 2008 @@ -410,9 +410,6 @@ #error Unknown compiler for inline assembler #endif -#define KeArchFnInit() Ke386FnInit() -#define KeArchHaltProcessor() Ke386HaltProcessor() - #endif /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Tue Feb 12 09:38:41 2008 @@ -44,6 +44,9 @@ #define FRAME_EDITED 0xFFF8 #ifndef __ASM__ + +#define KeArchFnInit() Ke386FnInit() +#define KeArchHaltProcessor() Ke386HaltProcessor() extern ULONG Ke386CacheAlignment;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
46
Older →

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