Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[dreimer] 32152: first step to add multiple Arches selection to RosBE

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Feb 6 11:37:56 2008 New Revision: 32152 URL: http://svn.reactos.org/svn/reactos?rev=32152&view=rev Log: first step to add multiple Arches selection to RosBE Added: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Wed Feb 6 11:37:56 2008 @@ -1,3 +1,7 @@ +*** XXX xxrd, 2008 - RosBE 1.3 Released + +- Added: Tool to set the Architecture to build ROS for. (Daniel Reimer) + *** January 23rd, 2008 - RosBE 1.2 Released - Updated: NASM to 2.01 (Peter Ward) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Wed Feb 6 11:37:56 2008 @@ -27,6 +27,11 @@ echo with the appropriate number. echo basedir - Switch back to the ReactOS source directory. + if exist "%_ROSBE_BASEDIR%\charch.cmd" ( + echo chdefdir [OPTIONS] - Change the Architecture to build for for the + echo current RosBE session. + ) + if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( echo chdefdir [OPTIONS] - Change the ReactOS source directory for the echo current RosBE session. @@ -96,6 +101,16 @@ echo Switches back to the ReactOS source directory. goto :EOC ) +if exist "%_ROSBE_BASEDIR%\charch.cmd" ( + if /i "%1" == "charch" ( + echo Usage: charch [OPTIONS] + echo Change the ReactOS source directory for the current RosBE session. + echo Possible Architectures are: x86, ppc, arm. + echo. + echo previous - Switch to the previous ReactOS source directory. + goto :EOC + ) +) if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( if /i "%1" == "chdefdir" ( echo Usage: chdefdir [OPTIONS] Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Wed Feb 6 11:37:56 2008 @@ -138,6 +138,7 @@ if not exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( doskey CHDEFDIR= ) if not exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( doskey CHDEFGCC= ) + if not exist "%_ROSBE_BASEDIR%\charch.cmd" ( doskey CHARCH= ) if not exist "%_ROSBE_BASEDIR%\Config.cmd" ( doskey CONFIG= ) if not exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( doskey RADDR2LINE= ) if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac Wed Feb 6 11:37:56 2008 @@ -1,6 +1,7 @@ BASEDIR = cd /d "%_ROSBE_ROSSOURCEDIR%" CHDEFDIR = "%_ROSBE_BASEDIR%\chdefdir.cmd" $* CHDEFGCC = "%_ROSBE_BASEDIR%\chdefgcc.cmd" $* +CHARCH = "%_ROSBE_BASEDIR%\charch.cmd" $* CLEAN = "%_ROSBE_BASEDIR%\Clean.cmd" $* CONFIG = "%_ROSBE_BASEDIR%\Config.cmd" $* ENV = set Added: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd Wed Feb 6 11:37:56 2008 @@ -1,0 +1,83 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/charch.cmd +:: PURPOSE: Tool to change the current Arch to build ROS for in RosBE. +:: COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +@echo off +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + +title Change the Architecture to build for... + +:: +:: Parse the command line arguments. +:: +if "%1" == "" ( + call :INTERACTIVE +) else ( + set _1=%1 +) +if /i "%_1%" == "previous" ( + popd +) +if /i "%_1%" == "x86" ( + set _ROSBE_ARCH%=x86 + set _ROSBE_PREFIX=mingw32 + goto :EOC +) +if /i "%_1%" == "arm" ( + set _ROSBE_ARCH%=arm + set _ROSBE_PREFIX=mingwarm + goto :EOC +) +if /i "%_1%" == "ppc" ( + set _ROSBE_ARCH%=ppc + set _ROSBE_PREFIX=mingwppc + goto :EOC +) +if not "%_1%" == "" ( + echo Unknown parameter specified. Try 'help [COMMAND]'. + goto :EOC +) +goto :EOC + +:: +:: If Parameters were set, parse them, if not, ask the user to add them. +:: +:INTERACTIVE + set /p _1="Please enter a Architecture you want to build ReactOS for: " + if "%_1%" == "" ( + echo ERROR: You must enter a Architecture. + goto :EOC + ) +goto :EOF + +:EOC +pushd %_1% + +:: +:: Set to x86, ppc or arm. +:: +set ROS_ARCH=%_ROSBE_ARCH% + +:: +:: Default is mingw32. ppc could be mingwppc, arm mingwarm. +:: +set ROS_PREFIX=%_ROSBE_PREFIX% + +REM chdefgcc %PATH% +REM Maybe another way to set the compiler... + +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) + +:: +:: Unload all used Vars. +:: +set _ROSBE_ARCH= +set _ROSBE_PREFIX= Propchange: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 8 months

