Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 32328: Fixed some bugs in KeFillFixedEntryTb -- we actually needed to map the PTE into memory (then we can umap it). We were doing the initial PCR/PDR page allocation completely wrong since we're using 1MB section pages, not 4KB pages (this needs to be fixed later). Piggyhack arm_kprintf on top of DebugService which we now define. DPRINT1 and ASSERT now work! Send ARC paths and normalized command-line in the loader parameter block. Current state: FreeLoader v3.0 for ARM Bootarg
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 21:34:33 2008 New Revision: 32328 URL: http://svn.reactos.org/svn/reactos?rev=32328&view=rev Log: Fixed some bugs in KeFillFixedEntryTb -- we actually needed to map the PTE into memory (then we can umap it). We were doing the initial PCR/PDR page allocation completely wrong since we're using 1MB section pages, not 4KB pages (this needs to be fixed later). Piggyhack arm_kprintf on top of DebugService which we now define. DPRINT1 and ASSERT now work! Send ARC paths and normalized command-line in the loader parameter block. Current state: FreeLoader v3.0 for ARM Bootargs: rdbase=0x2000000 rdsize=0x1400000 Detecting Hardware... Loading... Reading NTOSKRNL.EXE Reading BOOTVID.DLL Reading HAL.DLL Reading HAL.DLL Reading c_1252.nls Reading c_437.nls Reading l_intl.nls Reading scsiport.sys Reading atapi.sys Reading buslogic.sys Reading pci.sys Reading class2.sys Reading disk.sys Reading vfatfs.sys Reading ndis.sys Mapped serial port to 0xc00f1000 (ntoskrnl/ke/arm/kiinit.c:135) ----------------------------------------------------- (ntoskrnl/ke/arm/kiinit.c:136) ReactOS 0.4-SVN (Build 20080207-r32151) (ntoskrnl/ke/arm/kiinit.c:137) Command Line: DEBUG DEBUGPORT=COM1 BAUDRATE=115200 SOS (ntoskrnl/ke/arm/kiinit.c:138) ARC Paths: ramdisk(0) \ ramdisk(0) \ReactOS\ Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s 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 21:34:33 2008 @@ -17,6 +17,11 @@ ULONG PageDirectoryStart, PageDirectoryEnd; LOADER_PARAMETER_BLOCK ArmLoaderBlock; +CHAR ArmCommandLine[256]; +CHAR ArmArcBootPath[64]; +CHAR ArmArcHalPath[64]; +CHAR ArmNtHalPath[64]; +CHAR ArmNtBootPath[64]; LOADER_PARAMETER_EXTENSION ArmExtension; extern ARM_TRANSLATION_TABLE ArmTranslationTable; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; @@ -142,8 +147,13 @@ ControlRegister.ICacheEnabled = TRUE; ControlRegister.DCacheEnabled = TRUE; KeArmControlRegisterSet(ControlRegister); - - ArmBoardBlock->UartRegisterBase = UART_VIRTUAL | (ArmBoardBlock->UartRegisterBase & ((1<<TTB_SHIFT)-1)); + + // + // Reconfigure UART0 + // + ArmBoardBlock->UartRegisterBase = UART_VIRTUAL | + (ArmBoardBlock->UartRegisterBase & + ((1 << TTB_SHIFT) - 1)); TuiPrintf("Mapped serial port to 0x%x\n", ArmBoardBlock->UartRegisterBase); // @@ -157,7 +167,8 @@ { ARM_CACHE_REGISTER CacheReg; PVOID Base; - + PCHAR BootPath, HalPath; + // // Initialize the loader block // @@ -196,10 +207,48 @@ // // - // Send the command line - // - ArmLoaderBlock.LoadOptions = reactos_kernel_cmdline; - + // Make a copy of the command line + // + ArmLoaderBlock.LoadOptions = ArmCommandLine; + strcpy(ArmCommandLine, reactos_kernel_cmdline); + + // + // Find the first \, separating the ARC path from NT path + // + BootPath = strchr(ArmCommandLine, '\\'); + *BootPath = ANSI_NULL; + + // + // Set the ARC Boot Path + // + strncpy(ArmArcBootPath, ArmCommandLine, 63); + ArmLoaderBlock.ArcBootDeviceName = ArmArcBootPath; + + // + // The rest of the string is the NT path + // + HalPath = strchr(BootPath + 1, ' '); + *HalPath = ANSI_NULL; + ArmNtBootPath[0] = '\\'; + strncat(ArmNtBootPath, BootPath + 1, 63); + strcat(ArmNtBootPath,"\\"); + ArmLoaderBlock.NtBootPathName = ArmNtBootPath; + + // + // Set the HAL paths + // + strncpy(ArmArcHalPath, ArmArcBootPath, 63); + ArmLoaderBlock.ArcHalDeviceName = ArmArcHalPath; + strcpy(ArmNtHalPath, "\\"); + ArmLoaderBlock.NtHalPathName = ArmNtHalPath; + + /* Use this new command line */ + strncpy(ArmLoaderBlock.LoadOptions, HalPath + 2, 255); + + /* Parse it and change every slash to a space */ + BootPath = ArmLoaderBlock.LoadOptions; + do {if (*BootPath == '/') *BootPath = ' ';} while (*BootPath++); + // // Setup cache information // @@ -234,16 +283,17 @@ ArmLoaderBlock.u.Arm.PanicStack = KSEG0_BASE | (ULONG)Base; // - // Allocate the PCRs (1MB each for now!) + // Allocate the PCR page -- align it to 1MB (we only need 4KB) // Base = MmAllocateMemoryWithType(2 * 1024 * 1024, LoaderStartupPcrPage); + Base = (PVOID)ROUND_UP(Base, 1 * 1024 * 1024); ArmLoaderBlock.u.Arm.PcrPage = (ULONG)Base >> TTB_SHIFT; - ArmLoaderBlock.u.Arm.PcrPage2 = ArmLoaderBlock.u.Arm.PcrPage + 1; - - // - // Allocate PDR pages - // - Base = MmAllocateMemoryWithType(3 * 1024 * 1024, LoaderStartupPdrPage); + + // + // Allocate PDR pages -- align them to 1MB (we only need 3xKB) + // + Base = MmAllocateMemoryWithType(4 * 1024 * 1024, LoaderStartupPdrPage); + Base = (PVOID)ROUND_UP(Base, 1 * 1024 * 1024); ArmLoaderBlock.u.Arm.PdrPage = (ULONG)Base >> TTB_SHIFT; // @@ -274,6 +324,5 @@ // // Initialize paging and load NTOSKRNL // - TuiPrintf("Kernel Command Line: %s\n", ArmLoaderBlock.LoadOptions); ArmSetupPagingAndJump(Magic); } Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h (original) +++ trunk/reactos/include/reactos/armddk.h Tue Feb 12 21:34:33 2008 @@ -46,7 +46,7 @@ { ULONG MinorVersion; ULONG MajorVersion; - PKINTERRUPT_ROUTINE InterruptRoutine[64]; + PKINTERRUPT_ROUTINE InterruptRoutine[16]; PVOID XcodeDispatch; ULONG FirstLevelDcacheSize; ULONG FirstLevelDcacheFillSize; @@ -71,6 +71,7 @@ PVOID DataBusError; PVOID InstructionBusError; ULONG CachePolicy; + ULONG AlignedCachePolicy; UCHAR IrqlMask[64]; UCHAR IrqlTable[64]; UCHAR CurrentIrql; 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 21:34:33 2008 @@ -38,6 +38,14 @@ return Value; } +FORCEINLINE +ARM_TTB_REGISTER +KeArmTranslationTableRegisterGet(VOID) +{ + ARM_TTB_REGISTER Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c2, c0, 0" : "=r"(Value.AsUlong) : : "cc"); + return Value; +} FORCEINLINE ARM_CACHE_REGISTER 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 21:34:33 2008 @@ -9,8 +9,8 @@ // //Lockdown TLB entries // -#define PCR_ENTRY, 0 -#define PDR_ENTRY, 2 +#define PCR_ENTRY 0 +#define PDR_ENTRY 2 #define KeArchHaltProcessor() KeArmHaltProcessor() Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c Tue Feb 12 21:34:33 2008 @@ -12,8 +12,6 @@ #define NDEBUG #include <debug.h> -void arm_kprintf(const char *fmt, ...); - /* GLOBALS ********************************************************************/ BOOLEAN KeIsArmV6; @@ -23,7 +21,25 @@ #define __ARMV6__ KeIsArmV6 +// +// METAFIXME: We need to stop using 1MB Section Entry TTEs! +// + /* FUNCTIONS ******************************************************************/ + +VOID +DebugService(IN ULONG ServiceType, + IN PCHAR Buffer, + IN ULONG Length, + IN ULONG Component, + IN ULONG Level) +{ + // + // ARM Bring-up Hack + // + void arm_kprintf(const char *fmt, ...); + arm_kprintf("%s", Buffer); +} VOID KiFlushSingleTb(IN BOOLEAN Invalid, @@ -42,14 +58,19 @@ { ARM_LOCKDOWN_REGISTER LockdownRegister; ULONG OldVictimCount; - ULONG Temp; - UNREFERENCED_PARAMETER(Pte); - UNREFERENCED_PARAMETER(Index); + volatile unsigned long Temp; + PARM_TRANSLATION_TABLE TranslationTable; + + // + // Hack for 1MB Section Entries + // + Virtual = (PVOID)((ULONG)Virtual & 0xFFF00000); // // On ARM, we can't set the index ourselves, so make sure that we are not // locking down more than 8 entries. // + UNREFERENCED_PARAMETER(Index); KeFixedTbEntries++; ASSERT(KeFixedTbEntries <= 8); @@ -67,6 +88,12 @@ KeArmLockdownRegisterSet(LockdownRegister); // + // Map the PTE for this virtual address + // + TranslationTable = (PVOID)KeArmTranslationTableRegisterGet().AsUlong; + TranslationTable->Pte[(ULONG)Virtual >> TTB_SHIFT] = Pte; + + // // Now force a miss // Temp = *(PULONG)Virtual; @@ -78,6 +105,11 @@ LockdownRegister.Preserve = FALSE; ASSERT(LockdownRegister.Victim == OldVictimCount + 1); KeArmLockdownRegisterSet(LockdownRegister); + + // + // Clear the PTE + // + TranslationTable->Pte[(ULONG)Virtual >> TTB_SHIFT].AsUlong = 0; } VOID @@ -93,7 +125,16 @@ KiInitializeSystem(IN ULONG Magic, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - arm_kprintf("%s:%i\n", __func__, __LINE__); + ARM_PTE Pte; + PKPCR Pcr; + DPRINT1("-----------------------------------------------------\n"); + DPRINT1("ReactOS-ARM "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); + DPRINT1("Command Line: %s\n", LoaderBlock->LoadOptions); + DPRINT1("ARC Paths: %s %s %s %s\n", LoaderBlock->ArcBootDeviceName, + LoaderBlock->NtHalPathName, + LoaderBlock->ArcHalDeviceName, + LoaderBlock->NtBootPathName); + // // Detect ARM version (Architecture 6 is the ARMv5TE-J, go figure!) // @@ -124,8 +165,33 @@ KeFlushTb(); // + // Build the KIPCR pte // + Pte.L1.Section.Type = SectionPte; + Pte.L1.Section.Buffered = FALSE; + Pte.L1.Section.Cached = FALSE; + Pte.L1.Section.Reserved = 1; // ARM926EJ-S manual recommends setting to 1 + Pte.L1.Section.Domain = Domain0; + Pte.L1.Section.Access = SupervisorAccess; + Pte.L1.Section.BaseAddress = LoaderBlock->u.Arm.PcrPage; + Pte.L1.Section.Ignored = Pte.L1.Section.Ignored1 = 0; + // + // Map it into kernel address space by locking it into the TLB + // + KeFillFixedEntryTb(Pte, (PVOID)KIPCR, PCR_ENTRY); + // + // Now map the PCR into user address space as well (read-only) + // + Pte.L1.Section.Access = SharedAccess; + KeFillFixedEntryTb(Pte, (PVOID)USPCR, PCR_ENTRY + 1); + + // + // Now we should be able to use the PCR... set the cache policies + // + Pcr = (PKPCR)KeGetPcr(); + Pcr->CachePolicy = 0; + Pcr->AlignedCachePolicy = 0; while (TRUE); } Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Tue Feb 12 21:34:33 2008 @@ -146,7 +146,6 @@ GENERATE_ARM_STUB RtlpGetExceptionAddress GENERATE_ARM_STUB RtlDispatchException GENERATE_ARM_STUB DebugService2 -GENERATE_ARM_STUB DebugService GENERATE_ARM_STUB KdPortPutByteEx GENERATE_ARM_STUB KdPortInitializeEx GENERATE_ARM_STUB KdpGdbStubInit

