Ros-diffs November 2006

ros-diffs@reactos.org

16 participants
324 discussions

[ion] 24968: - Properly fix boot/build.
by ion＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: ion Date: Wed Nov 29 20:35:15 2006 New Revision: 24968 URL: http://svn.reactos.org/svn/reactos?rev=24968&view=rev Log: - Properly fix boot/build. Added: trunk/reactos/hal/halx86/mp/halinit.c Modified: trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/mp/halmp.rbuild Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Wed Nov 29 20:35:15 2006 @@ -9,7 +9,6 @@ <file>cmos.c</file> <file>dma.c</file> <file>drive.c</file> - <file>halinit.c</file> <file>misc.c</file> <file>pci.c</file> <file>portio.c</file> @@ -26,6 +25,7 @@ <define name="_NTHAL_" /> <define name="__USE_W32API" /> <file>irql.c</file> + <file>halinit.c</file> <file>processor.c</file> <file>spinlock.c</file> </module> Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Wed Nov 29 20:35:15 2006 @@ -93,7 +93,7 @@ } /* Initialize the PICs */ - //HalpInitPICs(); + HalpInitPICs(); /* Force initial PIC state */ KfRaiseIrql(KeGetCurrentIrql()); Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c (original) +++ trunk/reactos/hal/halx86/generic/timer.c Wed Nov 29 20:35:15 2006 @@ -116,7 +116,7 @@ /* Normalize between our minimum (1 ms) and maximum (variable) setting */ if (Increment > HalpLargestClockMS) Increment = HalpLargestClockMS; - if (Increment < 0) Increment = 1; + if (Increment <= 0) Increment = 1; /* Set the rate and tell HAL we want to change it */ HalpNextMSRate = Increment; Added: trunk/reactos/hal/halx86/mp/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halinit.c?re… ============================================================================== --- trunk/reactos/hal/halx86/mp/halinit.c (added) +++ trunk/reactos/hal/halx86/mp/halinit.c Wed Nov 29 20:35:15 2006 @@ -1,0 +1,153 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/halinit.c + * PURPOSE: HAL Entrypoint and Initialization + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +HALP_HOOKS HalpHooks; +BOOLEAN HalpPciLockSettings; + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PCHAR CommandLine; + + /* Make sure we have a loader block and command line */ + if ((LoaderBlock) && (LoaderBlock->LoadOptions)) + { + /* Read the command line */ + CommandLine = LoaderBlock->LoadOptions; + + /* Check if PCI is locked */ + if (strstr(CommandLine, "PCILOCK")) HalpPciLockSettings = TRUE; + + /* Check for initial breakpoint */ + if (strstr(CommandLine, "BREAK")) DbgBreakPoint(); + } +} + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +BOOLEAN +NTAPI +HalInitSystem(IN ULONG BootPhase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Check the boot phase */ + if (!BootPhase) + { + /* Phase 0... save bus type */ + HalpBusType = LoaderBlock->u.I386.MachineType & 0xFF; + + /* Get command-line parameters */ + HalpGetParameters(LoaderBlock); + + /* Checked HAL requires checked kernel */ +#if DBG + if (!(Prcb->BuildType & PRCB_BUILD_DEBUG)) + { + /* No match, bugcheck */ + KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 1, 0); + } +#else + /* Release build requires release HAL */ + if (Prcb->BuildType & PRCB_BUILD_DEBUG) + { + /* No match, bugcheck */ + KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0); + } +#endif + +#ifdef CONFIG_SMP + /* SMP HAL requires SMP kernel */ + if (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) + { + /* No match, bugcheck */ + KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0); + } +#endif + + /* Validate the PRCB */ + if (Prcb->MajorVersion != PRCB_MAJOR_VERSION) + { + /* Validation failed, bugcheck */ + KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0); + } + + /* Initialize the PICs */ + HalpInitPICs(); + + /* Force initial PIC state */ + KfRaiseIrql(KeGetCurrentIrql()); + + /* Initialize the clock */ + HalpInitializeClock(); + + /* Setup busy waiting */ + //HalpCalibrateStallExecution(); + + /* Fill out the dispatch tables */ + HalQuerySystemInformation = HaliQuerySystemInformation; + HalSetSystemInformation = HaliSetSystemInformation; + HalInitPnpDriver = NULL; // FIXME: TODO + HalGetDmaAdapter = HalpGetDmaAdapter; + HalGetInterruptTranslator = NULL; // FIXME: TODO + + /* Initialize the hardware lock (CMOS) */ + KeInitializeSpinLock(&HalpSystemHardwareLock); + } + else if (BootPhase == 1) + { + /* Initialize the default HAL stubs for bus handling functions */ + HalpInitNonBusHandler(); + + /* Enable the clock interrupt */ + ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset = + (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[0x30].Offset = + (USHORT)HalpClockInterrupt; + HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched); + + /* Initialize DMA. NT does this in Phase 0 */ + HalpInitDma(); + } + + /* All done, return */ + return TRUE; +} + +/* + * @unimplemented + */ +VOID +NTAPI +HalReportResourceUsage(VOID) +{ + /* Initialize PCI bus. */ + HalpInitializePciBus(); + + /* FIXME: This is done in ReactOS MP HAL only*/ + //HaliReconfigurePciInterrupts(); + + /* FIXME: Report HAL Usage to kernel */ +} + +/* EOF */ Modified: trunk/reactos/hal/halx86/mp/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halmp.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/mp/halmp.rbuild (original) +++ trunk/reactos/hal/halx86/mp/halmp.rbuild Wed Nov 29 20:35:15 2006 @@ -11,6 +11,7 @@ <library>hal_generic_pc</library> <library>ntoskrnl</library> <file>apic.c</file> + <file>halinit.c</file> <file>halinit_mp.c</file> <file>ioapic.c</file> <file>ipi_mp.c</file>

1 0