[ros-arm-bringup] 32151: We implemented console support (through serial port), for the current board types supported (Feroceon, using UART 16550). We added a new ClockRate member to the ARM Board Block structure. We now print out the FreeLDR header after initialization to give some output to the user that we are alive. Started putting shared stuff in headers. Fixed copy/paste leftovers from file headers (wrong file names, implementation details, author).

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Wed Feb 6 10:32:47 2008 New Revision: 32151 URL: http://svn.reactos.org/svn/reactos?rev=32151&view=rev Log: We implemented console support (through serial port), for the current board types supported (Feroceon, using UART 16550). We added a new ClockRate member to the ARM Board Block structure. We now print out the FreeLDR header after initialization to give some output to the user that we are alive. Started putting shared stuff in headers. Fixed copy/paste leftovers from file headers (wrong file names, implementation details, author). Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s Wed Feb 6 10:32:47 2008 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: boot/freeldr/arch/arm/boot.s * PURPOSE: Implements the entry point for ARM machines - * PROGRAMMERS: alex(a)winsiderss.com + * PROGRAMMERS: ReactOS Portable Systems Group */ /* INCLUDES *******************************************************************/ Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c Wed Feb 6 10:32:47 2008 @@ -1,0 +1,130 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/arch/arm/ferouart.c + * PURPOSE: Implements code for Feroceon boards using the 16550 UART + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> + +/* GLOBALS ********************************************************************/ + +// +// UART Registers +// +#define UART0_RBR (ArmBoardBlock->UartRegisterBase + 0x00) +#define UART0_THR UART0_RBR +#define UART0_IER (ArmBoardBlock->UartRegisterBase + 0x04) +#define UART0_FCR (ArmBoardBlock->UartRegisterBase + 0x08) +#define UART0_LCR (ArmBoardBlock->UartRegisterBase + 0x0C) +#define UART0_MCR (ArmBoardBlock->UartRegisterBase + 0x10) +#define UART0_LSR (ArmBoardBlock->UartRegisterBase + 0x14) +#define UART0_MSR (ArmBoardBlock->UartRegisterBase + 0x18) +#define UART0_SCR (ArmBoardBlock->UartRegisterBase + 0x1C) + +// +// When we enable the divisor latch +// +#define UART0_DLL UART0_RBR +#define UART0_DLM UART0_IER + +// +// FCR Values +// +#define FCR_FIFO_EN 0x01 +#define FCR_RXSR 0x02 +#define FCR_TXSR 0x04 + +// +// LCR Values +// +#define LCR_WLS_8 0x03 +#define LCR_1_STB 0x00 +#define LCR_DIVL_EN 0x80 +#define LCR_NO_PAR 0x00 + +// +// LSR Values +// +#define LSR_DR 0x01 +#define LSR_THRE 0x20 + +/* FUNCTIONS ******************************************************************/ + +VOID +ArmFeroSerialInit(IN ULONG Baudrate) +{ + ULONG BaudClock; + + // + // Calculate baudrate clock divider to set the baud rate + // + BaudClock = (ArmBoardBlock->ClockRate / 16) / Baudrate; + + // + // Disable interrupts + // + WRITE_REGISTER_UCHAR(UART0_IER, 0); + + // + // Set the baud rate to 115200 bps + // + WRITE_REGISTER_UCHAR(UART0_LCR, LCR_DIVL_EN); + WRITE_REGISTER_UCHAR(UART0_DLL, BaudClock); + WRITE_REGISTER_UCHAR(UART0_DLM, (BaudClock >> 8) & 0xFF); + + // + // Set 8 bits for data, 1 stop bit, no parity + // + WRITE_REGISTER_UCHAR(UART0_LCR, LCR_WLS_8 | LCR_1_STB | LCR_NO_PAR); + + // + // Clear and enable FIFO + // + WRITE_REGISTER_UCHAR(UART0_FCR, FCR_FIFO_EN | FCR_RXSR | FCR_TXSR); +} + +VOID +ArmFeroPutChar(IN INT Char) +{ + // + // Properly support new-lines + // + if (Char == '\n') ArmFeroPutChar('\r'); + + // + // Wait for ready + // + while ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_THRE) == 0); + + // + // Send the character + // + WRITE_REGISTER_UCHAR(UART0_THR, Char); +} + +INT +ArmFeroGetCh(VOID) +{ + // + // Wait for ready + // + while ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_DR) == 0); + + // + // Read the character + // + return READ_REGISTER_UCHAR(UART0_RBR); +} + +BOOLEAN +ArmFeroKbHit(VOID) +{ + // + // Return if something is ready + // + return ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_DR) != 0); +} Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c Wed Feb 6 10:32:47 2008 @@ -2,8 +2,8 @@ * PROJECT: ReactOS Boot Loader * LICENSE: GPL - See COPYING in the top level directory * FILE: boot/freeldr/arch/arm/marcharm.c - * PURPOSE: Implements ARM-specific machine initialization - * PROGRAMMERS: alex(a)winsiderss.com + * PURPOSE: Provides abstraction between the ARM Boot Loader and FreeLDR + * PROGRAMMERS: ReactOS Portable Systems Group */ /* INCLUDES *******************************************************************/ @@ -12,37 +12,9 @@ /* GLOBALS ********************************************************************/ -// -// The only things we support -// -typedef enum _ARM_BOARD_TYPE -{ - // - // Marvell Feroceon-based SoC: - // Buffalo Linkstation, KuroBox Pro, D-Link DS323 and others - // - ARM_FEROCEON = 1, -} ARM_BOARD_TYPE; - -// -// Compatible boot-loaders should return us this information -// -#define ARM_BOARD_CONFIGURATION_MAJOR_VERSION 1 -#define ARM_BOARD_CONFIGURATION_MINOR_VERSION 1 -typedef struct _ARM_BOARD_CONFIGURATION_BLOCK -{ - ULONG MajorVersion; - ULONG MinorVersion; - ARM_BOARD_TYPE BoardType; - ULONG TimerRegisterBase; - ULONG UartRegisterBase; - PBIOS_MEMORY_MAP MemoryMap; - CHAR CommandLine[256]; -} ARM_BOARD_CONFIGURATION_BLOCK, *PARM_BOARD_CONFIGURATION_BLOCK; +PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; /* FUNCTIONS ******************************************************************/ - -PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; VOID ArmInit(IN PARM_BOARD_CONFIGURATION_BLOCK BootContext) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Wed Feb 6 10:32:47 2008 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: boot/freeldr/arch/arm/stubs.c * PURPOSE: Non-completed ARM hardware-specific routines - * PROGRAMMERS: alex(a)winsiderss.com + * PROGRAMMERS: ReactOS Portable Systems Group */ /* INCLUDES *******************************************************************/ @@ -22,26 +22,6 @@ // // Start the OS // -} - -VOID -ArmConsPutChar(INT Char) -{ - while (TRUE); -} - -BOOLEAN -ArmConsKbHit(VOID) -{ - while (TRUE); - return FALSE; -} - -INT -ArmConsGetCh(VOID) -{ - while (TRUE); - return FALSE; } BOOLEAN @@ -155,11 +135,31 @@ MachInit(IN PCCH CommandLine) { // - // Setup ARM routines + // Setup board-specific ARM routines // - MachVtbl.ConsPutChar = ArmConsPutChar; - MachVtbl.ConsKbHit = ArmConsKbHit; - MachVtbl.ConsGetCh = ArmConsGetCh; + switch (ArmBoardBlock->BoardType) + { + // + // Check for Feroceon-base boards + // + case ARM_FEROCEON: + + // + // These boards use a UART16550. Set us up for 115200 bps + // + ArmFeroSerialInit(115200); + MachVtbl.ConsPutChar = ArmFeroPutChar; + MachVtbl.ConsKbHit = ArmFeroKbHit; + MachVtbl.ConsGetCh = ArmFeroGetCh; + break; + + default: + ASSERT(FALSE); + } + + // + // Setup generic ARM routines + // MachVtbl.PrepareForReactOS = ArmPrepareForReactOS; MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; MachVtbl.DiskGetBootVolume = ArmDiskGetBootVolume; @@ -173,4 +173,9 @@ MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; MachVtbl.HwDetect = ArmHwDetect; + + // + // We can now print to the console + // + TuiPrintf("%s for ARM\n", GetFreeLoaderVersionString()); } Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c Wed Feb 6 10:32:47 2008 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: boot/freeldr/arch/i386/ramdisk.c * PURPOSE: Implements routines to support booting from a RAM Disk - * PROGRAMMERS: alex(a)winsiderss.com + * PROGRAMMERS: ReactOS Portable Systems Group */ /* INCLUDES *******************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Wed Feb 6 10:32:47 2008 @@ -101,6 +101,7 @@ <define name="DEBUG" /> <define name="_NTHAL_" /> <file>boot.s</file> + <file>ferouart.c</file> <file>macharm.c</file> <file>stubs.c</file> </module> Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h Wed Feb 6 10:32:47 2008 @@ -2,8 +2,8 @@ * PROJECT: ReactOS Boot Loader * LICENSE: GPL - See COPYING in the top level directory * FILE: boot/freeldr/include/arch/arm/hardware.h - * PURPOSE: Implements routines to support booting from a RAM Disk - * PROGRAMMERS: alex(a)winsiderss.com + * PURPOSE: Header for ARC definitions (to be cleaned up) + * PROGRAMMERS: ReactOS Portable Systems Group */ #ifndef _ARM_HARDWARE_ @@ -12,6 +12,35 @@ #ifndef __REGISTRY_H #include "../../reactos/registry.h" #endif + +// +// The only things we support +// +typedef enum _ARM_BOARD_TYPE +{ + // + // Marvell Feroceon-based SoC: + // Buffalo Linkstation, KuroBox Pro, D-Link DS323 and others + // + ARM_FEROCEON = 1, +} ARM_BOARD_TYPE; + +// +// Compatible boot-loaders should return us this information +// +#define ARM_BOARD_CONFIGURATION_MAJOR_VERSION 1 +#define ARM_BOARD_CONFIGURATION_MINOR_VERSION 1 +typedef struct _ARM_BOARD_CONFIGURATION_BLOCK +{ + ULONG MajorVersion; + ULONG MinorVersion; + ARM_BOARD_TYPE BoardType; + ULONG ClockRate; + ULONG TimerRegisterBase; + ULONG UartRegisterBase; + PBIOS_MEMORY_MAP MemoryMap; + CHAR CommandLine[256]; +} ARM_BOARD_CONFIGURATION_BLOCK, *PARM_BOARD_CONFIGURATION_BLOCK; // // Static heap for ARC Hardware Component Tree @@ -63,4 +92,18 @@ IN ULONG Size ); +VOID +ArmFeroSerialInit(IN ULONG Baudrate); + +VOID +ArmFeroPutChar(IN INT Char); + +INT +ArmFeroGetCh(VOID); + +BOOLEAN +ArmFeroKbHit(VOID); + +extern PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; + #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h Wed Feb 6 10:32:47 2008 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: boot/freeldr/include/ramdisk.h * PURPOSE: Header file for ramdisk support - * PROGRAMMERS: alex(a)winsiderss.com + * PROGRAMMERS: ReactOS Portable Systems Group */ #ifndef _RAMDISK_