1 0

[ros-arm-bringup] 32327: Added arm_kprintf() for early kernel debugging (ARM bringup). Freeldr maps the "Versatile"'s serial port into virtual memory now, and C code can just use arm_kprintf(). This is not code that is supposed to remain in the kernel, it's only needed for bringup, until enough is working so that standard serial DbgPrint() works through the original code path.
by ros-arm-bringup＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 20:45:58 2008 New Revision: 32327 URL: http://svn.reactos.org/svn/reactos?rev=32327&view=rev Log: Added arm_kprintf() for early kernel debugging (ARM bringup). Freeldr maps the "Versatile"'s serial port into virtual memory now, and C code can just use arm_kprintf(). This is not code that is supposed to remain in the kernel, it's only needed for bringup, until enough is working so that standard serial DbgPrint() works through the original code path. Added: trunk/reactos/drivers/base/kdcom/kdcom_arm.def (with props) trunk/reactos/drivers/base/kdcom/kdcom_i386.def - copied unchanged from r32324, trunk/reactos/drivers/base/kdcom/kdcom.def trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c (with props) Removed: trunk/reactos/drivers/base/kdcom/kdcom.def Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/drivers/base/kdcom/kdbg.c trunk/reactos/drivers/base/kdcom/kdcom.rbuild trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild 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 20:45:58 2008 @@ -46,6 +46,11 @@ -1, // INVALID 8 // 8 words per line (32 bytes) }; + +// +// Where to map the serial port +// +#define UART_VIRTUAL 0xC0000000 /* FUNCTIONS ******************************************************************/ @@ -116,6 +121,12 @@ // Pte.L1.Section.BaseAddress = 0; TranslationTable->Pte[0] = Pte; + + // + // Map the page in MMIO space that contains the serial port into virtual memory + // + Pte.L1.Section.BaseAddress = ArmBoardBlock->UartRegisterBase >> TTB_SHIFT; + TranslationTable->Pte[UART_VIRTUAL >> TTB_SHIFT] = Pte; } VOID @@ -132,6 +143,9 @@ ControlRegister.DCacheEnabled = TRUE; KeArmControlRegisterSet(ControlRegister); + ArmBoardBlock->UartRegisterBase = UART_VIRTUAL | (ArmBoardBlock->UartRegisterBase & ((1<<TTB_SHIFT)-1)); + TuiPrintf("Mapped serial port to 0x%x\n", ArmBoardBlock->UartRegisterBase); + // // Jump to Kernel // Modified: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c (original) +++ trunk/reactos/drivers/base/kdcom/kdbg.c Tue Feb 12 20:45:58 2008 @@ -18,6 +18,7 @@ #include "arc/arc.h" #include "windbgkd.h" #include <kddll.h> +#include <ioaccess.h> /* port intrinsics */ typedef struct _KD_PORT_INFORMATION { Removed: trunk/reactos/drivers/base/kdcom/kdcom.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.d… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.def (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.def (removed) @@ -1,24 +1,0 @@ -LIBRARY kdcom.dll -EXPORTS - -; Old KD -KdPortGetByte@4 -KdPortGetByteEx@8 -KdPortInitialize@12 -KdPortInitializeEx@12 -KdPortPollByte@4 -KdPortPollByteEx@8 -KdPortPutByte@4 -KdPortPutByteEx@8 -KdPortRestore@0 -KdPortSave@0 -KdPortDisableInterrupts@0 -KdPortEnableInterrupts@0 - -; New KD -KdDebuggerInitialize0@4 -KdDebuggerInitialize1@4 -KdSave@4 -KdRestore@4 -KdReceivePacket@20 -KdSendPacket@16 Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild Tue Feb 12 20:45:58 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> - <importlibrary definition="kdcom.def"></importlibrary> + <importlibrary definition="kdcom_$(ARCH).def"></importlibrary> <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" /> <include base="kdcom">.</include> <library>ntoskrnl</library> Added: trunk/reactos/drivers/base/kdcom/kdcom_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom_a… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom_arm.def (added) +++ trunk/reactos/drivers/base/kdcom/kdcom_arm.def Tue Feb 12 20:45:58 2008 @@ -1,0 +1,24 @@ +LIBRARY kdcom.dll +EXPORTS + +; Old KD +KdPortGetByte +KdPortGetByteEx +KdPortInitialize +KdPortInitializeEx +KdPortPollByte +KdPortPollByteEx +KdPortPutByte +KdPortPutByteEx +KdPortRestore +KdPortSave +KdPortDisableInterrupts +KdPortEnableInterrupts + +; New KD +KdDebuggerInitialize0 +KdDebuggerInitialize1 +KdSave +KdRestore +KdReceivePacket +KdSendPacket Propchange: trunk/reactos/drivers/base/kdcom/kdcom_arm.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/base/kdcom/kdcom_arm.def ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/arm_kprint… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c (added) +++ trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c Tue Feb 12 20:45:58 2008 @@ -1,0 +1,84 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/arm/arm_kprintf.c + * PURPOSE: Early serial printf-style kernel debugging (ARM bringup) + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +// +// UART Registers +// +#define UART_BASE (void*)0xc00f1000 /* HACK: freeldr mapped it here */ + +#define UART_PL01x_DR (UART_BASE + 0x00) +#define UART_PL01x_RSR (UART_BASE + 0x04) +#define UART_PL01x_ECR (UART_BASE + 0x04) +#define UART_PL01x_FR (UART_BASE + 0x18) +#define UART_PL011_IBRD (UART_BASE + 0x24) +#define UART_PL011_FBRD (UART_BASE + 0x28) +#define UART_PL011_LCRH (UART_BASE + 0x2C) +#define UART_PL011_CR (UART_BASE + 0x30) +#define UART_PL011_IMSC (UART_BASE + 0x38) + +// +// LCR Values +// +#define UART_PL011_LCRH_WLEN_8 0x60 +#define UART_PL011_LCRH_FEN 0x10 + +// +// FCR Values +// +#define UART_PL011_CR_UARTEN 0x01 +#define UART_PL011_CR_TXE 0x100 +#define UART_PL011_CR_RXE 0x200 + +// +// LSR Values +// +#define UART_PL01x_FR_RXFE 0x10 +#define UART_PL01x_FR_TXFF 0x20 + +#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) +#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) + +/* FUNCTIONS ******************************************************************/ + +VOID +ArmVersaPutChar(IN INT Char) +{ + // + // Properly support new-lines + // + if (Char == '\n') ArmVersaPutChar('\r'); + + // + // Wait for ready + // + while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF) != 0); + + // + // Send the character + // + WRITE_REGISTER_ULONG(UART_PL01x_DR, Char); +} + +void arm_kprintf(const char *fmt, ...) { + char buf[1024], *s; + va_list args; + + va_start(args, fmt); + _vsnprintf(buf,sizeof(buf),fmt,args); + va_end(args); + for (s = buf; *s; s++) + ArmVersaPutChar(*s); +} Propchange: trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c Tue Feb 12 20:45:58 2008 @@ -11,6 +11,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +void arm_kprintf(const char *fmt, ...); /* GLOBALS ********************************************************************/ @@ -91,6 +93,7 @@ KiInitializeSystem(IN ULONG Magic, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + arm_kprintf("%s:%i\n", __func__, __LINE__); // // Detect ARM version (Architecture 6 is the ARMv5TE-J, go figure!) // 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 20:45:58 2008 @@ -60,6 +60,7 @@ <if property="ARCH" value="arm"> <directory name="arm"> <file first="true">boot.s</file> + <file>arm_kprintf.c</file> <file>kiinit.c</file> <file>stubs_asm.s</file> <file>stubs.c</file>