[cwittich] 24967: skip binutils detection when no build date is returned (fix linux build)
by cwittich＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: cwittich Date: Wed Nov 29 18:55:17 2006 New Revision: 24967 URL: http://svn.reactos.org/svn/reactos?rev=24967&view=rev Log: skip binutils detection when no build date is returned (fix linux build) Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Wed Nov 29 18:55:17 2006 @@ -760,6 +760,14 @@ MingwBackend::IsSupportedBinutilsVersion ( const string& binutilsVersion ) { if ( manualBinutilsSetting ) return true; + + /* linux */ + if ( binutilsVersion.find('.') != std::string::npos ) + { + /* TODO: blacklist versions on version number instead of date */ + return true; + } + if ( ( ( strcmp ( binutilsVersion.c_str (), "20040902") >= 0 ) && ( strcmp ( binutilsVersion.c_str (), "20041008") <= 0 ) ) || ( strcmp ( binutilsVersion.c_str (), "20031001") < 0 ) )

1 0

[janderwald] 24966: - fix build (commenting out calls)
by janderwald＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: janderwald Date: Wed Nov 29 15:36:33 2006 New Revision: 24966 URL: http://svn.reactos.org/svn/reactos?rev=24966&view=rev Log: - fix build (commenting out calls) Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halinit_xb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c Wed Nov 29 15:36:33 2006 @@ -26,7 +26,7 @@ HalpInitPICs(); /* Setup busy waiting */ - HalpCalibrateStallExecution(); + //HalpCalibrateStallExecution(); HalpXboxInitPartIo(); }

1 0

[janderwald] 24965: - fix build (commenting out calls)
by janderwald＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: janderwald Date: Wed Nov 29 13:19:00 2006 New Revision: 24965 URL: http://svn.reactos.org/svn/reactos?rev=24965&view=rev Log: - fix build (commenting out calls) Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/hal/halx86/mp/processor_mp.c Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Wed Nov 29 13:19:00 2006 @@ -93,7 +93,7 @@ } /* Initialize the PICs */ - HalpInitPICs(); + //HalpInitPICs(); /* Force initial PIC state */ KfRaiseIrql(KeGetCurrentIrql()); Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=2… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c (original) +++ trunk/reactos/hal/halx86/mp/apic.c Wed Nov 29 13:19:00 2006 @@ -871,7 +871,7 @@ * for a wraparound to start exact measurement: * (the current tick might have been already half done) */ - WaitFor8254Wraparound(); + //WaitFor8254Wraparound(); /* * We wrapped around just now. Let's start @@ -882,7 +882,7 @@ } tt1 = APICRead(APIC_CCRT); - WaitFor8254Wraparound(); + //WaitFor8254Wraparound(); tt2 = APICRead(APIC_CCRT); Modified: trunk/reactos/hal/halx86/mp/processor_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/processor_mp… ============================================================================== --- trunk/reactos/hal/halx86/mp/processor_mp.c (original) +++ trunk/reactos/hal/halx86/mp/processor_mp.c Wed Nov 29 13:19:00 2006 @@ -52,7 +52,7 @@ OnlineCPUs |= (1 << CPU); /* Setup busy waiting */ - HalpCalibrateStallExecution(); + //HalpCalibrateStallExecution(); } BOOLEAN STDCALL

1 0