16 years, 8 months

[ros-arm-bringup] 32150: We now make sure to build with the static version of libgcc. Previously, this resulted in FreeLDR having an import table and trying to import a .DLL file -- not a very wise attempt.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Wed Feb 6 10:19:13 2008 New Revision: 32150 URL: http://svn.reactos.org/svn/reactos?rev=32150&view=rev Log: We now make sure to build with the static version of libgcc. Previously, this resulted in FreeLDR having an import table and trying to import a .DLL file -- not a very wise attempt. Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Wed Feb 6 10:19:13 2008 @@ -13,8 +13,7 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> + <linkerflag>-static</linkerflag> <linkerflag>-lgcc</linkerflag> </module> </if> @@ -31,6 +30,7 @@ <library>rtl</library> <library>libcntpr</library> <linkerflag>-lgcc</linkerflag> + <linkerflag>-static</linkerflag> </module> </if> <if property="ARCH" value="powerpc">

16 years, 8 months

[tkreuzer] 32149: - use intrinsic interlocked functions - add a function to get a full stackbacktrace including usermode

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 6 08:09:26 2008 New Revision: 32149 URL: http://svn.reactos.org/svn/reactos?rev=32149&view=rev Log: - use intrinsic interlocked functions - add a function to get a full stackbacktrace including usermode Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Wed Feb 6 08:09:26 2008 @@ -32,6 +32,7 @@ #ifdef GDI_DEBUG BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); +NTSYSAPI ULONG NTAPI RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); #endif #define GDI_ENTRY_TO_INDEX(ht, e) \ @@ -170,7 +171,7 @@ } ShortDelay.QuadPart = -5000LL; /* FIXME - 0.5 ms? */ - + HandleTable->FirstFree = 0; HandleTable->FirstUnused = RESERVE_ENTRIES_COUNT; @@ -200,8 +201,8 @@ static int leak_reported = 0; #define GDI_STACK_LEVELS 12 -static ULONG GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS]; -static ULONG GDIHandleLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS]; +static ULONG GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; +static ULONG GDIHandleLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; struct DbgOpenGDIHandle { ULONG idx; @@ -287,6 +288,23 @@ if ( i < n && h[i].count == 1 ) DbgPrint ( "(list terminated - the remaining entries have 1 allocation only)\n" ); } + +ULONG +CaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture) +{ + ULONG nFrameCount; + + memset(pFrames, 0x00, (nFramesToCapture + 1) * sizeof(PVOID)); + + nFrameCount = RtlCaptureStackBackTrace(1, nFramesToCapture, pFrames, NULL); + + if (nFrameCount < nFramesToCapture) + { + nFrameCount += RtlWalkFrameChain(pFrames + nFrameCount, nFramesToCapture - nFrameCount, 1); + } + + return nFrameCount; +} #endif /* GDI_DEBUG */ @@ -334,7 +352,7 @@ idxNextFree = (ULONG)pFreeEntry->KernelData; idxPrev = (ULONG)_InterlockedCompareExchange((LONG*)&HandleTable->FirstFree, idxNextFree, idxFirstFree); } - else + else { idxFirstFree = HandleTable->FirstUnused; idxNextFree = idxFirstFree + 1; @@ -470,7 +488,7 @@ Entry = &HandleTable->Entries[Index]; LockHandle: - PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, 0); + PrevProcId = _InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId, LockedProcessId, 0); if(PrevProcId == NULL) { HGDIOBJ Handle; @@ -485,16 +503,15 @@ Entry->Type = TypeInfo; /* unlock the entry */ - (void)InterlockedExchangePointer(&Entry->ProcessId, CurrentProcessId); - -#ifdef GDI_DEBUG - memset ( GDIHandleAllocator[Index], 0x00, GDI_STACK_LEVELS * sizeof(ULONG) ); - RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleAllocator[Index], NULL); + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, CurrentProcessId); + +#ifdef GDI_DEBUG + CaptureStackBackTace((PVOID*)GDIHandleAllocator[Index], GDI_STACK_LEVELS); #endif /* GDI_DEBUG */ if(W32Process != NULL) { - InterlockedIncrement(&W32Process->GDIObjects); + _InterlockedIncrement(&W32Process->GDIObjects); } Handle = (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo << GDI_ENTRY_UPPER_SHIFT)); @@ -586,8 +603,12 @@ HandleType != ExpectedType) || HandleType == 0 ) { - DPRINT1("Attempted to free object 0x%x of wrong type (Handle: 0x%x, expected: 0x%x)\n", - hObj, HandleType, ExpectedType); + DPRINT1("Attempted to free object 0x%x of wrong type (Handle: 0x%x, expected: 0x%x)\n", + hObj, HandleType, ExpectedType); +#ifdef GDI_DEBUG + DPRINT1("-> called from:\n"); + KeRosDumpStackFrames(NULL, 20); +#endif return FALSE; } @@ -596,7 +617,7 @@ LockHandle: /* lock the object, we must not delete global objects, so don't exchange the locking process ID to zero when attempting to lock a global object... */ - PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, ProcessId); + PrevProcId = _InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId, LockedProcessId, ProcessId); if(PrevProcId == ProcessId) { if( (Entry->KernelData != NULL) && @@ -616,14 +637,14 @@ Entry->Type = (Entry->Type + GDI_ENTRY_REUSE_INC) & ~GDI_ENTRY_BASETYPE_MASK; /* unlock the handle slot */ - (void)InterlockedExchangePointer(&Entry->ProcessId, NULL); + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, NULL); /* push this entry to the free list */ InterlockedPushFreeEntry(HandleTable, GDI_ENTRY_TO_INDEX(HandleTable, Entry)); if(W32Process != NULL) { - InterlockedDecrement(&W32Process->GDIObjects); + _InterlockedDecrement(&W32Process->GDIObjects); } /* call the cleanup routine. */ @@ -662,7 +683,7 @@ else { LockErrorDebugOutput(hObj, Entry, "GDIOBJ_FreeObj"); - (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); } } else if(PrevProcId == LockedProcessId) @@ -883,7 +904,7 @@ { /* Lock the handle table entry. */ LockedProcessId = (HANDLE)((ULONG_PTR)HandleProcessId | 0x1); - PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, + PrevProcId = _InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId, LockedProcessId, HandleProcessId); @@ -905,20 +926,19 @@ GdiHdr->LockingThread = Thread; GdiHdr->Locks = 1; #ifdef GDI_DEBUG - memset(GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], 0x00, GDI_STACK_LEVELS * sizeof(ULONG)); - RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], NULL); + CaptureStackBackTace((PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); #endif Object = Entry->KernelData; } else { - InterlockedIncrement((PLONG)&GdiHdr->Locks); + _InterlockedIncrement((PLONG)&GdiHdr->Locks); if (GdiHdr->LockingThread != Thread) { - InterlockedDecrement((PLONG)&GdiHdr->Locks); + _InterlockedDecrement((PLONG)&GdiHdr->Locks); /* Unlock the handle table entry. */ - (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); DelayExecution(); continue; @@ -941,7 +961,7 @@ } /* Unlock the handle table entry. */ - (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); break; } @@ -1028,7 +1048,7 @@ { /* Lock the handle table entry. */ LockedProcessId = (HANDLE)((ULONG_PTR)HandleProcessId | 0x1); - PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, + PrevProcId = _InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId, LockedProcessId, HandleProcessId); @@ -1045,13 +1065,13 @@ PGDIOBJHDR GdiHdr = GDIBdyToHdr(Entry->KernelData); #ifdef GDI_DEBUG - if (InterlockedIncrement((PLONG)&GdiHdr->Locks) == 1) + if (_InterlockedIncrement((PLONG)&GdiHdr->Locks) == 1) { memset(GDIHandleLocker[HandleIndex], 0x00, GDI_STACK_LEVELS * sizeof(ULONG)); RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleLocker[HandleIndex], NULL); } #else - InterlockedIncrement((PLONG)&GdiHdr->Locks); + _InterlockedIncrement((PLONG)&GdiHdr->Locks); #endif Object = Entry->KernelData; } @@ -1070,7 +1090,7 @@ } /* Unlock the handle table entry. */ - (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); break; } @@ -1102,13 +1122,13 @@ { PGDIOBJHDR GdiHdr = GDIBdyToHdr(Object); #ifdef GDI_DEBUG - if (InterlockedDecrement((PLONG)&GdiHdr->Locks) == 0) + if (_InterlockedDecrement((PLONG)&GdiHdr->Locks) == 0) { memset(GDIHandleLocker[GDI_HANDLE_GET_INDEX(Object)], 0x00, GDI_STACK_LEVELS * sizeof(ULONG)); RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(Object)], NULL); } #else - if (InterlockedDecrement((PLONG)&GdiHdr->Locks) < 0) + if (_InterlockedDecrement((PLONG)&GdiHdr->Locks) < 0) DPRINT1("Trying to unlock non-existant object\n"); #endif } @@ -1168,7 +1188,7 @@ LockHandle: /* lock the object, we must not convert stock objects, so don't check!!! */ - PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, ProcessId); + PrevProcId = _InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId, LockedProcessId, ProcessId); if(PrevProcId == ProcessId) { LONG NewType, PrevType, OldType; @@ -1188,7 +1208,7 @@ NewType = OldType | GDI_ENTRY_STOCK_MASK; /* Try to exchange the type field - but only if the old (previous type) matches! */ - PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); + PrevType = _InterlockedCompareExchange(&Entry->Type, NewType, OldType); if(PrevType == OldType && Entry->KernelData != NULL) { PETHREAD PrevThread; @@ -1217,14 +1237,14 @@ W32Process = (PW32PROCESS)OldProcess->Win32Process; if(W32Process != NULL) { - InterlockedDecrement(&W32Process->GDIObjects); + _InterlockedDecrement(&W32Process->GDIObjects); } ObDereferenceObject(OldProcess); } } /* remove the process id lock and make it global */ - (void)InterlockedExchangePointer(&Entry->ProcessId, GDI_GLOBAL_PROCESS); + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, GDI_GLOBAL_PROCESS); hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); *phObj = hObj; @@ -1246,7 +1266,7 @@ /* WTF?! The object is already locked by a different thread! Release the lock, wait a bit and try again! FIXME - we should give up after some time unless we want to wait forever! */ - (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); DelayExecution(); goto LockHandle; @@ -1304,7 +1324,7 @@ LockHandle: /* lock the object, we must not convert stock objects, so don't check!!! */ - PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, ProcessId, LockedProcessId); + PrevProcId = _InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId, ProcessId, LockedProcessId); if(PrevProcId == ProcessId) { PETHREAD PrevThread; @@ -1330,7 +1350,7 @@ W32Process = (PW32PROCESS)OldProcess->Win32Process; if(W32Process != NULL) { - InterlockedDecrement(&W32Process->GDIObjects); + _InterlockedDecrement(&W32Process->GDIObjects); } ObDereferenceObject(OldProcess); } @@ -1344,14 +1364,14 @@ W32Process = (PW32PROCESS)NewOwner->Win32Process; if(W32Process != NULL) { - InterlockedIncrement(&W32Process->GDIObjects); + _InterlockedIncrement(&W32Process->GDIObjects); } } else ProcessId = 0; /* remove the process id lock and change it to the new process id */ - (void)InterlockedExchangePointer(&Entry->ProcessId, ProcessId); + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, ProcessId); /* we're done! */ return; @@ -1370,7 +1390,7 @@ being deleted in the meantime (because we don't have aquired a reference at this point). FIXME - we should give up after some time unless we want to wait forever! */ - (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); DelayExecution(); goto LockHandle; @@ -1437,7 +1457,7 @@ LockHandleFrom: /* lock the object, we must not convert stock objects, so don't check!!! */ - FromPrevProcId = InterlockedCompareExchangePointer(&FromEntry->ProcessId, FromProcessId, FromLockedProcessId); + FromPrevProcId = _InterlockedCompareExchangePointer((PVOID*)&FromEntry->ProcessId, FromProcessId, FromLockedProcessId); if(FromPrevProcId == FromProcessId) { PETHREAD PrevThread; @@ -1470,7 +1490,7 @@ GDIOBJ_SetOwnership(HandleTable, CopyTo, NULL); } - (void)InterlockedExchangePointer(&FromEntry->ProcessId, FromPrevProcId); + (void)_InterlockedExchangePointer((PVOID*)&FromEntry->ProcessId, FromPrevProcId); } else { @@ -1486,7 +1506,7 @@ being deleted in the meantime (because we don't have aquired a reference at this point). FIXME - we should give up after some time unless we want to wait forever! */ - (void)InterlockedExchangePointer(&FromEntry->ProcessId, FromPrevProcId); + (void)_InterlockedExchangePointer((PVOID*)&FromEntry->ProcessId, FromPrevProcId); DelayExecution(); goto LockHandleFrom;