1 0

[gbrunmar] 32326: Implemented IDirect3D9::GetAdapterDisplayMode()
by gbrunmar＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: gbrunmar Date: Tue Feb 12 20:30:32 2008 New Revision: 32326 URL: http://svn.reactos.org/svn/reactos?rev=32326&view=rev Log: Implemented IDirect3D9::GetAdapterDisplayMode() Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/adapter.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c Tue Feb 12 20:30:32 2008 @@ -169,6 +169,96 @@ +static D3DFORMAT Get16BitD3DFormat(LPCSTR lpszDeviceName) +{ + HDC hDC; + HBITMAP hBitmap; + LPBITMAPINFO pBitmapInfo; + D3DFORMAT Format = D3DFMT_R5G6B5; + + if (NULL == (hDC = CreateDCA(NULL, lpszDeviceName, NULL, NULL))) + { + return Format; + } + + if (NULL == (hBitmap = CreateCompatibleBitmap(hDC, 1, 1))) + { + DeleteDC(hDC); + return Format; + } + + pBitmapInfo = LocalAlloc(LMEM_ZEROINIT, sizeof(BITMAPINFOHEADER) + 4 * sizeof(RGBQUAD)); + if (NULL == pBitmapInfo) + { + DeleteObject(hBitmap); + DeleteDC(hDC); + return Format; + } + + pBitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + if (GetDIBits(hDC, hBitmap, 0, 0, NULL, pBitmapInfo, DIB_RGB_COLORS) > 0) + { + if (pBitmapInfo->bmiHeader.biCompression == BI_BITFIELDS) + { + if (GetDIBits(hDC, hBitmap, 0, pBitmapInfo->bmiHeader.biHeight, NULL, pBitmapInfo, DIB_RGB_COLORS) > 0) + { + /* Check if the green field is 6 bits long */ + if (*(DWORD*)(&pBitmapInfo->bmiColors[1]) == 0x000003E0) + { + Format = D3DFMT_X1R5G5B5; + } + } + } + } + + LocalFree(pBitmapInfo); + DeleteObject(hBitmap); + DeleteDC(hDC); + + return Format; +} + +BOOL GetAdapterMode(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pMode) +{ + DEVMODEA DevMode; + + memset(&DevMode, 0, sizeof(DEVMODEA)); + DevMode.dmSize = sizeof(DEVMODEA); + if (FALSE == EnumDisplaySettingsA(lpszDeviceName, ENUM_CURRENT_SETTINGS, &DevMode)) + return FALSE; + + pMode->Width = DevMode.dmPelsWidth; + pMode->Height = DevMode.dmPelsHeight; + pMode->RefreshRate = DevMode.dmDisplayFrequency; + + switch (DevMode.dmBitsPerPel) + { + case 8: + pMode->Format = D3DFMT_P8; + break; + + case 16: + pMode->Format = Get16BitD3DFormat(lpszDeviceName); + break; + + case 24: + pMode->Format = D3DFMT_R8G8B8; + break; + + case 32: + pMode->Format = D3DFMT_X8R8G8B8; + break; + + default: + pMode->Format = D3DFMT_UNKNOWN; + break; + } + + return TRUE; +} + + + static BOOL CALLBACK AdapterMonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData) { MONITORINFOEXA MonitorInfoEx; Modified: trunk/reactos/dll/directx/d3d9/adapter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.h… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.h (original) +++ trunk/reactos/dll/directx/d3d9/adapter.h Tue Feb 12 20:30:32 2008 @@ -11,6 +11,8 @@ BOOL GetAdapterInfo(LPCSTR lpszDeviceName, D3DADAPTER_IDENTIFIER9* pIdentifier); +BOOL GetAdapterMode(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pMode); + HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName); UINT GetDisplayFormatCount(D3DFORMAT Format, const D3DDISPLAYMODE* pSupportedDisplayModes, UINT NumDisplayModes); Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Tue Feb 12 20:30:32 2008 @@ -291,10 +291,51 @@ return D3D_OK; } -static HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9 iface, UINT Adapter, D3DDISPLAYMODE* pMode) -{ - UNIMPLEMENTED - +/*++ +* @name IDirect3D9::GetAdapterDisplayMode +* @implemented +* +* The function IDirect3D9Impl_GetAdapterDisplayMode fills the pMode argument with the +* currently set display mode. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* +* @param D3DDISPLAYMODE* pMode +* Pointer to a D3DDISPLAYMODE structure to be filled with the current display mode information. +* +* @return HRESULT +* If the method successfully fills the pMode structure, the return value is D3D_OK. +* If Adapter is out of range or pMode is a bad pointer, the return value will be D3DERR_INVALIDCALL. +* +*/static HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9 iface, UINT Adapter, D3DDISPLAYMODE* pMode) +{ + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >= This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (IsBadWritePtr(pMode, sizeof(D3DDISPLAYMODE))) + { + DPRINT1("Invalid pMode parameter specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + /* TODO: Handle (This->DisplayAdapters[Adapter].bInUseFlag == FALSE) */ + if (FALSE == GetAdapterMode(This->DisplayAdapters[Adapter].szDeviceName, pMode)) + DPRINT1("Internal error, GetAdapterMode() failed."); + + UNLOCK_D3D9(); return D3D_OK; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Tue Feb 12 20:30:32 2008 @@ -102,11 +102,11 @@ /* 0x0260 */ DWORD unknown000083; /* 0x0264 */ DWORD unknown000084; /* 0x0268 */ DWORD unknown000085; -/* 0x026c */ DWORD dwDisplayWidth; /* Current display res */ -/* 0x0270 */ DWORD dwDisplayHeight; /* Current display res */ -/* 0x0274 */ DWORD unknown000088; -/* 0x0278 */ DWORD unknown000089; -/* 0x027c */ DWORD unknown000090; +/* 0x026c */ DWORD dwDisplayWidth; /* Current display res */ +/* 0x0270 */ DWORD dwDisplayHeight; /* Current display res */ +/* 0x0274 */ DWORD unknown000088; /* Current D3DFORMAT */ +/* 0x0278 */ DWORD unknown000089; /* Current D3DFORMAT - duplicate? */ +/* 0x027c */ DWORD MonitorFrequency; /* Current monitor frequency */ /* 0x0280 */ DWORD unknown000091; /* 0x0284 */ DWORD unknown000092; /* 0x0288 */ DWORD unknown000093;