[ion] 24964: - Fixup all the file headers with proper paths and authors. - Move sysbus.c contents (a 4 line function) into bus.c. - Unify initialization code. - Delete and disable stall execution calibration (currently using the default). Will implement later in a more precise manner (this routine was bizarly setting the MHz of the CPU in the PRCB in some cases...).
by ion＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: ion Date: Wed Nov 29 11:28:20 2006 New Revision: 24964 URL: http://svn.reactos.org/svn/reactos?rev=24964&view=rev Log: - Fixup all the file headers with proper paths and authors. - Move sysbus.c contents (a 4 line function) into bus.c. - Unify initialization code. - Delete and disable stall execution calibration (currently using the default). Will implement later in a more precise manner (this routine was bizarly setting the MHz of the CPU in the PRCB in some cases...). Removed: trunk/reactos/hal/halx86/generic/sysbus.c Modified: trunk/reactos/hal/halx86/generic/beep.c trunk/reactos/hal/halx86/generic/bus.c trunk/reactos/hal/halx86/generic/cmos.c trunk/reactos/hal/halx86/generic/display.c trunk/reactos/hal/halx86/generic/drive.c trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/generic/pci.c trunk/reactos/hal/halx86/generic/portio.c trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/hal/halx86/generic/reboot.c trunk/reactos/hal/halx86/generic/spinlock.c trunk/reactos/hal/halx86/generic/sysinfo.c trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/up/halinit_up.c trunk/reactos/ntoskrnl/ke/i386/clock.S Modified: trunk/reactos/hal/halx86/generic/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/beep.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/beep.c (original) +++ trunk/reactos/hal/halx86/generic/beep.c Wed Nov 29 11:28:20 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/x86/beep.c + * FILE: hal/halx86/generic/beep.c * PURPOSE: Speaker support (beeping) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) Modified: trunk/reactos/hal/halx86/generic/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus.c (original) +++ trunk/reactos/hal/halx86/generic/bus.c Wed Nov 29 11:28:20 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/halx86/generic/bus.c + * FILE: hal/halx86/generic/bus.c * PURPOSE: Bus Support Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ @@ -63,6 +63,20 @@ return TRUE; } +ULONG +NTAPI +HalpGetSystemInterruptVector(IN ULONG BusNumber, + IN ULONG BusInterruptLevel, + IN ULONG BusInterruptVector, + OUT PKIRQL Irql, + OUT PKAFFINITY Affinity) +{ + ULONG Vector = IRQ2VECTOR(BusInterruptVector); + *Irql = (KIRQL)VECTOR2IRQL(Vector); + *Affinity = 0xFFFFFFFF; + return Vector; +} + VOID NTAPI HalpInitNonBusHandler(VOID) Modified: trunk/reactos/hal/halx86/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/cmos.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/cmos.c (original) +++ trunk/reactos/hal/halx86/generic/cmos.c Wed Nov 29 11:28:20 2006 @@ -1,9 +1,10 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/halx86/generic/cmos.c + * FILE: hal/halx86/generic/cmos.c * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/hal/halx86/generic/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/display… ============================================================================== --- trunk/reactos/hal/halx86/generic/display.c (original) +++ trunk/reactos/hal/halx86/generic/display.c Wed Nov 29 11:28:20 2006 @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS HA: + * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/halx86/generic/display.c + * FILE: hal/halx86/generic/display.c * PURPOSE: Screen Display Routines, now useless since NT 5.1+ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ @@ -11,7 +11,7 @@ #include <debug.h> #include <ndk/inbvfuncs.h> -/* PUBLIC FUNCTIONS *********************************************************/ +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented Modified: trunk/reactos/hal/halx86/generic/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/drive.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/drive.c (original) +++ trunk/reactos/hal/halx86/generic/drive.c Wed Nov 29 11:28:20 2006 @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS HA: + * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/halx86/drive.c + * FILE: hal/halx86/generic/drive.c * PURPOSE: I/O HAL Routines for Disk Access * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Wed Nov 29 11:28:20 2006 @@ -14,7 +14,6 @@ <file>pci.c</file> <file>portio.c</file> <file>reboot.c</file> - <file>sysbus.c</file> <file>sysinfo.c</file> <file>timer.c</file> <file>systimer.S</file> Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Wed Nov 29 11:28:20 2006 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/halx86/generic/processor.c - * PURPOSE: HAL Processor Routines + * FILE: hal/halx86/generic/halinit.c + * PURPOSE: HAL Entrypoint and Initialization * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ @@ -92,8 +92,17 @@ KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0); } - /* Continue with HAL-specific initialization */ - HalpInitPhase0(LoaderBlock); + /* Initialize the PICs */ + HalpInitPICs(); + + /* Force initial PIC state */ + KfRaiseIrql(KeGetCurrentIrql()); + + /* Initialize the clock */ + HalpInitializeClock(); + + /* Setup busy waiting */ + //HalpCalibrateStallExecution(); /* Fill out the dispatch tables */ HalQuerySystemInformation = HaliQuerySystemInformation; @@ -110,8 +119,12 @@ /* Initialize the default HAL stubs for bus handling functions */ HalpInitNonBusHandler(); - /* Initialize the clock interrupt */ - HalpInitPhase1(); + /* Enable the clock interrupt */ + ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset = + (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[0x30].Offset = + (USHORT)HalpClockInterrupt; + HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched); /* Initialize DMA. NT does this in Phase 0 */ HalpInitDma(); @@ -122,7 +135,7 @@ } /* - * @implemented + * @unimplemented */ VOID NTAPI @@ -137,5 +150,4 @@ /* FIXME: Report HAL Usage to kernel */ } - /* EOF */ Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c (original) +++ trunk/reactos/hal/halx86/generic/misc.c Wed Nov 29 11:28:20 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/halx86/misc.c + * FILE: hal/halx86/generic/misc.c * PURPOSE: Miscellanous Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) Modified: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c (original) +++ trunk/reactos/hal/halx86/generic/pci.c Wed Nov 29 11:28:20 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/halx86/generic/pci.c + * FILE: hal/halx86/generic/pci.c * PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/generic/portio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/portio.… ============================================================================== --- trunk/reactos/hal/halx86/generic/portio.c (original) +++ trunk/reactos/hal/halx86/generic/portio.c Wed Nov 29 11:28:20 2006 @@ -1,10 +1,10 @@ /* -* PROJECT: ReactOS HAL -* LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/hal/x86/portio.c -* PURPOSE: I/O Functions for access to ports -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -*/ + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/portio.c + * PURPOSE: I/O Functions for access to ports + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c (original) +++ trunk/reactos/hal/halx86/generic/processor.c Wed Nov 29 11:28:20 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/halx86/generic/processor.c + * FILE: hal/halx86/up/processor.c * PURPOSE: HAL Processor Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c (original) +++ trunk/reactos/hal/halx86/generic/reboot.c Wed Nov 29 11:28:20 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/x86/reboot.c + * FILE: hal/halx86/generic/reboot.c * PURPOSE: Reboot functions * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) Modified: trunk/reactos/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinloc… ============================================================================== --- trunk/reactos/hal/halx86/generic/spinlock.c (original) +++ trunk/reactos/hal/halx86/generic/spinlock.c Wed Nov 29 11:28:20 2006 @@ -1,12 +1,12 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/halx86/up/spinlock.c - * PURPOSE: Implements spinlocks - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ****************************************************************/ + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/up/spinlock.c + * PURPOSE: Spinlock and Queued Spinlock Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ #include <hal.h> #define NDEBUG @@ -17,7 +17,7 @@ #undef KeLowerIrql #undef KeRaiseIrql -/* FUNCTIONS ***************************************************************/ +/* FUNCTIONS *****************************************************************/ /* * @implemented @@ -199,5 +199,4 @@ return TRUE; } - /* EOF */ Removed: trunk/reactos/hal/halx86/generic/sysbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysbus.… ============================================================================== --- trunk/reactos/hal/halx86/generic/sysbus.c (original) +++ trunk/reactos/hal/halx86/generic/sysbus.c (removed) @@ -1,34 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/sysbus.c - * PURPOSE: System bus handler functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - * UPDATE HISTORY: - * 09/04/2000 Created - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -ULONG -NTAPI -HalpGetSystemInterruptVector(ULONG BusNumber, - ULONG BusInterruptLevel, - ULONG BusInterruptVector, - PKIRQL Irql, - PKAFFINITY Affinity) -{ - ULONG Vector = IRQ2VECTOR(BusInterruptVector); - *Irql = (KIRQL)VECTOR2IRQL(Vector); - *Affinity = 0xFFFFFFFF; - return Vector; -} - -/* EOF */ Modified: trunk/reactos/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halx86/generic/sysinfo.c (original) +++ trunk/reactos/hal/halx86/generic/sysinfo.c Wed Nov 29 11:28:20 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HA: * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/hal/halx86/generic/sysinfo.c + * FILE: hal/halx86/generic/sysinfo.c * PURPOSE: HAL Information Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Wed Nov 29 11:28:20 2006 @@ -236,7 +236,6 @@ /* Exit the interrupt */ add esp, 8 - mov esi, $ jmp _Kei386EoiHelper@0 .endfunc Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c (original) +++ trunk/reactos/hal/halx86/generic/timer.c Wed Nov 29 11:28:20 2006 @@ -1,48 +1,16 @@ /* - * ReactOS kernel - * Copyright (C) 2000 David Welch <welch(a)cwcom.net> - * Copyright (C) 1999 Gareth Owen <gaz(a)athene.co.uk>, Ramon von Handel - * Copyright (C) 1991, 1992 Linus Torvalds - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - */ -/* $Id$ - * - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/udelay.c - * PURPOSE: Busy waiting - * PROGRAMMER: David Welch (david.welch(a)seh.ox.ac.uk) - * UPDATE HISTORY: - * 06/11/99 Created + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/timer.c + * PURPOSE: HAL Timer Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES ***************************************************************/ +/* INCLUDES ******************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> - -/* GLOBALS ******************************************************************/ - -#define MILLISEC 10 /* Number of millisec between interrupts */ -#define HZ (1000 / MILLISEC) /* Number of interrupts per second */ -#define CLOCK_TICK_RATE 1193182 /* Clock frequency of the timer chip */ -#define LATCH (CLOCK_TICK_RATE / HZ) /* Count to program into the timer chip */ -#define PRECISION 8 /* Number of bits to calibrate for delay loop */ /* GLOBALS *******************************************************************/ @@ -158,140 +126,4 @@ return HalpRolloverTable[Increment - 1].HighPart; } -/* STUFF *********************************************************************/ - -ULONG -FORCEINLINE -Read8254Timer(VOID) -{ - ULONG Count; - - /* Disable interrupts */ - _disable(); - - /* Set the rollover */ - __outbyte(TIMER_CONTROL_PORT, TIMER_SC0); - Count = __inbyte(TIMER_DATA_PORT0); - Count |= __inbyte(TIMER_DATA_PORT0) << 8; - - /* Restore interrupts and return count*/ - _enable(); - return Count; -} - -VOID WaitFor8254Wraparound(VOID) -{ - ULONG CurCount, PrevCount = ~0; - LONG Delta; - - CurCount = Read8254Timer(); - - do - { - PrevCount = CurCount; - CurCount = Read8254Timer(); - Delta = CurCount - PrevCount; - - /* - * This limit for delta seems arbitrary, but it isn't, it's - * slightly above the level of error a buggy Mercury/Neptune - * chipset timer can cause. - */ - - } - while (Delta < 300); -} - -VOID HalpCalibrateStallExecution(VOID) -{ - ULONG i; - ULONG calib_bit; - ULONG CurCount; - PKIPCR Pcr; - LARGE_INTEGER StartCount, EndCount; - - Pcr = (PKIPCR)KeGetPcr(); - - if (Pcr->PrcbData.FeatureBits & KF_RDTSC) - { - - WaitFor8254Wraparound(); - StartCount.QuadPart = (LONGLONG)__rdtsc(); - - WaitFor8254Wraparound(); - EndCount.QuadPart = (LONGLONG)__rdtsc(); - - Pcr->PrcbData.MHz = (ULONG)(EndCount.QuadPart - StartCount.QuadPart) / 10000; - DPRINT("%luMHz\n", Pcr->PrcbData.MHz); - return; - - } - - DPRINT("Calibrating delay loop... ["); - - /* Stage 1: Coarse calibration */ - - WaitFor8254Wraparound(); - - Pcr->StallScaleFactor = 1; - - do - { - Pcr->StallScaleFactor <<= 1; /* Next delay count to try */ - - WaitFor8254Wraparound(); - - KeStallExecutionProcessor(Pcr->StallScaleFactor); /* Do the delay */ - - CurCount = Read8254Timer(); - } - while (CurCount > LATCH / 2); - - Pcr->StallScaleFactor >>= 1; /* Get bottom value for delay */ - - /* Stage 2: Fine calibration */ - DPRINT("delay_count: %d", Pcr->StallScaleFactor); - - calib_bit = Pcr->StallScaleFactor; /* Which bit are we going to test */ - - for (i = 0; i < PRECISION; i++) - { - calib_bit >>= 1; /* Next bit to calibrate */ - if (!calib_bit) - { - break; /* If we have done all bits, stop */ - } - - Pcr->StallScaleFactor |= calib_bit; /* Set the bit in delay_count */ - - WaitFor8254Wraparound(); - - KeStallExecutionProcessor(Pcr->StallScaleFactor); /* Do the delay */ - - CurCount = Read8254Timer(); - if (CurCount <= LATCH / 2) /* If a tick has passed, turn the */ - { /* calibrated bit back off */ - Pcr->StallScaleFactor &= ~calib_bit; - } - } - - /* We're finished: Do the finishing touches */ - - Pcr->StallScaleFactor /= (MILLISEC / 2); /* Calculate delay_count for 1ms */ - - DPRINT("]\n"); - DPRINT("delay_count: %d\n", Pcr->StallScaleFactor); - DPRINT("CPU speed: %d\n", Pcr->StallScaleFactor / 250); -#if 0 - DbgPrint("About to start delay loop test\n"); - DbgPrint("Waiting for five minutes..."); - for (i = 0; i < (5*60*1000*20); i++) - { - KeStallExecutionProcessor(50); - } - DbgPrint("finished\n"); - for(;;); -#endif -} - /* EOF */ Modified: trunk/reactos/hal/halx86/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halx86/up/halinit_up.c (original) +++ trunk/reactos/hal/halx86/up/halinit_up.c Wed Nov 29 11:28:20 2006 @@ -20,28 +20,13 @@ VOID HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - /* Initialize the PICs */ - HalpInitPICs(); - /* Force initial PIC state */ - KfRaiseIrql(KeGetCurrentIrql()); - - /* Initialize the clock */ - HalpInitializeClock(); - - /* Setup busy waiting */ - HalpCalibrateStallExecution(); } VOID HalpInitPhase1(VOID) { - /* Enable the clock interrupt */ - ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset = - (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[0x30].Offset = - (USHORT)HalpClockInterrupt; - HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched); + } /* EOF */ Modified: trunk/reactos/ntoskrnl/ke/i386/clock.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/clock.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/clock.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/clock.S Wed Nov 29 11:28:20 2006 @@ -241,7 +241,6 @@ Done: /* Exit the interrupt */ - mov esi, $ cli call _HalEndSystemInterrupt@8 jmp _Kei386EoiHelper@0