16 years, 8 months

[ros-arm-bringup] 32148: Implement a proper ARM startup routine. We disable the FIQ and IRQ lines, then disable and flush D and I caches, set up a temporary boot stack, and call ArmInit. In ArmInit we define the structure that a compatible bootloader has to send us and currently make some assertions on it, before dropping into the common, portable, freeldr startup (BootMain). This would be the place where we would want to setup UART0 for serial support later on, as well as TIMER0. In MachInit, w

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Wed Feb 6 07:48:22 2008 New Revision: 32148 URL: http://svn.reactos.org/svn/reactos?rev=32148&view=rev Log: Implement a proper ARM startup routine. We disable the FIQ and IRQ lines, then disable and flush D and I caches, set up a temporary boot stack, and call ArmInit. In ArmInit we define the structure that a compatible bootloader has to send us and currently make some assertions on it, before dropping into the common, portable, freeldr startup (BootMain). This would be the place where we would want to setup UART0 for serial support later on, as well as TIMER0. In MachInit, we now define the required ARM routines we'll need, all which simply loop for now. Also fix a bug in RamDiskInit, which could do reads from NULL pointers. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s Wed Feb 6 07:48:22 2008 @@ -10,12 +10,70 @@ //#include <kxarm.h> +#define CPSR_IRQ_DISABLE 0x80 +#define CPSR_FIQ_DISABLE 0x40 +#define CPSR_THUMB_ENABLE 0x20 + +#define C1_MMU_CONTROL 0x01 +#define C1_ALIGNMENT_CONTROL 0x02 +#define C1_DCACHE_CONTROL 0x04 +#define C1_ICACHE_CONTROL 0x1000 +#define C1_VECTOR_CONTROL 0x2000 + /* GLOBALS ********************************************************************/ .global _start .section startup + +/* BOOT CODE ******************************************************************/ + +_start: + // + // C entrypoint + // + ldr lr, L_ArmInit + + // + // Turn off FIQs and IRQs + // FreeLDR runs without interrupts, and without paging, just like on x86 + // + mrs r1, cpsr + orr r1, r1, #CPSR_IRQ_DISABLE | CPSR_FIQ_DISABLE + msr cpsr, r1 -/* BOOT CODE ******************************************************************/ + // + // Turn off caches + // + mrc p15, 0, r1, c1, c0, 0 + bic r1, r1, #C1_DCACHE_CONTROL + bic r1, r1, #C1_ICACHE_CONTROL + mcr p15, 0, r1, c1, c0, 0 + + // + // Flush everything away + // + mov r1, #0 + mcr p15, 0, r1, c7, c7, 0 + + // + // Okay, now give us a stack + // + ldr sp, L_BootStackEnd -_start: - b . + // + // Go ahead and call the C initialization code + // r0 contains the ARM_BOARD_CONFIGURATION_DATA structure + // + bx lr + +L_BootStackEnd: + .long BootStackEnd + +L_ArmInit: + .long ArmInit + + .align 4 +BootStack: + .space 0x4000 +BootStackEnd: + .long 0 Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c Wed Feb 6 07:48:22 2008 @@ -12,12 +12,60 @@ /* GLOBALS ********************************************************************/ +// +// The only things we support +// +typedef enum _ARM_BOARD_TYPE +{ + // + // Marvell Feroceon-based SoC: + // Buffalo Linkstation, KuroBox Pro, D-Link DS323 and others + // + ARM_FEROCEON = 1, +} ARM_BOARD_TYPE; + +// +// Compatible boot-loaders should return us this information +// +#define ARM_BOARD_CONFIGURATION_MAJOR_VERSION 1 +#define ARM_BOARD_CONFIGURATION_MINOR_VERSION 1 +typedef struct _ARM_BOARD_CONFIGURATION_BLOCK +{ + ULONG MajorVersion; + ULONG MinorVersion; + ARM_BOARD_TYPE BoardType; + ULONG TimerRegisterBase; + ULONG UartRegisterBase; + PBIOS_MEMORY_MAP MemoryMap; + CHAR CommandLine[256]; +} ARM_BOARD_CONFIGURATION_BLOCK, *PARM_BOARD_CONFIGURATION_BLOCK; + /* FUNCTIONS ******************************************************************/ +PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; + VOID -MachInit(IN PCCH CommandLine) +ArmInit(IN PARM_BOARD_CONFIGURATION_BLOCK BootContext) { // - // Setup ARM routines + // Remember the pointer // + ArmBoardBlock = BootContext; + + // + // Let's make sure we understand the boot-loader + // + ASSERT(ArmBoardBlock->MajorVersion == ARM_BOARD_CONFIGURATION_MAJOR_VERSION); + ASSERT(ArmBoardBlock->MinorVersion == ARM_BOARD_CONFIGURATION_MINOR_VERSION); + + // + // This should probably go away once we support more boards + // + ASSERT(ArmBoardBlock->BoardType == ARM_FEROCEON); + + // + // Call FreeLDR's portable entrypoint with our command-line + // + BootMain(ArmBoardBlock->CommandLine); } + Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Wed Feb 6 07:48:22 2008 @@ -23,3 +23,154 @@ // Start the OS // } + +VOID +ArmConsPutChar(INT Char) +{ + while (TRUE); +} + +BOOLEAN +ArmConsKbHit(VOID) +{ + while (TRUE); + return FALSE; +} + +INT +ArmConsGetCh(VOID) +{ + while (TRUE); + return FALSE; +} + +BOOLEAN +ArmDiskGetBootVolume(IN PULONG DriveNumber, + IN PULONGLONG StartSector, + IN PULONGLONG SectorCount, + OUT PINT FsType) +{ + while (TRUE); + return FALSE; +} + +VOID +ArmDiskGetBootDevice(OUT PULONG BootDevice) +{ + while (TRUE); +} + +BOOLEAN +ArmDiskBootingFromFloppy(VOID) +{ + while (TRUE); + return FALSE; +} + +BOOLEAN +ArmDiskGetSystemVolume(IN PCHAR SystemPath, + OUT PCHAR RemainingPath, + OUT PULONG Device, + OUT PULONG DriveNumber, + OUT PULONGLONG StartSector, + OUT PULONGLONG SectorCount, + OUT PINT FsType) +{ + while (TRUE); + return FALSE; +} + +BOOLEAN +ArmDiskGetBootPath(IN PCHAR BootPath, + IN unsigned Size) +{ + while (TRUE); + return FALSE; +} + +BOOLEAN +ArmDiskNormalizeSystemPath(IN PCHAR SystemPath, + IN unsigned Size) +{ + while (TRUE); + return FALSE; +} + +BOOLEAN +ArmDiskGetDriveGeometry(IN ULONG DriveNumber, + OUT PGEOMETRY Geometry) +{ + while (TRUE); + return FALSE; +} + +BOOLEAN +ArmDiskGetPartitionEntry(IN ULONG DriveNumber, + IN ULONG PartitionNumber, + OUT PPARTITION_TABLE_ENTRY PartitionTableEntry) +{ + while (TRUE); + return FALSE; +} + +BOOLEAN +ArmDiskReadLogicalSectors(IN ULONG DriveNumber, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + IN PVOID Buffer) +{ + while (TRUE); + return FALSE; +} + +ULONG +ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) +{ + while (TRUE); + return FALSE; +} + +VOID +ArmPrepareForReactOS(IN BOOLEAN Setup) +{ + while (TRUE); +} + +PCONFIGURATION_COMPONENT_DATA +ArmHwDetect(VOID) +{ + while (TRUE); + return NULL; +} + +ULONG +ArmMemGetMemoryMap(OUT PBIOS_MEMORY_MAP BiosMemoryMap, + IN ULONG MaxMemoryMapSize) +{ + while (TRUE); + return FALSE; +} + +VOID +MachInit(IN PCCH CommandLine) +{ + // + // Setup ARM routines + // + MachVtbl.ConsPutChar = ArmConsPutChar; + MachVtbl.ConsKbHit = ArmConsKbHit; + MachVtbl.ConsGetCh = ArmConsGetCh; + MachVtbl.PrepareForReactOS = ArmPrepareForReactOS; + MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; + MachVtbl.DiskGetBootVolume = ArmDiskGetBootVolume; + MachVtbl.DiskGetSystemVolume = ArmDiskGetSystemVolume; + MachVtbl.DiskGetBootPath = ArmDiskGetBootPath; + MachVtbl.DiskGetBootDevice = ArmDiskGetBootDevice; + MachVtbl.DiskBootingFromFloppy = ArmDiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = ArmDiskNormalizeSystemPath; + MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors; + MachVtbl.DiskGetPartitionEntry = ArmDiskGetPartitionEntry; + MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; + MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; + MachVtbl.HwDetect = ArmHwDetect; +} Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c Wed Feb 6 07:48:22 2008 @@ -168,9 +168,13 @@ NTAPI RamDiskInit(IN PCHAR CmdLine) { + PCHAR Setting; + // // Get RAM disk parameters // - gRamDiskBase = (PVOID)atoi(strstr(CmdLine, "rdbase=")); - gRamDiskSize = atoi(strstr(CmdLine, "rdsize=")); + Setting = strstr(CmdLine, "rdbase="); + if (Setting) gRamDiskBase = (PVOID)atoi(Setting); + Setting = strstr(CmdLine, "rdsize="); + if (Setting) gRamDiskSize = atoi(Setting); }