1 0

[dreimer] 32325: Hopefully the last String. Translators. Your turn.
by dreimer＠svn.reactos.org 12 Feb '08

12 Feb '08

Author: dreimer Date: Tue Feb 12 20:00:09 2008 New Revision: 32325 URL: http://svn.reactos.org/svn/reactos?rev=32325&view=rev Log: Hopefully the last String. Translators. Your turn. Modified: trunk/reactos/base/setup/usetup/fslist.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.h 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 20:00:09 2008 @@ -168,7 +168,7 @@ sprintf(Buffer, MUIGetString(STRING_FORMATDISK2), Item->FileSystem); } else - sprintf(Buffer, " Keep current file system (no changes) "); + sprintf(Buffer, MUIGetString(STRING_KEEPFORMAT)); if (ListEntry == &List->Selected->ListEntry) CONSOLE_SetInvertedTextXY(List->Left, 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 20:00:09 2008 @@ -1609,9 +1609,9 @@ {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, {STRING_PAGEDMEM, - "Ausgel. Speicher"}, + "Ausg. Speicher"}, {STRING_NONPAGEDMEM, - "Nicht ausgel. Speicher"}, + "Nicht ausg. Speich."}, {STRING_FREEMEM, "Freier Speicher"}, {STRING_REGHIVEUPDATE, @@ -1644,6 +1644,8 @@ " Formatiere Partition als %S Dateisystem (Schnell) "}, {STRING_FORMATDISK2, " Formatiere Partition als %S Dateisystem "}, + {STRING_KEEPFORMAT, + " Dateisystem beibehalten (Keine Vernderungen) "}, {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 20:00:09 2008 @@ -1638,6 +1638,8 @@ " Format partition as %S file system (quick format) "}, {STRING_FORMATDISK2, " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, {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 20:00:09 2008 @@ -1650,6 +1650,8 @@ " Format partition as %S file system (quick format) "}, {STRING_FORMATDISK2, " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, {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 20:00:09 2008 @@ -1646,6 +1646,8 @@ " Format partition as %S file system (quick format) "}, {STRING_FORMATDISK2, " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, {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 20:00:09 2008 @@ -1638,6 +1638,8 @@ " Format partition as %S file system (quick format) "}, {STRING_FORMATDISK2, " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, {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 20:00:09 2008 @@ -1643,6 +1643,8 @@ " Format partition as %S file system (quick format) "}, {STRING_FORMATDISK2, " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, {0, 0} }; 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 20:00:09 2008 @@ -103,5 +103,6 @@ #define STRING_CHECKINGDISK 32 #define STRING_FORMATDISK1 33 #define STRING_FORMATDISK2 34 +#define STRING_KEEPFORMAT 35 #endif

1 0

[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

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