1 0

[ion] 24963: - Implement a working version of KeQueryPerformanceCounter based on the C implementation (without the strange MHZed-based code) and also support updating the performance timer during a clock interrupt, otherwise the value might become stale during the query. - Update clock interrupt handler to update the performance counter, and also detect if someone changed the clock rate (but don't yet support this). - Test app from previous revision now works beautifully.
by ion＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: ion Date: Wed Nov 29 11:01:58 2006 New Revision: 24963 URL: http://svn.reactos.org/svn/reactos?rev=24963&view=rev Log: - Implement a working version of KeQueryPerformanceCounter based on the C implementation (without the strange MHZed-based code) and also support updating the performance timer during a clock interrupt, otherwise the value might become stale during the query. - Update clock interrupt handler to update the performance counter, and also detect if someone changed the clock rate (but don't yet support this). - Test app from previous revision now works beautifully. Modified: trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/generic/timer.c Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Wed Nov 29 11:01:58 2006 @@ -10,7 +10,13 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix -.extern _HalpCurrentTimeIncrement + +/* GLOBALS *******************************************************************/ + +_HalpLastPerfCounterLow: .long 0 +_HalpLastPerfCounterHigh: .long 0 +_HalpPerfCounterLow: .long 0 +_HalpPerfCounterHigh: .long 0 /* FUNCTIONS *****************************************************************/ @@ -43,6 +49,152 @@ Done: /* Return */ ret 4 +.endfunc + +.global _KeQueryPerformanceCounter@4 +.func KeQueryPerformanceCounter@4 +_KeQueryPerformanceCounter@4: + + /* Check if we were called too early */ + cmp dword ptr _HalpCurrentRollOver, 0 + je NoCount + + /* Save volatiles */ + push ebx + push esi + +LoopPreInt: + + /* Disable interrupts */ + pushf + cli + +LoopPostInt: + + /* Get the current value */ + mov ebx, _HalpPerfCounterLow + mov esi, _HalpPerfCounterHigh + + /* Read 8254 timer */ + mov al, 0 + out 0x43, al + jmp $+2 + in al, 0x40 + jmp $+2 + movzx ecx, al + in al, 0x40 + mov ch, al + + /* Enable interrupts and do a short wait */ + popf + nop + jmp $+2 + + /* Disable them again */ + pushf + cli + + /* Get the counter value again */ + mov eax, _HalpPerfCounterLow + mov edx, _HalpPerfCounterHigh + + /* Check if someone updated the counter */ + cmp eax, ebx + jne LoopPostInt + cmp edx, esi + jne LoopPostInt + + /* Check if the current 8254 value causes rollover */ + neg ecx + add ecx, _HalpCurrentRollOver + jnb DoRollOver + +SetSum: + + /* Calculate the sum */ + add eax, ecx + adc edx, 0 + + /* Check if we're above or below the last high value */ + cmp edx, _HalpLastPerfCounterHigh + jb short BelowHigh + jnz short BelowLow + + /* Check if we're above or below the last low value */ + cmp eax, _HalpLastPerfCounterLow + jb BelowHigh + +BelowLow: + + /* Update the last value and bring back interrupts */ + mov _HalpLastPerfCounterLow, eax + mov _HalpLastPerfCounterHigh, edx + popf + + /* Check if caller wants frequency */ + cmp dword ptr [esp+12], 0 + jz ReturnNoFreq + + /* Save hard-coded frequency */ + mov ecx, dword ptr [esp+12] + mov dword ptr [ecx], 1193182 + mov dword ptr [ecx+4], 0 + +ReturnNoFreq: + + /* Restore volatiles */ + pop esi + pop ebx + ret 4 + +NoCount: + + /* Return empty, called too soon */ + mov eax, 0 + mov edx, 0 + ret 4 + +DoRollOver: + + /* We might have an incoming interrupt, save EFLAGS and reset rollover */ + mov esi, [esp] + mov ecx, _HalpCurrentRollOver + popf + + /* Check if interrupts were enabled and try again */ + test esi, EFLAGS_INTERRUPT_MASK + jnz LoopPreInt + + /* They're not, continue where we left */ + pushf + jmp SetSum + +BelowHigh: + + /* Get the last counter values */ + mov ebx, _HalpLastPerfCounterLow + mov esi, _HalpLastPerfCounterHigh + + /* Check if the previous value was 0 and go back if yes */ + mov ecx, ebx + or ecx, esi + jz BelowLow + + /* Fixup the count with the last known value */ + sub eax, ebx + sbb edx, esi + + /* We might have an incoming interrupt, save EFLAGS */ + mov esi, [esp] + popf + + /* Check if interrupts were enabled and try again */ + test esi, EFLAGS_INTERRUPT_MASK + jnz LoopPreInt + + /* They're not, continue where we left */ + pushf + jmp BelowLow .endfunc .globl _HalpClockInterrupt@0 @@ -66,10 +218,19 @@ or al, al jz Spurious - /* Do a tick */ + /* Update the performance counter */ + xor ebx, ebx + mov eax, _HalpCurrentRollOver + add _HalpPerfCounterLow, eax + adc _HalpPerfCounterHigh, ebx + + /* Get the time increment and check if someone changed the clock rate */ mov eax, _HalpCurrentTimeIncrement - xor ebx, ebx - jmp _KeUpdateSystemTime@0 + cmp _HalpClockSetMSRate, ebx + jz _KeUpdateSystemTime@0 + + /* FIXME: Someone did! */ + int 3 Spurious: Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c (original) +++ trunk/reactos/hal/halx86/generic/timer.c Wed Nov 29 11:01:58 2006 @@ -294,56 +294,4 @@ #endif } -LARGE_INTEGER -STDCALL -KeQueryPerformanceCounter(PLARGE_INTEGER PerformanceFreq) -/* - * FUNCTION: Queries the finest grained running count available in the system - * ARGUMENTS: - * PerformanceFreq (OUT) = The routine stores the number of - * performance counter ticks per second here - * RETURNS: The number of performance counter ticks since boot - */ -{ - PKIPCR Pcr; - LARGE_INTEGER Value; - - _disable(); - - Pcr = (PKIPCR)KeGetPcr(); - - if (Pcr->PrcbData.FeatureBits & KF_RDTSC) - { - _enable(); - if (NULL != PerformanceFreq) - { - PerformanceFreq->QuadPart = Pcr->PrcbData.MHz * (ULONGLONG)1000000; - } - Value.QuadPart = (LONGLONG)__rdtsc(); - } - else - { - LARGE_INTEGER TicksOld; - LARGE_INTEGER TicksNew; - ULONG CountsLeft; - - _enable(); - - if (NULL != PerformanceFreq) - { - PerformanceFreq->QuadPart = CLOCK_TICK_RATE; - } - - do - { - KeQueryTickCount(&TicksOld); - CountsLeft = Read8254Timer(); - Value.QuadPart = TicksOld.QuadPart * LATCH + (LATCH - CountsLeft); - KeQueryTickCount(&TicksNew); - } - while (TicksOld.QuadPart != TicksNew.QuadPart); - } - return Value; -} - /* EOF */

1 0

[ion] 24962: - There's no such thing as Phase 2 HAL init. - Only map the 0x0 physical address in HalpReboot when enabling warm-reboot, there's no need to map it during init and keep it allocated during the whole time.
by ion＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: ion Date: Wed Nov 29 10:32:27 2006 New Revision: 24962 URL: http://svn.reactos.org/svn/reactos?rev=24962&view=rev Log: - There's no such thing as Phase 2 HAL init. - Only map the 0x0 physical address in HalpReboot when enabling warm-reboot, there's no need to map it during init and keep it allocated during the whole time. Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/reboot.c trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Wed Nov 29 10:32:27 2006 @@ -14,7 +14,6 @@ /* GLOBALS *******************************************************************/ -PVOID HalpZeroPageMapping = NULL; HALP_HOOKS HalpHooks; BOOLEAN HalpPciLockSettings; @@ -50,7 +49,6 @@ HalInitSystem(IN ULONG BootPhase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PHYSICAL_ADDRESS Null = {{0}}; PKPRCB Prcb = KeGetCurrentPrcb(); /* Check the boot phase */ @@ -118,10 +116,6 @@ /* Initialize DMA. NT does this in Phase 0 */ HalpInitDma(); } - else if (BootPhase == 2) - { - HalpZeroPageMapping = MmMapIoSpace(Null, PAGE_SIZE, MmNonCached); - } /* All done, return */ return TRUE; Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c (original) +++ trunk/reactos/hal/halx86/generic/reboot.c Wed Nov 29 10:32:27 2006 @@ -28,10 +28,12 @@ HalpReboot(VOID) { UCHAR Data; - extern PVOID HalpZeroPageMapping; + PVOID HalpZeroPageMapping; + PHYSICAL_ADDRESS Null = {{0}}; /* Enable warm reboot */ - ((PUSHORT)HalpZeroPageMapping)[0x472] = 0x1234; + HalpZeroPageMapping = MmMapIoSpace(Null, PAGE_SIZE, MmNonCached); + ((PUSHORT)HalpZeroPageMapping)[0x239] = 0x1234; /* FIXME: Lock CMOS Access */ Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=249… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Wed Nov 29 10:32:27 2006 @@ -840,7 +840,6 @@ if (!NoGuiBoot) InbvDisplayBootLogo(); /* Clear the screen to blue and display the boot notice and debug status */ - HalInitSystem(2, KeLoaderBlock); if (NoGuiBoot) ExpDisplayNotice(); KdInitSystem(2, KeLoaderBlock);

1 0

[ion] 24961: - Test for High-Precision Timer (QueryPeformanceCounter). Verifies everything from the Win32 implementation to system call speed to HAL timer accuracy and functionality. Currently fails.
by ion＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: ion Date: Wed Nov 29 10:31:25 2006 New Revision: 24961 URL: http://svn.reactos.org/svn/reactos?rev=24961&view=rev Log: - Test for High-Precision Timer (QueryPeformanceCounter). Verifies everything from the Win32 implementation to system call speed to HAL timer accuracy and functionality. Currently fails. Added: trunk/reactos/ntoskrnl/tests/TestTimer.c Added: trunk/reactos/ntoskrnl/tests/TestTimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/tests/TestTimer.c… ============================================================================== --- trunk/reactos/ntoskrnl/tests/TestTimer.c (added) +++ trunk/reactos/ntoskrnl/tests/TestTimer.c Wed Nov 29 10:31:25 2006 @@ -1,0 +1,37 @@ +#include <stdio.h> +#include <conio.h> +#include <windows.h> + +void main ( int argc, char** argv, char** environ ) +{ + LARGE_INTEGER liFrequency; + LARGE_INTEGER liStartTime; + LARGE_INTEGER liCurrentTime; + + QueryPerformanceFrequency ( &liFrequency ); + printf ( "HIGH RESOLUTION PERFOMANCE COUNTER Frequency = %I64d CLOCKS IN SECOND\n", + liFrequency.QuadPart ); + + + if (liFrequency.QuadPart == 0) + { + printf("Your computer does not support High Resolution Performance counter\n"); + return; + } + + printf ( "Press <ENTER> to start test...\n" ); + getchar(); + + printf ( "\nPress any key to quit test\n\n" ); + QueryPerformanceCounter ( &liStartTime ); + for (;;) + { + QueryPerformanceCounter ( &liCurrentTime ); + printf("Elapsed Time : %8.6f mSec\r", + ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart )) ); + if (_kbhit()) + break; + } + + +}

1 0

[janderwald] 24960: new / update french translations See issue #1889 for more details.
by janderwald＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: janderwald Date: Wed Nov 29 09:50:14 2006 New Revision: 24960 URL: http://svn.reactos.org/svn/reactos?rev=24960&view=rev Log: new / update french translations See issue #1889 for more details. Modified: trunk/reactos/dll/cpl/timedate/Fr.rc Modified: trunk/reactos/dll/cpl/timedate/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Fr.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Fr.rc (original) +++ trunk/reactos/dll/cpl/timedate/Fr.rc Wed Nov 29 09:50:14 2006 @@ -11,6 +11,7 @@ CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 + CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 11, 37, 108, 80, WS_EX_CLIENTEDGE @@ -62,4 +63,6 @@ IDS_TIMEZONEUNKNOWN "Inconnu" IDS_INETTIMESUCSYNC "L'heure a été synchronisée avec %s le %s à %s" IDS_INETTIMENEXTSYNC "Prochaine synchronisation: %s à %s" + IDS_INETTIMESYNCING "Veuillez patienter pendant que ReactOS synchronise l'heure avec %s" + IDS_INETTIMEERROR "Une erreur a eu lieu pendant que ReactOS synchronisait avec %s" END

1 0

[janderwald] 24959: new / update french translations See issue #1889 for more details.
by janderwald＠svn.reactos.org 29 Nov '06

29 Nov '06

Author: janderwald Date: Wed Nov 29 09:46:16 2006 New Revision: 24959 URL: http://svn.reactos.org/svn/reactos?rev=24959&view=rev Log: new / update french translations See issue #1889 for more details. Added: trunk/reactos/base/applications/control/lang/fr-FR.rc (with props) trunk/reactos/base/applications/devmgmt/lang/fr-FR.rc (with props) trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (with props) trunk/reactos/base/system/userinit/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/control/rsrc.rc trunk/reactos/base/applications/devmgmt/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/ibrowser/fr-FR.rc trunk/reactos/base/applications/notepad/lang/fr-FR.rc trunk/reactos/base/system/userinit/rsrc.rc Added: trunk/reactos/base/applications/control/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/control/lang/fr-FR.rc Wed Nov 29 09:46:16 2006 @@ -1,0 +1,28 @@ +// French language resource file (Heis Spiter, 2006-11-28) + +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Fermer", IDM_CLOSE + END + POPUP "&Affichage" + BEGIN + MENUITEM "Grandes Icônes", IDM_LARGEICONS + MENUITEM "Petites Icônes", IDM_SMALLICONS + MENUITEM "Liste", IDM_LIST + MENUITEM "Détails", IDM_DETAILS + END + POPUP "Aide" + BEGIN + MENUITEM "À propos", IDM_ABOUT + END +END + Propchange: trunk/reactos/base/applications/control/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/control/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/rsrc.rc (original) +++ trunk/reactos/base/applications/control/rsrc.rc Wed Nov 29 09:46:16 2006 @@ -14,6 +14,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fi-FI.rc" +#include "lang/fr-FR.rc" #include "lang/el-GR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" Added: trunk/reactos/base/applications/devmgmt/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/devmgmt/lang/fr-FR.rc Wed Nov 29 09:46:16 2006 @@ -1,0 +1,81 @@ +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Quitter", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Imprimer", IDC_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Propriétés", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Aide", IDC_PROGHELP, GRAYED + END + POPUP "Affichage" + BEGIN + MENUITEM "Périphériques par type", IDC_DEVBYTYPE, CHECKED + MENUITEM "Périphériques par connexion", IDC_STATIC, GRAYED + MENUITEM "Ressources par type", IDC_STATIC, GRAYED + MENUITEM "Ressources par connexion", IDC_STATIC, GRAYED + END + POPUP "Aide" + BEGIN + MENUITEM "Aide", IDC_PROGHELP + MENUITEM "À propos", IDC_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Propriétés", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Aide", IDC_PROGHELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "À propos du Gestionnaire de Périphériques" +FONT 8,"Tahoma",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Gestionnaire de Périphériques v0.1\nCopyright (C) 2006\npar Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 + ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Propriétés" + IDS_TOOLTIP_REFRESH "Actualiser" + IDS_TOOLTIP_HELP "Aide" + IDS_TOOLTIP_EXIT "Quitter" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_EXIT " Quitte le programme." + IDS_HINT_REFRESH " Actualise la liste des services." + IDS_HINT_PROP " Ouvre la feuille de propriétés pour la sélection actuelle." + IDS_HINT_HELP " Affiche la fenêtre d'aide." + IDS_HINT_ABOUT " À propos du Gestionnaire de Périphériques de ReactOS." + + IDS_HINT_SYS_RESTORE " Restaure cette fenêtre à sa taille normale." + IDS_HINT_SYS_MOVE " Bouge cette fenêtre." + IDS_HINT_SYS_SIZE " Redimensionne cette fenêtre." + IDS_HINT_SYS_MINIMIZE " Réduit cette fenêtre à une icône." + IDS_HINT_SYS_MAXIMIZE " Étend cette fenêtre à l'écran." + IDS_HINT_SYS_CLOSE " Ferme cette fenêtre." +END Propchange: trunk/reactos/base/applications/devmgmt/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/rsrc.rc (original) +++ trunk/reactos/base/applications/devmgmt/rsrc.rc Wed Nov 29 09:46:16 2006 @@ -16,3 +16,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" Added: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Wed Nov 29 09:46:16 2006 @@ -1,0 +1,128 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/fr.rc + * PURPOSE: French Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +/* winemaker: #include "afxres.h" */ +/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ +#include "winres.h" + +///// + +#undef APSTUDIO_READONLY_SYMBOLS + +///// +// French resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +#pragma code_page(1252) +#endif //_WIN32 + +///// +// Dialog + +IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Annuler",IDCANCEL,129,24,50,14 +END + + +///// +// DESIGNINFO + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DIALOG1, DIALOGEX + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED + +///// +// TEXTINCLUDE + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///// +// Menu + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Partie" + BEGIN + MENUITEM "&Donne\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Jeux...", IDM_GAME_DECK + MENUITEM "&Options...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Quitter", IDM_GAME_EXIT + END + POPUP "&Aide" + BEGIN + MENUITEM "&Sommaire\tF1", IDM_HELP_CONTENTS + MENUITEM "&À propos", IDM_HELP_ABOUT + END +END + +///// +// Accelerator + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END + + +///// +// Icon + +IDI_ICON1 ICON DISCARDABLE "solitaire.ico" +#endif // French resources + +///// + + +#ifndef APSTUDIO_INVOKED + +///// +#endif // not APSTUDIO_INVOKED Propchange: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Wed Nov 29 09:46:16 2006 @@ -3,5 +3,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/applications/ibrowser/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… ============================================================================== --- trunk/reactos/base/applications/ibrowser/fr-FR.rc (original) +++ trunk/reactos/base/applications/ibrowser/fr-FR.rc Wed Nov 29 09:46:16 2006 @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include <windows.h> - ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,30 +33,8 @@ 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include <windows.h>\r\n" - "\0" + "#include <windows.h>\0" END - -#endif // APSTUDIO_INVOKED - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// French (France) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) -#ifdef _WIN32 -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// 3 TEXTINCLUDE DISCARDABLE BEGIN @@ -77,6 +54,18 @@ #endif // APSTUDIO_INVOKED +#endif // German (Germany) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +#pragma code_page(1252) +#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -87,24 +76,45 @@ BEGIN POPUP "&Fichier" BEGIN - MENUITEM "&Ouvrir", ID_FILE_OPEN - MENUITEM "&Quitter", ID_FILE_EXIT + MENUITEM "&Ouvrir", ID_FILE_OPEN + MENUITEM "&Quitter", ID_FILE_EXIT END POPUP "&Affichage" BEGIN - MENUITEM "Barre d'ou&tils", ID_VIEW_TOOL_BAR - MENUITEM "Pann&eau lat?al", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&Barre d'?at", ID_VIEW_STATUSBAR + MENUITEM "Barre d'ou&tils", ID_VIEW_TOOL_BAR + MENUITEM "Pann&eau latéral", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Barre d'état", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "Actualise&r", ID_REFRESH - MENUITEM "&Plein ?ran", ID_VIEW_FULLSCREEN + MENUITEM "Actualise&r\tF5", ID_REFRESH + MENUITEM "&Plein éran\tCtrl+Shift+S", ID_VIEW_FULLSCREEN END POPUP "&Aide" BEGIN - MENUITEM "&Rubriques d'aide de iBrowser", ID_IBROWSER_FAQ - MENUITEM "? propos de iBrowser...", ID_ABOUT_IBROWSER - MENUITEM "? propos de ReactOS...", ID_ABOUT_WINDOWS + MENUITEM "&FAQ de IBrowser...", ID_IBROWSER_FAQ + MENUITEM "À propos de IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "À propos de React&OS...", ID_ABOUT_WINDOWS END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUT_IBROWSER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Web Browser" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Navigateur internet de Reactos",IDC_ROS_IBROWSER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 END @@ -121,10 +131,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ABOUT_IBROWSER "? propos de iBrowser..." + IDS_ABOUT_IBROWSER "&À propos..." END -#endif // French (France) resources +#endif // French resources ///////////////////////////////////////////////////////////////////////////// @@ -135,7 +145,7 @@ // Generated from the TEXTINCLUDE 3 resource. // #ifndef _ROS_ -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE BEGIN #ifdef UNICODE Modified: trunk/reactos/base/applications/notepad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/notepad/lang/fr-FR.rc Wed Nov 29 09:46:16 2006 @@ -64,12 +64,21 @@ MENUITEM SEPARATOR MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT + MENUITEM "Remplacer\tCtrl+H", CMD_REPLACE + MENUITEM "Atteindre...\tCtrl+G", CMD_GOTO MENUITEM SEPARATOR MENUITEM "Tout &sélectionner\tCtrl+A", CMD_SELECT_ALL MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE + END + POPUP "&Format" + BEGIN MENUITEM SEPARATOR MENUITEM "&Retour à la ligne", CMD_WRAP MENUITEM "&Police...", CMD_FONT + END + POPUP "Affichage" + BEGIN + MENUITEM "Barre d'état", CMD_STATUSBAR END POPUP "&Aide" BEGIN @@ -77,7 +86,7 @@ MENUITEM "&Rechercher...", CMD_HELP_SEARCH MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT + MENUITEM "&À propos" CMD_ABOUT MENUITEM "Inf&o...", CMD_ABOUT_WINE END END @@ -109,6 +118,31 @@ PUSHBUTTON "&Aide", 0x153, 180, 39, 40, 15, WS_TABSTOP } +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOG 0, 0, 256, 44 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Encodage" +{ +COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "Encodage:",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "Fin de lignes:",0x156,5,20,41,12 +} + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOG 0,0,165,50 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Atteindre..." +{ +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "Numéro de ligne:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "Annuler", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +} + IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "About ReactOS Notepad" @@ -118,7 +152,7 @@ -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 CONTROL " ", -1,"Static",0x50000000,8,48,272,11 - DEFPUSHBUTTON "Close",IDOK,114,149,44,15,WS_GROUP + DEFPUSHBUTTON "Fermer",IDOK,114,149,44,15,WS_GROUP ICON IDI_NPICON,-1,12,9,20,30 EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | ES_READONLY | WS_VSCROLL @@ -160,5 +194,12 @@ STRING_OUT_OF_MEMORY, "Pas assez de mémoire pour compléter cette \ tâche. \nFermez une ou plusieurs applications pour libérer\n\ de la mémoire." - -} +STRING_CANNOTFIND "Impossible de trouver '%s'" +STRING_ANSI, "ANSI" +STRING_UNICODE, "Unicode" +STRING_UNICODE_BE, "Unicode (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "Windows" +STRING_LF, "Unix" +STRING_CR, "Mac" +} Added: trunk/reactos/base/system/userinit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/fr-FR.rc (added) +++ trunk/reactos/base/system/userinit/lang/fr-FR.rc Wed Nov 29 09:46:16 2006 @@ -1,0 +1,12 @@ +#include "resource.h" +/* Start move all hard code string to Fr.rc + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +STRINGTABLE DISCARDABLE +{ + +STRING_USERINIT_FAIL, "Userinit a échoué lors du chargement de l'interface (shell)!\n" + +} Propchange: trunk/reactos/base/system/userinit/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… ============================================================================== --- trunk/reactos/base/system/userinit/rsrc.rc (original) +++ trunk/reactos/base/system/userinit/rsrc.rc Wed Nov 29 09:46:16 2006 @@ -13,5 +13,6 @@ #include "lang/el-GR.rc" #include "lang/uk-UA.rc" #include "lang/nb-NO.rc" +#include "lang/fr-FR.rc" LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL

1 0

← Newer
1
2
3
4
5
6
7
8
...
33
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2006