16 years, 8 months

[tkreuzer] 32147: Windows doesn't store a hbrBack, when creating a window

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 6 07:01:02 2008 New Revision: 32147 URL: http://svn.reactos.org/svn/reactos?rev=32147&view=rev Log: Windows doesn't store a hbrBack, when creating a window Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Wed Feb 6 07:01:02 2008 @@ -346,7 +346,7 @@ Menu->MenuInfo.fMask = 0; /* not used */ Menu->MenuInfo.dwStyle = 0; /* FIXME */ Menu->MenuInfo.cyMax = 0; /* default */ - Menu->MenuInfo.hbrBack = IntGetSysColorBrush(COLOR_MENU); + Menu->MenuInfo.hbrBack = NULL; /* no brush */ Menu->MenuInfo.dwContextHelpID = 0; /* default */ Menu->MenuInfo.dwMenuData = 0; /* default */ Menu->MenuInfo.Self = *Handle;

16 years, 8 months

[tkreuzer] 32146: use syscolor brush for menu background, fixes a brush leak.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 6 03:43:15 2008 New Revision: 32146 URL: http://svn.reactos.org/svn/reactos?rev=32146&view=rev Log: use syscolor brush for menu background, fixes a brush leak. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Wed Feb 6 03:43:15 2008 @@ -346,8 +346,7 @@ Menu->MenuInfo.fMask = 0; /* not used */ Menu->MenuInfo.dwStyle = 0; /* FIXME */ Menu->MenuInfo.cyMax = 0; /* default */ - Menu->MenuInfo.hbrBack = - NtGdiCreateSolidBrush(RGB(192, 192, 192), 0); /* FIXME: default background color */ + Menu->MenuInfo.hbrBack = IntGetSysColorBrush(COLOR_MENU); Menu->MenuInfo.dwContextHelpID = 0; /* default */ Menu->MenuInfo.dwMenuData = 0; /* default */ Menu->MenuInfo.Self = *Handle; @@ -1995,7 +1994,7 @@ Rect.top += YMove; Rect.right += XMove; Rect.bottom += YMove; - + Status = MmCopyToCaller(lprcItem, &Rect, sizeof(RECT)); if (! NT_SUCCESS(Status)) {

16 years, 8 months

[cfinck] 32145: - Move each VGA font file to a new "media/vgafonts" directory and convert all PSF fonts to BIN files. - Add a line to the autogenerated Makefile for Boot-CDs, which creates a "vgafonts.cab" file from the binary fonts at build time. - Change blue.sys to read the fonts from the "vgafonts.cab" file instead of the "vgafont.bin" (ZIP format) file. I dropped support for PSF fonts in blue.sys, because with the vgafontedit app, we can easily convert PSF fonts to BIN fonts now. If someone

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Feb 5 22:31:05 2008 New Revision: 32145 URL: http://svn.reactos.org/svn/reactos?rev=32145&view=rev Log: - Move each VGA font file to a new "media/vgafonts" directory and convert all PSF fonts to BIN files. - Add a line to the autogenerated Makefile for Boot-CDs, which creates a "vgafonts.cab" file from the binary fonts at build time. - Change blue.sys to read the fonts from the "vgafonts.cab" file instead of the "vgafont.bin" (ZIP format) file. I dropped support for PSF fonts in blue.sys, because with the vgafontedit app, we can easily convert PSF fonts to BIN fonts now. If someone still needs this format in blue.sys, I can reimplement it. Added: trunk/reactos/media/vgafonts/ trunk/reactos/media/vgafonts/737-8x8.bin (with props) trunk/reactos/media/vgafonts/775-8x8.bin (with props) trunk/reactos/media/vgafonts/850-8x8.bin (with props) trunk/reactos/media/vgafonts/852-8x8.bin (with props) trunk/reactos/media/vgafonts/865-8x8.bin (with props) trunk/reactos/media/vgafonts/866-8x8.bin (with props) trunk/reactos/media/vgafonts/readme.txt - copied unchanged from r32136, trunk/reactos/media/vgafont/readme.txt Removed: trunk/reactos/media/vgafont/ Modified: trunk/reactos/drivers/setup/blue/blue.h trunk/reactos/drivers/setup/blue/font.c trunk/reactos/media/media.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/drivers/setup/blue/blue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.h?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.h (original) +++ trunk/reactos/drivers/setup/blue/blue.h Tue Feb 5 22:31:05 2008 @@ -7,8 +7,6 @@ */ /* DEFINITIONS ***************************************************************/ - -#define BUFFER_SIZE 260 #include <string.h> #include <stdio.h> @@ -20,20 +18,34 @@ #define TAG_BLUE TAG('B', 'L', 'U', 'E') -#include <pshpack1.h> -typedef struct { - short Version; - short GeneralPurposeBitFlag; - short CompressionMethod; - short LastModFileTime; - short LastModFileDate; - int CRC32; - int CompressedSize; - int UncompressedSize; - short FileNameLength; - short ExtraFieldLength; -} ZIP_LOCAL_HEADER; -#include <poppack.h> +typedef struct _CFHEADER +{ + ULONG Signature; // File signature 'MSCF' (CAB_SIGNATURE) + ULONG Reserved1; // Reserved field + ULONG CabinetSize; // Cabinet file size + ULONG Reserved2; // Reserved field + ULONG FileTableOffset; // Offset of first CFFILE + ULONG Reserved3; // Reserved field + USHORT Version; // Cabinet version (CAB_VERSION) + USHORT FolderCount; // Number of folders + USHORT FileCount; // Number of files + USHORT Flags; // Cabinet flags (CAB_FLAG_*) + USHORT SetID; // Cabinet set id + USHORT CabinetNumber; // Zero-based cabinet number +} CFHEADER, *PCFHEADER; + +typedef struct _CFFILE +{ + ULONG FileSize; // Uncompressed file size in bytes + ULONG FileOffset; // Uncompressed offset of file in the folder + USHORT FileControlID; // File control ID (CAB_FILE_*) + USHORT FileDate; // File date stamp, as used by DOS + USHORT FileTime; // File time stamp, as used by DOS + USHORT Attributes; // File attributes (CAB_ATTRIB_*) + /* After this is the NULL terminated filename */ +} CFFILE, *PCFFILE; + +#define CAB_SIGNATURE 0x4643534D // "MSCF" #define VIDMEM_BASE 0xb8000 #define BITPLANE_BASE 0xa0000 Modified: trunk/reactos/drivers/setup/blue/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/font.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/font.c (original) +++ trunk/reactos/drivers/setup/blue/font.c Tue Feb 5 22:31:05 2008 @@ -43,7 +43,7 @@ Status = ExtractFont(CodePage, FontBitfield); if (NT_SUCCESS(Status)) LoadFont(Bitplane, FontBitfield); - + MmUnmapIoSpace(Bitplane, 0xFFFF); ExFreePool(FontBitfield); @@ -56,27 +56,22 @@ NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField) { + BOOLEAN bFoundFile = FALSE; HANDLE Handle; - NTSTATUS Status = STATUS_SUCCESS; - CHAR FileHeader[5]; - CHAR Header[5]; - CHAR PsfHeader[3]; - CHAR FileName[BUFFER_SIZE]; - ULONG Length; + NTSTATUS Status; + CHAR FileName[20]; IO_STATUS_BLOCK IoStatusBlock; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING LinkName; UNICODE_STRING SourceName; - ZIP_LOCAL_HEADER LocalHeader; + CFHEADER CabFileHeader; + CFFILE CabFile; + ULONG CabFileOffset = 0; LARGE_INTEGER ByteOffset; WCHAR SourceBuffer[MAX_PATH] = {L'\0'}; if(KeGetCurrentIrql() != PASSIVE_LEVEL) - return STATUS_INVALID_DEVICE_STATE; - - RtlZeroMemory(FileHeader, sizeof(FileHeader)); - RtlZeroMemory(Header, sizeof(Header)); - RtlZeroMemory(PsfHeader, sizeof(PsfHeader)); + return STATUS_INVALID_DEVICE_STATE; RtlInitUnicodeString(&LinkName, L"\\SystemRoot"); @@ -100,10 +95,10 @@ Status = ZwQuerySymbolicLinkObject(Handle, &SourceName, - &Length); + NULL); ZwClose(Handle); - Status = RtlAppendUnicodeToString(&SourceName, L"\\vgafont.bin"); + Status = RtlAppendUnicodeToString(&SourceName, L"\\vgafonts.cab"); InitializeObjectAttributes(&ObjectAttributes, &SourceName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); @@ -118,82 +113,78 @@ NULL, 0); ByteOffset.LowPart = ByteOffset.HighPart = 0; + if(NT_SUCCESS(Status)) { - sprintf(Header, "PK%c%c", 3, 4); Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - FileHeader, 4, &ByteOffset, NULL); - ByteOffset.LowPart += 4; + &CabFileHeader, sizeof(CabFileHeader), &ByteOffset, NULL); + if(NT_SUCCESS(Status)) { - while(strcmp(FileHeader, Header) == 0) + if(CabFileHeader.Signature == CAB_SIGNATURE) { - Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - &LocalHeader, sizeof(ZIP_LOCAL_HEADER), &ByteOffset, NULL); - ByteOffset.LowPart += sizeof(ZIP_LOCAL_HEADER); - /* DbgPrint("%ld\n", LocalHeader.FileNameLength); */ - if (LocalHeader.FileNameLength < BUFFER_SIZE) + // We have a valid CAB file! + // Read the file table now and decrement the file count on every file. When it's zero, we read the complete table. + ByteOffset.LowPart = CabFileHeader.FileTableOffset; + + while(CabFileHeader.FileCount) { - RtlZeroMemory(FileName, BUFFER_SIZE); Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - FileName, LocalHeader.FileNameLength, &ByteOffset, NULL); - } - ByteOffset.LowPart += LocalHeader.FileNameLength; - /* DbgPrint("%s\n", FileName); */ - if (LocalHeader.ExtraFieldLength > 0) - ByteOffset.LowPart += LocalHeader.ExtraFieldLength; - if (atoi(FileName) == CodePage) - { - if (LocalHeader.CompressedSize == 2048) + &CabFile, sizeof(CabFile), &ByteOffset, NULL); + + if(NT_SUCCESS(Status)) { - /* we got it, raw font */ + ByteOffset.LowPart += sizeof(CabFile); + + // We assume here that the file name is max. 19 characters (+ 1 NULL character) long. + // This should be enough for our purpose. Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - FontBitField, LocalHeader.CompressedSize, &ByteOffset, NULL); - ZwClose(Handle); - return STATUS_SUCCESS; - } - else if (LocalHeader.CompressedSize > 2048) - { - sprintf(PsfHeader, "%c%c", 0x36, 0x04); - /* maybe linux psf format */ - Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - FileHeader, 4, &ByteOffset, NULL); - ByteOffset.LowPart += 4; - if(strncmp(FileHeader, PsfHeader, 2) == 0) + FileName, sizeof(FileName), &ByteOffset, NULL); + + if(NT_SUCCESS(Status)) { - /* only load fonts with a size of 8 - and filemode 0 (256 characters, no unicode_data) - or filemode 2 (256 characters, unicode_data is skipped) */ - if ((FileHeader[3] == 8) && ((FileHeader[4] == 0) || (FileHeader[4] == 2))) + if(!bFoundFile && atoi(FileName) == CodePage) { - Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - FontBitField, 2048, &ByteOffset, NULL); - ZwClose(Handle); - return STATUS_SUCCESS; + // We got the correct file. + // Save the offset and loop through the rest of the file table to find the position, where the actual data starts. + CabFileOffset = CabFile.FileOffset; + bFoundFile = TRUE; } - else - DbgPrint("Wrong fontsize or too many characters"); + + ByteOffset.LowPart += strlen(FileName) + 1; } } - /* invalid data */ - ZwClose(Handle); - return STATUS_NO_MATCH; + + CabFileHeader.FileCount--; } - ByteOffset.LowPart += LocalHeader.CompressedSize; + + // 8 = Size of a CFFOLDER structure (see cabman). As we don't need the values of that structure, just increase the offset here. + ByteOffset.LowPart += 8; + ByteOffset.LowPart += CabFileOffset; + + // ByteOffset now contains the offset of the actual data, so we can read the RAW font Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - FileHeader, 4, &ByteOffset, NULL); - ByteOffset.LowPart += 4; - /* DbgPrint("%s\n", FileHeader); */ + FontBitField, 2048, &ByteOffset, NULL); + ZwClose(Handle); + return STATUS_SUCCESS; + } + else + { + DPRINT1("Error: CAB signature is missing!\n"); + Status = STATUS_UNSUCCESSFUL; } } + else + DPRINT1("Error: Cannot read from file\n"); + ZwClose(Handle); + return Status; } else { - DbgPrint("Error: Can not open vgafont.bin\n"); + DPRINT1("Error: Cannot open vgafonts.cab\n"); return Status; } - return STATUS_NO_MATCH; } /* Font-load specific funcs */ Modified: trunk/reactos/media/media.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/media.rbuild?rev=321… ============================================================================== --- trunk/reactos/media/media.rbuild (original) +++ trunk/reactos/media/media.rbuild Tue Feb 5 22:31:05 2008 @@ -13,7 +13,4 @@ <directory name="nls"> <xi:include href="nls/nls.rbuild" /> </directory> - <directory name="vgafont"> - <xi:include href="vgafont/vgafont.rbuild" /> - </directory> </group> Added: trunk/reactos/media/vgafonts/737-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/737-8x8.bin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/vgafonts/737-8x8.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/vgafonts/775-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/775-8x8.bin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/vgafonts/775-8x8.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/vgafonts/850-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/850-8x8.bin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/vgafonts/850-8x8.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/vgafonts/852-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/852-8x8.bin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/vgafonts/852-8x8.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/vgafonts/865-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/865-8x8.bin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/vgafonts/865-8x8.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/vgafonts/866-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/866-8x8.bin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/vgafonts/866-8x8.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Feb 5 22:31:05 2008 @@ -3851,6 +3851,13 @@ FileLocation reactosInf ( bootcdReactos.directory, bootcdReactos.relative_path, "reactos.inf" ); + FileLocation vgafontsCab( bootcdReactos.directory, + bootcdReactos.relative_path, + "vgafonts.cab"); + FileLocation vgafontsDir( SourceDirectory, + "media" + sSep + "vgafonts", + "" ); + vSourceFiles.push_back ( reactosDff ); string IsoName; @@ -3879,6 +3886,10 @@ cdFiles.c_str (), cdDirectories.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); + fprintf ( fMakefile, + "\t$(Q)$(CABMAN_TARGET) -M raw -S %s %s\\*.bin\n", // Escape the asterisk for Make + backend->GetFullName ( vgafontsCab ).c_str (), + backend->GetFullName ( vgafontsDir ).c_str ()); fprintf ( fMakefile, "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", backend->GetFullName ( reactosDff ).c_str (),

16 years, 8 months

[dchapyshev] 32144: - Fix typo

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Feb 5 22:27:03 2008 New Revision: 32144 URL: http://svn.reactos.org/svn/reactos?rev=32144&view=rev Log: - Fix typo Modified: trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Modified: trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc Tue Feb 5 22:27:03 2008 @@ -74,6 +74,7 @@ IDS_UNSUPPORTEDPSF, "Nieobs³ugiwana wersja PSF! Edytor obs³uguje wy³¹cznie czcionki rozmiaru 8x8, bez dodatków." IDS_DOCNAME, "Czcionka %1!u!" IDS_SAVEPROMPT, "Plik ""%1"" zosta³ zmieniony, ale nie zapisany.\n\nCzy chcesz zapisaæ zmiany?" + IDS_APPTITLE, "ReactOS VGA Font Editor" IDS_TOOLTIP_NEW, "Nowy" IDS_TOOLTIP_OPEN, "Otwórz" Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Tue Feb 5 22:27:03 2008 @@ -74,6 +74,7 @@ IDS_UNSUPPORTEDPSF, "Íåï³äòðèìóâàíèé ôîðìàò PSF øðèôòà! Ðåäàêòîð ï³äòðèìóº ò³ëüêè øðèôòè 8x8 áåç ñïåö³àëüíèõ ðåæèì³â." IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéë ""%1"" áóâ çì³íåíèé, àëå íå çáåðåæåíèé.\n\nÇáåðåãòè éîãî?" + IDS_APPTITLE, "ReactOS VGA Font Editor" IDS_TOOLTIP_NEW, "Ñòâîðèòè" IDS_TOOLTIP_OPEN, "Â³äêðèòè"

16 years, 8 months

[cfinck] 32143: Fix the usetup text screen (broken in r32135)

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Feb 5 22:22:14 2008 New Revision: 32143 URL: http://svn.reactos.org/svn/reactos?rev=32143&view=rev Log: Fix the usetup text screen (broken in r32135) Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Tue Feb 5 22:22:14 2008 @@ -430,7 +430,7 @@ // // Perform architecture-specific pre-boot configuration // - MachPrepareForReactOS(FALSE); + MachPrepareForReactOS(TRUE); // // Setup paging and jump to kernel

16 years, 8 months

← Newer
1
...
36
37
38
39
40
41
42
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008