Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 32308: Fix a couple of MMU bugs (incrementing the base address before writing the PTE and using the wrong start base address). Virtual memory now works! FreeLDR now boots into the kernel, at 0x80801000, in KiSystemStartup!
by ros-arm-bringup＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 02:47:43 2008 New Revision: 32308 URL: http://svn.reactos.org/svn/reactos?rev=32308&view=rev Log: Fix a couple of MMU bugs (incrementing the base address before writing the PTE and using the wrong start base address). Virtual memory now works! FreeLDR now boots into the kernel, at 0x80801000, in KiSystemStartup! Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c 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 Tue Feb 12 02:47:43 2008 @@ -191,6 +191,7 @@ LOADER_PARAMETER_BLOCK ArmLoaderBlock; LOADER_PARAMETER_EXTENSION ArmExtension; extern ARM_TRANSLATION_TABLE ArmTranslationTable; +extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; /* FUNCTIONS ******************************************************************/ @@ -232,7 +233,7 @@ FORCEINLINE ArmControlRegisterSet(IN ARM_CONTROL_REGISTER ControlRegister) { - __asm__ __volatile__ ("mcr p15, 0, %0, c1, c0, 0; b ." : : "r"(ControlRegister.AsUlong) : "cc"); + __asm__ __volatile__ ("mcr p15, 0, %0, c1, c0, 0" : : "r"(ControlRegister.AsUlong) : "cc"); } VOID @@ -271,7 +272,6 @@ // TtbRegister.AsUlong = (ULONG)TranslationTable; ASSERT(TtbRegister.Reserved == 0); - TuiPrintf("CP15 C2: %x\n", TtbRegister); ArmMmuTtbSet(TtbRegister); // @@ -279,7 +279,6 @@ // DomainRegister.AsUlong = 0; DomainRegister.Domain0 = ClientDomain; - TuiPrintf("CP15 C3: %x\n", DomainRegister); ArmMmuDomainRegisterSet(DomainRegister); // @@ -296,29 +295,26 @@ Pte.L1.Section.Reserved = 1; // ARM926EJ-S manual recommends setting to 1 Pte.L1.Section.Domain = Domain0; Pte.L1.Section.Access = SupervisorAccess; - Pte.L1.Section.BaseAddress = KSEG0_BASE >> TTB_SHIFT; + Pte.L1.Section.BaseAddress = 0; Pte.L1.Section.Ignored = Pte.L1.Section.Ignored1 = 0; - TuiPrintf("Template PTE: %x\n", Pte.AsUlong); - TuiPrintf("Base: %x %x\n", KSEG0_BASE, Pte.L1.Section.BaseAddress); - - // - // Map KSEG0 (0x80000000 - 0xA0000000) - // - TuiPrintf("First PTE Index: %x\n", KSEG0_BASE >> TTB_SHIFT); - TuiPrintf("Last PTE Index: %x\n", ((KSEG0_BASE + 0x20000000) >> TTB_SHIFT)); + + // + // Map KSEG0 (0x80000000 - 0xA0000000) to 0x00000000 - 0x80000000 + // In this way, the KERNEL_PHYS_ADDR (0x800000) becomes 0x80800000 + // which is the entrypoint, just like on x86. + // for (i = (KSEG0_BASE >> TTB_SHIFT); i < ((KSEG0_BASE + 0x20000000) >> TTB_SHIFT); i++) { // - // Update the PTE base address (next MB) + // Write PTE and update the base address (next MB) for the next one // + TranslationTable->Pte[i] = Pte; Pte.L1.Section.BaseAddress++; - TranslationTable->Pte[i] = Pte; } // - // Identity map the first MB of memory - // - TuiPrintf("Last KSEG0 PTE: %x %x\n", i, Pte.AsUlong); + // Identity map the first MB of memory as well + // Pte.L1.Section.BaseAddress = 0; TranslationTable->Pte[0] = Pte; } @@ -329,28 +325,18 @@ ARM_CONTROL_REGISTER ControlRegister; // - // This is it! Once we enable the MMU we're in a totally different universe. - // Cross our fingers: We mapped the bottom 1MB of memory, so FreeLDR and - // boot-data is still there. We also mapped the kernel, and made our - // allocations | KSEG0_BASE. If any of this isn't true, we're dead. - // - TuiPrintf("Crossing the Rubicon!\n"); - - // // Enable MMU, DCache and ICache // ControlRegister = ArmControlRegisterGet(); - TuiPrintf("CP15 C1: %x\n", ControlRegister); ControlRegister.MmuEnabled = TRUE; ControlRegister.ICacheEnabled = TRUE; ControlRegister.DCacheEnabled = TRUE; - TuiPrintf("CP15 C1: %x\n", ControlRegister); ArmControlRegisterSet(ControlRegister); // - // Are we still alive? - // - while (TRUE); + // Jump to Kernel + // + (*KernelEntryPoint)(Magic, (PVOID)&ArmLoaderBlock); } VOID

1 0

[ros-arm-bringup] 32307: We define a region in FreeLDR where we store the initial TTB. We have to align it at a 16KB boundary, and ld loves to crash with such big alignment, so wee manually define it to load at 0x50000. Pray FreeLDR never gets that big (you'd think LD would warn if that section is overwriting others). Wrote a guideline for what ArmPrepareForReactOS should do and defined the initial ARM loader block and extension. Wrote the initial MMU code. It's totally busted but after 3 hours
by ros-arm-bringup＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 01:17:15 2008 New Revision: 32307 URL: http://svn.reactos.org/svn/reactos?rev=32307&view=rev Log: We define a region in FreeLDR where we store the initial TTB. We have to align it at a 16KB boundary, and ld loves to crash with such big alignment, so wee manually define it to load at 0x50000. Pray FreeLDR never gets that big (you'd think LD would warn if that section is overwriting others). Wrote a guideline for what ArmPrepareForReactOS should do and defined the initial ARM loader block and extension. Wrote the initial MMU code. It's totally busted but after 3 hours of debugging, it doesn't abort anymore! Cleanups TBD. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild 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 Tue Feb 12 01:17:15 2008 @@ -23,6 +23,7 @@ /* GLOBALS ********************************************************************/ .global _start +.global ArmTranslationTable .section startup /* BOOT CODE ******************************************************************/ @@ -42,11 +43,12 @@ msr cpsr, r1 // - // Turn off caches + // Turn off caches and the MMU // mrc p15, 0, r1, c1, c0, 0 bic r1, r1, #C1_DCACHE_CONTROL bic r1, r1, #C1_ICACHE_CONTROL + bic r1, r1, #C1_MMU_CONTROL mcr p15, 0, r1, c1, c0, 0 // @@ -65,6 +67,8 @@ // r0 contains the ARM_BOARD_CONFIGURATION_DATA structure // bx lr + +/* BOOT STACK *****************************************************************/ L_BootStackEnd: .long BootStackEnd @@ -77,3 +81,9 @@ .space 0x4000 BootStackEnd: .long 0 + +/* INITIAL PAGE TABLE *********************************************************/ + +.section pagedata +ArmTranslationTable: + .space 0x4000 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 Tue Feb 12 01:17:15 2008 @@ -12,7 +12,185 @@ /* GLOBALS ********************************************************************/ +typedef union _ARM_PTE +{ + union + { + struct + { + ULONG Type:2; + ULONG Unused:30; + } Fault; + struct + { + ULONG Type:2; + ULONG Reserved:3; + ULONG Domain:4; + ULONG Ignored:1; + ULONG BaseAddress:22; + } Coarse; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Reserved:1; + ULONG Domain:4; + ULONG Ignored:1; + ULONG Access:2; + ULONG Ignored1:8; + ULONG BaseAddress:12; + } Section; + struct + { + ULONG Type:2; + ULONG Reserved:3; + ULONG Domain:4; + ULONG Ignored:3; + ULONG BaseAddress:20; + } Fine; + } L1; + union + { + struct + { + ULONG Type:2; + ULONG Unused:30; + } Fault; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access0:2; + ULONG Access1:2; + ULONG Access2:2; + ULONG Access3:2; + ULONG Ignored:4; + ULONG BaseAddress:16; + } Large; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access0:2; + ULONG Access1:2; + ULONG Access2:2; + ULONG Access3:2; + ULONG BaseAddress:20; + } Small; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access0:2; + ULONG Ignored:4; + ULONG BaseAddress:22; + } Tiny; + } L2; + ULONG AsUlong; +} ARM_PTE, *PARM_PTE; + +typedef struct _ARM_TRANSLATION_TABLE +{ + ARM_PTE Pte[4096]; +} ARM_TRANSLATION_TABLE, *PARM_TRANSLATION_TABLE; + +typedef union _ARM_TTB_REGISTER +{ + struct + { + ULONG Reserved:14; + ULONG BaseAddress:18; + }; + ULONG AsUlong; +} ARM_TTB_REGISTER; + +typedef enum _ARM_L1_PTE_TYPE +{ + FaultPte, + CoarsePte, + SectionPte, + FinePte +} ARM_L1_PTE_TYPE; + +typedef enum _ARM_PTE_ACCESS +{ + FaultAccess, + SupervisorAccess, + SharedAccess, + UserAccess +} ARM_PTE_ACCESS; + +typedef enum _ARM_DOMAIN +{ + FaultDomain, + ClientDomain, + InvalidDomain, + ManagerDomain +} ARM_DOMAIN; + +typedef union _ARM_DOMAIN_REGISTER +{ + struct + { + ULONG Domain0:2; + ULONG Domain1:2; + ULONG Domain2:2; + ULONG Domain3:2; + ULONG Domain4:2; + ULONG Domain5:2; + ULONG Domain6:2; + ULONG Domain7:2; + ULONG Domain8:2; + ULONG Domain9:2; + ULONG Domain10:2; + ULONG Domain11:2; + ULONG Domain12:2; + ULONG Domain13:2; + ULONG Domain14:2; + ULONG Domain15:2; + }; + ULONG AsUlong; +} ARM_DOMAIN_REGISTER; + +typedef union _ARM_CONTROL_REGISTER +{ + struct + { + ULONG MmuEnabled:1; + ULONG AlignmentFaultsEnabled:1; + ULONG DCacheEnabled:1; + ULONG Sbo:3; + ULONG BigEndianEnabled:1; + ULONG System:1; + ULONG Rom:1; + ULONG Sbz:2; + ULONG ICacheEnabled:1; + ULONG HighVectors:1; + ULONG RoundRobinReplacementEnabled:1; + ULONG Armv4Compat:1; + ULONG Sbo1:1; + ULONG Sbz1:1; + ULONG Sbo2:1; + ULONG Reserved:14; + }; + ULONG AsUlong; +} ARM_CONTROL_REGISTER, *PARM_CONTROL_REGISTER; + +typedef enum _ARM_DOMAINS +{ + Domain0 +} ARM_DOMAINS; + +#define TTB_SHIFT 20 + ULONG PageDirectoryStart, PageDirectoryEnd; +LOADER_PARAMETER_BLOCK ArmLoaderBlock; +LOADER_PARAMETER_EXTENSION ArmExtension; +extern ARM_TRANSLATION_TABLE ArmTranslationTable; /* FUNCTIONS ******************************************************************/ @@ -41,10 +219,183 @@ return FALSE; } +ARM_CONTROL_REGISTER +FORCEINLINE +ArmControlRegisterGet(VOID) +{ + ARM_CONTROL_REGISTER Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c1, c0, 0" : "=r"(Value.AsUlong) : : "cc"); + return Value; +} + +VOID +FORCEINLINE +ArmControlRegisterSet(IN ARM_CONTROL_REGISTER ControlRegister) +{ + __asm__ __volatile__ ("mcr p15, 0, %0, c1, c0, 0; b ." : : "r"(ControlRegister.AsUlong) : "cc"); +} + +VOID +FORCEINLINE +ArmMmuTtbSet(IN ARM_TTB_REGISTER Ttb) +{ + __asm__ __volatile__ ("mcr p15, 0, %0, c2, c0, 0" : : "r"(Ttb.AsUlong) : "cc"); +} + +VOID +FORCEINLINE +ArmMmuDomainRegisterSet(IN ARM_DOMAIN_REGISTER DomainRegister) +{ + __asm__ __volatile__ ("mcr p15, 0, %0, c3, c0, 0" : : "r"(DomainRegister.AsUlong) : "cc"); +} + +VOID +ArmSetupPageDirectory(VOID) +{ + ARM_TTB_REGISTER TtbRegister; + ARM_DOMAIN_REGISTER DomainRegister; + ARM_PTE Pte; + ULONG i; + PARM_TRANSLATION_TABLE TranslationTable; + + // + // Allocate translation table buffer. + // During bootstrap, this will be a simple L1 (Master) Page Table with + // Section entries for KSEG0 and the first MB of RAM. + // + TranslationTable = &ArmTranslationTable; + if (!TranslationTable) return; + + // + // Set it as the TTB + // + TtbRegister.AsUlong = (ULONG)TranslationTable; + ASSERT(TtbRegister.Reserved == 0); + TuiPrintf("CP15 C2: %x\n", TtbRegister); + ArmMmuTtbSet(TtbRegister); + + // + // Use Domain 0, enforce AP bits (client) + // + DomainRegister.AsUlong = 0; + DomainRegister.Domain0 = ClientDomain; + TuiPrintf("CP15 C3: %x\n", DomainRegister); + ArmMmuDomainRegisterSet(DomainRegister); + + // + // Set Fault PTEs everywhere + // + RtlZeroMemory(TranslationTable, 4096 * sizeof(ARM_PTE)); + + // + // Build the template PTE + // + Pte.L1.Section.Type = SectionPte; + Pte.L1.Section.Buffered = FALSE; + Pte.L1.Section.Cached = FALSE; + Pte.L1.Section.Reserved = 1; // ARM926EJ-S manual recommends setting to 1 + Pte.L1.Section.Domain = Domain0; + Pte.L1.Section.Access = SupervisorAccess; + Pte.L1.Section.BaseAddress = KSEG0_BASE >> TTB_SHIFT; + Pte.L1.Section.Ignored = Pte.L1.Section.Ignored1 = 0; + TuiPrintf("Template PTE: %x\n", Pte.AsUlong); + TuiPrintf("Base: %x %x\n", KSEG0_BASE, Pte.L1.Section.BaseAddress); + + // + // Map KSEG0 (0x80000000 - 0xA0000000) + // + TuiPrintf("First PTE Index: %x\n", KSEG0_BASE >> TTB_SHIFT); + TuiPrintf("Last PTE Index: %x\n", ((KSEG0_BASE + 0x20000000) >> TTB_SHIFT)); + for (i = (KSEG0_BASE >> TTB_SHIFT); i < ((KSEG0_BASE + 0x20000000) >> TTB_SHIFT); i++) + { + // + // Update the PTE base address (next MB) + // + Pte.L1.Section.BaseAddress++; + TranslationTable->Pte[i] = Pte; + } + + // + // Identity map the first MB of memory + // + TuiPrintf("Last KSEG0 PTE: %x %x\n", i, Pte.AsUlong); + Pte.L1.Section.BaseAddress = 0; + TranslationTable->Pte[0] = Pte; +} + +VOID +ArmSetupPagingAndJump(IN ULONG Magic) +{ + ARM_CONTROL_REGISTER ControlRegister; + + // + // This is it! Once we enable the MMU we're in a totally different universe. + // Cross our fingers: We mapped the bottom 1MB of memory, so FreeLDR and + // boot-data is still there. We also mapped the kernel, and made our + // allocations | KSEG0_BASE. If any of this isn't true, we're dead. + // + TuiPrintf("Crossing the Rubicon!\n"); + + // + // Enable MMU, DCache and ICache + // + ControlRegister = ArmControlRegisterGet(); + TuiPrintf("CP15 C1: %x\n", ControlRegister); + ControlRegister.MmuEnabled = TRUE; + ControlRegister.ICacheEnabled = TRUE; + ControlRegister.DCacheEnabled = TRUE; + TuiPrintf("CP15 C1: %x\n", ControlRegister); + ArmControlRegisterSet(ControlRegister); + + // + // Are we still alive? + // + while (TRUE); +} + VOID ArmPrepareForReactOS(IN BOOLEAN Setup) -{ - while (TRUE); +{ + // + // Initialize the loader block + // + InitializeListHead(&ArmLoaderBlock.BootDriverListHead); + InitializeListHead(&ArmLoaderBlock.LoadOrderListHead); + InitializeListHead(&ArmLoaderBlock.MemoryDescriptorListHead); + + // + // Setup the extension and setup block + // + ArmLoaderBlock.Extension = &ArmExtension; + ArmLoaderBlock.SetupLdrBlock = NULL; + + // + // TODO: Setup memory descriptors + // + + // + // TODO: Setup registry data + // + + // + // TODO: Setup ARC Hardware tree data + // + + // + // TODO: Setup NLS data + // + + // + // TODO: Setup boot-driver data + // + + // + // TODO: Setup extension parameters + // + + // + // TODO: Setup ARM-specific block + // } PCONFIGURATION_COMPONENT_DATA @@ -167,5 +518,21 @@ VOID FrLdrStartup(IN ULONG Magic) { - while (TRUE); -} + // + // Disable interrupts (aleady done) + // + + // + // Set proper CPSR (already done) + // + + // + // Initialize the page directory + // + ArmSetupPageDirectory(); + + // + // Initialize paging and load NTOSKRNL + // + ArmSetupPagingAndJump(Magic); +} 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 Tue Feb 12 01:17:15 2008 @@ -31,6 +31,7 @@ <library>libcntpr</library> <linkerflag>-lgcc</linkerflag> <linkerflag>-static</linkerflag> + <linkerflag>-Wl,--section-start,pagedata=0x50000</linkerflag> </module> </if> <if property="ARCH" value="powerpc">

1 0

[ros-arm-bringup] 32306: FORCEINLINE is a lot more...forcefull... now ; -). Previous version didn't always inline as requested.
by ros-arm-bringup＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: ros-arm-bringup Date: Tue Feb 12 01:13:35 2008 New Revision: 32306 URL: http://svn.reactos.org/svn/reactos?rev=32306&view=rev Log: FORCEINLINE is a lot more...forcefull... now ;-). Previous version didn't always inline as requested. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Tue Feb 12 01:13:35 2008 @@ -84,7 +84,7 @@ #elif (_MSC_VER) #define FORCEINLINE __inline #else -#define FORCEINLINE static __inline +#define FORCEINLINE static __inline__ __attribute__((always_inline)) #endif #endif

1 0

[ros-arm-bringup] 32305: We now support the ARM Versatile/PB platform, which means qemu-system-arm -M versatilepb is now able to emulate the ARM build of ReactOS. We now support the PL011 UART, required for console output on the Versatile. We now define the ARM_LOADER_BLOCK structure, to be used later when FreeLDR passes control to the kernel.
by ros-arm-bringup＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: ros-arm-bringup Date: Mon Feb 11 23:15:16 2008 New Revision: 32305 URL: http://svn.reactos.org/svn/reactos?rev=32305&view=rev Log: We now support the ARM Versatile/PB platform, which means qemu-system-arm -M versatilepb is now able to emulate the ARM build of ReactOS. We now support the PL011 UART, required for console output on the Versatile. We now define the ARM_LOADER_BLOCK structure, to be used later when FreeLDR passes control to the kernel. Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h trunk/reactos/include/reactos/arc/arc.h 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 Mon Feb 11 23:15:16 2008 @@ -34,7 +34,8 @@ // // This should probably go away once we support more boards // - ASSERT(ArmBoardBlock->BoardType == ARM_FEROCEON); + ASSERT((ArmBoardBlock->BoardType == MACH_TYPE_FEROCEON) || + (ArmBoardBlock->BoardType == MACH_TYPE_VERSATILE_PB)); // // Call FreeLDR's portable entrypoint with our command-line 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 Mon Feb 11 23:15:16 2008 @@ -15,14 +15,6 @@ ULONG PageDirectoryStart, PageDirectoryEnd; /* FUNCTIONS ******************************************************************/ - -VOID -FrLdrStartup(IN ULONG Magic) -{ - // - // Start the OS - // -} BOOLEAN ArmDiskGetDriveGeometry(IN ULONG DriveNumber, @@ -110,7 +102,7 @@ // // Check for Feroceon-base boards // - case ARM_FEROCEON: + case MACH_TYPE_FEROCEON: // // These boards use a UART16550. Set us up for 115200 bps @@ -119,6 +111,20 @@ MachVtbl.ConsPutChar = ArmFeroPutChar; MachVtbl.ConsKbHit = ArmFeroKbHit; MachVtbl.ConsGetCh = ArmFeroGetCh; + break; + + // + // Check for ARM Versatile PB boards + // + case MACH_TYPE_VERSATILE_PB: + + // + // These boards use a PrimeCell UART (PL011) + // + ArmVersaSerialInit(115200); + MachVtbl.ConsPutChar = ArmVersaPutChar; + MachVtbl.ConsKbHit = ArmVersaKbHit; + MachVtbl.ConsGetCh = ArmVersaGetCh; break; default: @@ -157,3 +163,9 @@ TuiPrintf("%s for ARM\n", GetFreeLoaderVersionString()); TuiPrintf("Bootargs: %s\n", CommandLine); } + +VOID +FrLdrStartup(IN ULONG Magic) +{ + while (TRUE); +} Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c Mon Feb 11 23:15:16 2008 @@ -1,0 +1,132 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/arch/arm/versuart.c + * PURPOSE: Implements code for Versatile boards using the PL011 UART + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> + +/* GLOBALS ********************************************************************/ + +// +// UART Registers +// +#define UART_PL01x_DR (ArmBoardBlock->UartRegisterBase + 0x00) +#define UART_PL01x_RSR (ArmBoardBlock->UartRegisterBase + 0x04) +#define UART_PL01x_ECR (ArmBoardBlock->UartRegisterBase + 0x04) +#define UART_PL01x_FR (ArmBoardBlock->UartRegisterBase + 0x18) +#define UART_PL011_IBRD (ArmBoardBlock->UartRegisterBase + 0x24) +#define UART_PL011_FBRD (ArmBoardBlock->UartRegisterBase + 0x28) +#define UART_PL011_LCRH (ArmBoardBlock->UartRegisterBase + 0x2C) +#define UART_PL011_CR (ArmBoardBlock->UartRegisterBase + 0x30) +#define UART_PL011_IMSC (ArmBoardBlock->UartRegisterBase + 0x38) + +// +// LCR Values +// +#define UART_PL011_LCRH_WLEN_8 0x60 +#define UART_PL011_LCRH_FEN 0x10 + +// +// FCR Values +// +#define UART_PL011_CR_UARTEN 0x01 +#define UART_PL011_CR_TXE 0x100 +#define UART_PL011_CR_RXE 0x200 + +// +// LSR Values +// +#define UART_PL01x_FR_RXFE 0x10 +#define UART_PL01x_FR_TXFF 0x20 + +/* FUNCTIONS ******************************************************************/ + +VOID +ArmVersaSerialInit(IN ULONG Baudrate) +{ + ULONG Divider, Remainder, Fraction; + + // + // Calculate baudrate clock divider and remainder + // + Divider = ArmBoardBlock->ClockRate / (16 * Baudrate); + Remainder = ArmBoardBlock->ClockRate % (16 * Baudrate); + + // + // Calculate the fractional part + // + Fraction = (8 * Remainder / Baudrate) >> 1; + Fraction += (8 * Remainder / Baudrate) & 1; + + // + // Disable interrupts + // + WRITE_REGISTER_ULONG(UART_PL011_CR, 0); + + // + // Set the baud rate to 115200 bps + // + WRITE_REGISTER_ULONG(UART_PL011_IBRD, Divider); + WRITE_REGISTER_ULONG(UART_PL011_FBRD, Fraction); + + // + // Set 8 bits for data, 1 stop bit, no parity, FIFO enabled + // + WRITE_REGISTER_ULONG(UART_PL011_LCRH, + UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN); + + // + // Clear and enable FIFO + // + WRITE_REGISTER_ULONG(UART_PL011_CR, + UART_PL011_CR_UARTEN | + UART_PL011_CR_TXE | + UART_PL011_CR_RXE); +} + +VOID +ArmVersaPutChar(IN INT Char) +{ + // + // Properly support new-lines + // + if (Char == '\n') ArmVersaPutChar('\r'); + + // + // Wait for ready + // + while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF) != 0); + + // + // Send the character + // + WRITE_REGISTER_ULONG(UART_PL01x_DR, Char); +} + +INT +ArmVersaGetCh(VOID) +{ + // + // Wait for ready + // + while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_RXFE) != 0); + + // + // Read the character + // + return READ_REGISTER_ULONG(UART_PL01x_DR); +} + +BOOLEAN +ArmVersaKbHit(VOID) +{ + // + // Return if something is ready + // + return ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_RXFE) == 0); +} Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c ------------------------------------------------------------------------------ svn:mime-type = text/plain 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 Mon Feb 11 23:15:16 2008 @@ -102,6 +102,7 @@ <define name="_NTHAL_" /> <file>boot.s</file> <file>ferouart.c</file> + <file>versuart.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 Mon Feb 11 23:15:16 2008 @@ -14,16 +14,16 @@ #endif // -// The only things we support +// Marvell Feroceon-based SoC: +// Buffalo Linkstation, KuroBox Pro, D-Link DS323 and others // -typedef enum _ARM_BOARD_TYPE -{ - // - // Marvell Feroceon-based SoC: - // Buffalo Linkstation, KuroBox Pro, D-Link DS323 and others - // - ARM_FEROCEON = 1, -} ARM_BOARD_TYPE; +#define MACH_TYPE_FEROCEON 526 + +// +// ARM Versatile PB: +// qemu-system-arm -M versatilepb, RealView Development Boards and others +// +#define MACH_TYPE_VERSATILE_PB 387 // // Compatible boot-loaders should return us this information @@ -34,7 +34,7 @@ { ULONG MajorVersion; ULONG MinorVersion; - ARM_BOARD_TYPE BoardType; + ULONG BoardType; ULONG ClockRate; ULONG TimerRegisterBase; ULONG UartRegisterBase; @@ -105,6 +105,18 @@ BOOLEAN ArmFeroKbHit(VOID); +VOID +ArmVersaSerialInit(IN ULONG Baudrate); + +VOID +ArmVersaPutChar(IN INT Char); + +INT +ArmVersaGetCh(VOID); + +BOOLEAN +ArmVersaKbHit(VOID); + extern PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; #endif Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Mon Feb 11 23:15:16 2008 @@ -351,6 +351,28 @@ ULONG MachineType; } PPC_LOADER_BLOCK, *PPPC_LOADER_BLOCK; +typedef struct _ARM_LOADER_BLOCK +{ +#ifdef _ARM_ + ULONG InterruptStack; + ULONG FirstLevelDcacheSize; + ULONG FirstLevelDcacheFillSize; + ULONG FirstLevelIcacheSize; + ULONG FirstLevelIcacheFillSize; + ULONG GpBase; + ULONG PanicStack; + ULONG PcrPage; + ULONG PdrPage; + ULONG SecondLevelDcacheSize; + ULONG SecondLevelDcacheFillSize; + ULONG SecondLevelIcacheSize; + ULONG SecondLevelIcacheFillSize; + ULONG PcrPage2; +#else + ULONG PlaceHolder; +#endif +} ARM_LOADER_BLOCK, *PARM_LOADER_BLOCK; + // // Firmware information block (NT6+) // @@ -426,7 +448,8 @@ I386_LOADER_BLOCK I386; ALPHA_LOADER_BLOCK Alpha; IA64_LOADER_BLOCK Ia64; - PPC_LOADER_BLOCK PowerPC; + PPC_LOADER_BLOCK PowerPC; + ARM_LOADER_BLOCK Arm; } u; FIRMWARE_INFORMATION_LOADER_BLOCK FirmwareInformation; } LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK;

1 0

[cwittich] 32304: fix some warnings in msvc build
by cwittich＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: cwittich Date: Mon Feb 11 22:16:02 2008 New Revision: 32304 URL: http://svn.reactos.org/svn/reactos?rev=32304&view=rev Log: fix some warnings in msvc build Modified: trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp Mon Feb 11 22:16:02 2008 @@ -420,8 +420,8 @@ case WM_CONTEXTMENU: { Point pt(lparam); POINTS p; - p.x = pt.x; - p.y = pt.y; + p.x = (SHORT) pt.x; + p.y = (SHORT) pt.y; ScreenToClient(_hwnd, &pt); if (IconHitTest(pt) == _sorted_icons.end()) { // display menu only when no icon clicked

1 0

[cfinck] 32303: New ReactOS People Map based on Google Maps API (not yet on the Web server) The map integrates into the existing website and is linked with the RosCMS accounts. You can add a group of users (like Translators, Developers, Administrators, etc.) to the map or search for people and add them individually. I made tests with 500 random users on one map and it was still usable :-) Also there are easy features for setting your own position. I successfully tested the People Map with Firefo
by cfinck＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: cfinck Date: Mon Feb 11 21:43:40 2008 New Revision: 32303 URL: http://svn.reactos.org/svn/reactos?rev=32303&view=rev Log: New ReactOS People Map based on Google Maps API (not yet on the Web server) The map integrates into the existing website and is linked with the RosCMS accounts. You can add a group of users (like Translators, Developers, Administrators, etc.) to the map or search for people and add them individually. I made tests with 500 random users on one map and it was still usable :-) Also there are easy features for setting your own position. I successfully tested the People Map with Firefox 2.0, Opera 9.21, Safari 3 Beta, Konqueror 3.5.6 and IE6/7. The marker graphics were done myself with Inkscape and the other graphics were composed out of icons from the Tango Icon Project or taken from other ReactOS web apps. The PNGs with alpha transparency are also shown correctly under IE6 using a trick in "ie6-fixes.css". Added: trunk/web/reactos.org/htdocs/peoplemap/ trunk/web/reactos.org/htdocs/peoplemap/ajax-deletelocation.php (with props) trunk/web/reactos.org/htdocs/peoplemap/ajax-getuser.php (with props) trunk/web/reactos.org/htdocs/peoplemap/ajax-setlocation.php (with props) trunk/web/reactos.org/htdocs/peoplemap/config.inc.php (with props) trunk/web/reactos.org/htdocs/peoplemap/ie6-fixes.css (with props) trunk/web/reactos.org/htdocs/peoplemap/images/ trunk/web/reactos.org/htdocs/peoplemap/images/add-user.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/ajax_loading.gif (with props) trunk/web/reactos.org/htdocs/peoplemap/images/filter.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/ll.gif (with props) trunk/web/reactos.org/htdocs/peoplemap/images/lr.gif (with props) trunk/web/reactos.org/htdocs/peoplemap/images/marker_blue.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/marker_cyan.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/marker_green.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/marker_lightgrey.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/marker_red.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/marker_violet.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/marker_white.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/marker_yellow.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/set-location.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/ul.gif (with props) trunk/web/reactos.org/htdocs/peoplemap/images/ur.gif (with props) trunk/web/reactos.org/htdocs/peoplemap/index.php (with props) trunk/web/reactos.org/htdocs/peoplemap/lang/ trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php (with props) trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php (with props) trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php (with props) trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css (with props) trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php (with props) trunk/web/reactos.org/htdocs/peoplemap/peoplemap.sql (with props) Added: trunk/web/reactos.org/htdocs/peoplemap/ajax-deletelocation.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/a… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/ajax-deletelocation.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/ajax-deletelocation.php Mon Feb 11 21:43:40 2008 @@ -1,0 +1,36 @@ +<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/ajax-deletelocation.php + PURPOSE: AJAX backend for the People Map for deleting user locations + COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> +*/ + + header("Content-type: text/xml"); + + if(!$_COOKIE["roscmsusrkey"] || !isset($_GET["delete"])) + die("<error>Necessary information not specified!</error>"); + + + require_once("config.inc.php"); + + $db = mysql_connect($DB_HOST, $DB_USER, $DB_PASS); + + // Get the user ID from the session key + $query = "SELECT usersession_user_id FROM $DB_ROSCMS.user_sessions WHERE usersession_id = '" . mysql_real_escape_string($_COOKIE["roscmsusrkey"]) . "' LIMIT 1;"; + $result = mysql_query($query, $db) or die("<error>Query failed #1!</error>"); + + if(mysql_num_rows($result) > 0) + $userid = mysql_result($result, 0); + + if(!$userid) + die("<error>No user ID!</error>"); + + // Delete the location entry + $query = "DELETE FROM $DB_PEOPLEMAP.user_locations WHERE roscms_user_id = $userid;"; + mysql_query($query, $db) or die("<error>Query failed #2!</error>"); + + // Just return a success state + echo "<deleted />"; +?> Propchange: trunk/web/reactos.org/htdocs/peoplemap/ajax-deletelocation.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/ajax-getuser.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/a… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/ajax-getuser.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/ajax-getuser.php Mon Feb 11 21:43:40 2008 @@ -1,0 +1,85 @@ +<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/ajax-getuser.php + PURPOSE: AJAX backend for the People Map for getting user information + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> +*/ + + header("Content-type: text/xml"); + + if( !isset($_GET["query"]) || !isset($_GET["subject"]) ) + die("<error>Necessary information not specified!</error>"); + + if( !$_GET["subject"] == "userid" && strlen($_GET["query"]) < 3 ) + die("<error>Minimum query length is 3 characters!</error>"); + + + require_once("config.inc.php"); + + $db = mysql_connect($DB_HOST, $DB_USER, $DB_PASS); + $query = "SELECT u.user_id, u.user_name, u.user_fullname, l.latitude, l.longitude " . + "FROM $DB_ROSCMS.users u " . + "JOIN $DB_PEOPLEMAP.user_locations l ON u.user_id = l.roscms_user_id "; + + switch($_GET["subject"]) + { + case "username": + $query .= "WHERE u.user_name LIKE '" . mysql_real_escape_string($_GET["query"], $db) . "%'"; + break; + + case "fullname": + $query .= "WHERE u.user_fullname LIKE '" . mysql_real_escape_string($_GET["query"], $db) . "%'"; + break; + + case "group": + $query .= "JOIN $DB_ROSCMS.usergroup_members g ON u.user_id = g.usergroupmember_userid " . + "WHERE g.usergroupmember_usergroupid = '" . mysql_real_escape_string($_GET["query"], $db) . "'"; + break; + + case "userid": + $query .= "WHERE u.user_id = " . (int)$_GET["query"]; + break; + + default: + die("<error>Invalid subject!</error>"); + } + + $query .= " ORDER BY u.user_name ASC"; + + switch($_GET["subject"]) + { + case "username": + case "fullname": + $query .= " LIMIT 25"; + break; + + case "group": + $query .= " LIMIT 500"; + break; + + case "userid": + $query .= " LIMIT 1"; + break; + } + + $query .= ";"; + + $result = mysql_query($query, $db) or die("<error><message>Query failed!</message></error>"); + + echo "<userinformation>"; + + while( $row = mysql_fetch_row($result) ) + { + echo "<user>"; + printf("<id>%u</id>", $row[0]); + printf("<username>%s</username>", $row[1]); + printf("<fullname>%s</fullname>", $row[2]); + printf("<latitude>%s</latitude>", $row[3]); + printf("<longitude>%s</longitude>", $row[4]); + echo "</user>"; + } + + echo "</userinformation>"; +?> Propchange: trunk/web/reactos.org/htdocs/peoplemap/ajax-getuser.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/ajax-setlocation.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/a… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/ajax-setlocation.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/ajax-setlocation.php Mon Feb 11 21:43:40 2008 @@ -1,0 +1,56 @@ +<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/ajax-setlocation.php + PURPOSE: AJAX backend for the People Map for saving user locations + COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> +*/ + + header("Content-type: text/xml"); + + if(!$_COOKIE["roscmsusrkey"] || !isset($_GET["latitude"]) || !isset($_GET["longitude"])) + die("<error>Necessary information not specified!</error>"); + + + require_once("config.inc.php"); + + $db = mysql_connect($DB_HOST, $DB_USER, $DB_PASS); + + // Get the user ID from the session key + $query = "SELECT usersession_user_id FROM $DB_ROSCMS.user_sessions WHERE usersession_id = '" . mysql_real_escape_string($_COOKIE["roscmsusrkey"]) . "' LIMIT 1;"; + $result = mysql_query($query, $db) or die("<error>Query failed #1!</error>"); + + if(mysql_num_rows($result) > 0) + $userid = mysql_result($result, 0); + + if(!$userid) + die("<error>No user ID!</error>"); + + $latitude = (float)$_GET["latitude"]; + $longitude = (float)$_GET["longitude"]; + + // Set latitude and longitude + $query = "INSERT INTO $DB_PEOPLEMAP.user_locations " . + "(roscms_user_id, latitude, longitude) " . + "VALUES ($userid, $latitude, $longitude) " . + "ON DUPLICATE KEY UPDATE " . + "latitude=$latitude, longitude=$longitude;"; + + mysql_query($query, $db) or die("<error>Query failed #2!</error>"); + + // We succeeded, return all information about our account + $query = "SELECT user_name, user_fullname FROM $DB_ROSCMS.users WHERE user_id = $userid LIMIT 1;"; + $result = mysql_query($query, $db) or die("<error>Query failed #3!</error>"); + $row = mysql_fetch_row($result); + + echo "<userinformation>"; + echo "<user>"; + printf("<id>%u</id>", $userid); + printf("<username>%s</username>", $row[0]); + printf("<fullname>%s</fullname>", $row[1]); + printf("<latitude>%s</latitude>", $latitude); + printf("<longitude>%s</longitude>", $longitude); + echo "</user>"; + echo "</userinformation>"; +?> Propchange: trunk/web/reactos.org/htdocs/peoplemap/ajax-setlocation.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/config.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/c… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/config.inc.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/config.inc.php Mon Feb 11 21:43:40 2008 @@ -1,0 +1,25 @@ +<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/config.inc.php + PURPOSE: Configuration settings + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> +*/ + + // DB Settings + // The user entered here must have: + // * SELECT, INSERT, UPDATE and DELETE privileges to $DB_PEOPLEMAP + // * SELECT privileges to $DB_ROSCMS + $DB_HOST = "localhost"; + $DB_USER = "root"; + $DB_PASS = ""; + $DB_PEOPLEMAP = "peoplemap"; + $DB_ROSCMS = "roscms"; + + // Google Maps Settings + $GOOGLE_MAPS_KEY = ""; + + // Image Settings + $MARKERS = array("red", "blue", "green", "violet", "yellow", "cyan", "lightgrey"); +?> Propchange: trunk/web/reactos.org/htdocs/peoplemap/config.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/ie6-fixes.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/ie6-fixes.css (added) +++ trunk/web/reactos.org/htdocs/peoplemap/ie6-fixes.css Mon Feb 11 21:43:40 2008 @@ -1,0 +1,29 @@ +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/ie6-fixes.css + PURPOSE: This file contains fixes for Internet Explorer 6.0 + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> +*/ + +/* IE6 doesn't add the size of the edges to the box height. So we have to add this space by enhancing the "padding-bottom" value */ +.bubble_bg, .selectable_bubble_bg, .hovered_bubble_bg { + padding-bottom: 4px; +} + +/* Show PNG's with alpha transparency through the AlphaImageLoader filter */ +#toolbox0_image, #toolbox1_image, #toolbox2_image { + background: none; +} + +#toolbox0_image { + filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="images/filter.png"); +} + +#toolbox1_image { + filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="images/add-user.png"); +} + +#toolbox2_image { + filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="images/set-location.png"); +} Propchange: trunk/web/reactos.org/htdocs/peoplemap/ie6-fixes.css ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/images/add-user.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/add-user.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/ajax_loading.gif URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/ajax_loading.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/filter.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/filter.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/ll.gif URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/ll.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/lr.gif URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/lr.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/marker_blue.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/marker_blue.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/marker_cyan.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/marker_cyan.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/marker_green.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/marker_green.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/marker_lightgrey.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/marker_lightgrey.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/marker_red.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/marker_red.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/marker_violet.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/marker_violet.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/marker_white.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/marker_white.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/marker_yellow.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/marker_yellow.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/set-location.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/set-location.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/ul.gif URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/ul.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/ur.gif URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/ur.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/index.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/index.php Mon Feb 11 21:43:40 2008 @@ -1,0 +1,296 @@ +<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/index.php + PURPOSE: Main web page + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> +*/ + + require_once("config.inc.php"); + require_once("languages.inc.php"); + + // Get the domain for the cookie (with a leading dot if possible). Borrowed from "utils.php" of RosCMS. + function cookie_domain() + { + if( isset($_SERVER['SERVER_NAME']) ) + { + if( preg_match('/(\.[^.]+\.[^.]+$)/', $_SERVER['SERVER_NAME'], $matches) ) + return $matches[1]; + else + return ""; + } + else + return ""; + } + + // Get the language and include it + if( isset($_GET["lang"]) ) + $lang = $_GET["lang"]; + else if( isset($_COOKIE["roscms_usrset_lang"]) ) + $lang = $_COOKIE["roscms_usrset_lang"]; + + // Check if the language is valid + $lang_valid = false; + + foreach( $peoplemap_languages as $lang_key => $lang_name ) + { + if( $lang == $lang_key ) + { + $lang_valid = true; + break; + } + } + + if( !$lang_valid ) + $lang = "en"; + + setcookie( "roscms_usrset_lang", $lang, time() + 5 * 30 * 24 * 3600, "/", cookie_domain() ); + require_once("lang/$lang.inc.php"); +?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title><?php echo $peoplemap_langres["title"]; ?></title> + <link rel="stylesheet" type="text/css" href="peoplemap.css"> +  + <script type="text/javascript" src="http://maps.google.com/maps?file=api&v=2&key=<?php echo $GOOGLE_MAPS_KEY; ?>"></script> + <script type="text/javascript"> + <?php require_once("peoplemap.js.php"); ?> + </script> +</head> +<body onload="Load()" onunload="Unload()"> + +<?php + readfile("http://www.reactos.org/$lang/subsys_extern_menu_top.html"); + readfile("http://www.reactos.org/$lang/subsys_extern_menu_left.html"); +?> + +<div class="navTitle"><?php echo $peoplemap_langres["language"]; ?></div> + <ol> + <li style="text-align: center;"> + <select size="1" onchange="window.location.href = '<?php echo "http://" . $_SERVER["SERVER_NAME"] . $_SERVER["PHP_SELF"]; ?>?lang=' + this.options[this.selectedIndex].value;"> + <?php + foreach($peoplemap_languages as $lang_key => $lang_name) + printf('<option value="%s"%s>%s</option>', $lang_key, ($lang_key == $lang ? ' selected' : ''), $lang_name); + ?> + </select> + </li> + </ol> +</td> +<td id="content"> + +<h1><?php echo $peoplemap_langres["header"]; ?></h1> +<h2><?php echo $peoplemap_langres["title"]; ?></h2> + +<p><?php echo $peoplemap_langres["intro"]; ?></p> + +<table width="100%" cellspacing="0" cellpadding="0"> + <tr> + <td> + <div class="bubble_bg"> + <div class="rounded_ll"> + <div class="rounded_lr"> + <div class="rounded_ul"> + <div class="rounded_ur"> + + <div class="bubble"> + <div id="map"> +  + + <noscript><strong><?php echo $peoplemap_langres["activatejs"]; ?></strong></noscript> + </div> + </div> + + </div> + </div> + </div> + </div> + </div> + </td> + <td id="toolbox_td"> + <div class="bubble_bg" id="toolbox0_bubble"> + <div class="rounded_ll"> + <div class="rounded_lr"> + <div class="rounded_ul"> + <div class="rounded_ur"> + + <div class="bubble"> + <table id="toolbox0_head" onclick="ToggleToolbox(0);"> + <tr> + <td id="toolbox0_image"></td> + <td class="toolbox_head"><strong><?php echo $peoplemap_langres["filter"]; ?></strong></td> + </tr> + </table> + + <div id="toolbox0_controls"> + <?php + echo $peoplemap_langres["filter_intro"] . "<br><br>"; + + // We need a DB connection for getting the user groups and checking if the user is logged in + $db = mysql_connect($DB_HOST, $DB_USER, $DB_PASS) or die("Could not connect to the database!"); + $query = "SELECT usrgroup_name_id, usrgroup_name FROM $DB_ROSCMS.usergroups"; + $result = mysql_query($query, $db) or die("Query failed #1!"); + + echo "<table>"; + + $iconcode = '<script type="text/javascript">'; + $iconcode .= 'IconTable = new Object();'; + + while($row = mysql_fetch_row($result)) + { + echo "<tr>"; + echo "<td><input type=\"checkbox\" onclick=\"ToggleUserGroup(this, '" . $row[0] . "');\"></td>"; + echo "<td><div class=\"colorbox\" style=\"background: " . current($MARKERS) . "\"></div></td>"; + echo "<td>" . $row[1] . "</td>"; + echo "<td><img id=\"ajaxloading_" . $row[0] . "\" style=\"visibility: hidden;\" src=\"images/ajax_loading.gif\" alt=\"\"></td>"; + echo "</tr>"; + + $iconcode .= "IconTable['" . $row[0] . "'] = '" . current($MARKERS) . "';"; + + next($MARKERS); + } + + echo "</table>"; + + $iconcode .= '</script>'; + echo $iconcode; + ?> + </div> + </div> + + </div> + </div> + </div> + </div> + </div> + + <div class="selectable_bubble_bg" id="toolbox1_bubble" onmouseover="BubbleHover(this, true);" onmouseout="BubbleHover(this, false);"> + <div class="rounded_ll"> + <div class="rounded_lr"> + <div class="rounded_ul"> + <div class="rounded_ur"> + + <div class="bubble"> + <table id="toolbox1_head" onclick="ToggleToolbox(1);"> + <tr> + <td id="toolbox1_image"><td> + <td class="toolbox_head"><strong><?php echo $peoplemap_langres["add"]; ?></strong></td> + </tr> + </table> + + <div id="toolbox1_controls"> + <p> + <select id="add_subject" size="1"> + <option><?php echo $peoplemap_langres["add_username"]; ?></option> + <option><?php echo $peoplemap_langres["add_fullname"]; ?></option> + </select>: + + <input type="text" id="add_query" size="16" onkeyup="GetUser()"> + <img id="ajaxloading_add" style="visibility: hidden;" src="images/ajax_loading.gif" alt=""> + </p> + + <div id="add_user_result"> +  + </div> + </div> + </div> + + </div> + </div> + </div> + </div> + </div> + + <div class="selectable_bubble_bg" id="toolbox2_bubble" onmouseover="BubbleHover(this, true);" onmouseout="BubbleHover(this, false);"> + <div class="rounded_ll"> + <div class="rounded_lr"> + <div class="rounded_ul"> + <div class="rounded_ur"> + + <div class="bubble"> + <table id="toolbox2_head" onclick="ToggleToolbox(2);"> + <tr> + <td id="toolbox2_image"><td> + <td class="toolbox_head"><strong><?php echo $peoplemap_langres["mylocation"]; ?></strong></td> + </tr> + </table> + + <div id="toolbox2_controls"> + <?php + $logintext = $peoplemap_langres["mylocation_login"]; + $logintext .= "<br><br>"; + $logintext .= "<div style=\"text-align: center;\">"; + $logintext .= "<a href=\"/roscms/?page=login&target=" . urlencode($_SERVER["PHP_SELF"]) . "\">" . $peoplemap_langres["mylocation_login_page"] . "</a>"; + $logintext .= "<script type=\"text/javascript\">MyUserId = -1;</script>"; + $logintext .= "</div>"; + + if($_COOKIE["roscmsusrkey"]) + { + $query = "SELECT usersession_user_id FROM $DB_ROSCMS.user_sessions WHERE usersession_id = '" . mysql_real_escape_string($_COOKIE["roscmsusrkey"]) . "' LIMIT 1;"; + $result = mysql_query($query, $db) or die("Query failed #2!"); + + if(mysql_num_rows($result) > 0) + $userid = mysql_result($result, 0); + + mysql_close($db); + + if($userid) + { + echo $peoplemap_langres["mylocation_intro"]; + + echo "<ul>"; + + echo "<li>"; + echo $peoplemap_langres["mylocation_marker_intro"] . "<br>"; + echo "<input type=\"button\" onclick=\"SetLocationMarker();\" value=\"" . $peoplemap_langres["mylocation_marker_button"] . "\">"; + echo "<br><br>"; + echo "</li>"; + + echo "<li>"; + echo $peoplemap_langres["mylocation_coordinates_intro"] . "<br>"; + echo "<table>"; + echo "<tr><td>" . $peoplemap_langres["latitude"] . ":</td><td><input type=\"text\" id=\"mylocation_latitude\" size=\"10\" onkeyup=\"CheckCoordinate(this);\">°</td></tr>"; + echo "<tr><td>" . $peoplemap_langres["longitude"] . ":</td><td><input type=\"text\" id=\"mylocation_longitude\" size=\"10\" onkeyup=\"CheckCoordinate(this);\">°</td></tr>"; + echo "</table>"; + echo "<input type=\"button\" onclick=\"SetLocationCoordinates();\" value=\"" . $peoplemap_langres["mylocation_coordinates_button"] . "\"> "; + echo "<img id=\"ajaxloading_setlocation_coordinates\" style=\"visibility: hidden;\" src=\"images/ajax_loading.gif\" alt=\"\">"; + echo "<br><br>"; + echo "</li>"; + + echo "<li>"; + echo $peoplemap_langres["mylocation_delete_intro"] . "<br>"; + echo "<input type=\"button\" onclick=\"DeleteMyLocation();\" value=\"" . $peoplemap_langres["mylocation_delete_button"] . "\">"; + echo "</li>"; + + echo "</ul>"; + + echo "<script type=\"text/javascript\">"; + echo "MyUserId = $userid;"; + echo "</script>"; + } + else + echo $logintext; + } + else + echo $logintext; + ?> + </div> + </div> + + </div> + </div> + </div> + </div> + </div> + </td> + </tr> +</table> + +</td> +</tr> +</table> + +</body> +</html> Propchange: trunk/web/reactos.org/htdocs/peoplemap/index.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php Mon Feb 11 21:43:40 2008 @@ -1,0 +1,47 @@ +ï»¿<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/lang/de.inc.php + PURPOSE: Translation + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + TRANSLATOR: Colin Finck +*/ + + /**** German resources (charset=utf-8) ****/ + $peoplemap_langres["language"] = "Sprache"; + + $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">Startseite</a> > ReactOS Personen-Karte'; + $peoplemap_langres["title"] = "ReactOS Personen-Karte"; + $peoplemap_langres["intro"] = 'Die folgende Karte zeigt die Standorte von ReactOS-Entwicklern und -Benutzern.'; + + $peoplemap_langres["filter"] = "Nach Benutzergruppen filtern"; + $peoplemap_langres["filter_intro"] = "Klicken Sie auf ein KontrollkÃ¤stchen neben einer Benutzergruppe, um alle Benutzer dieser Gruppe zur Karte hinzuzufÃ¼gen oder von der Karte zu entfernen."; + + $peoplemap_langres["add"] = "Benutzer suchen und zur Karte hinzufÃ¼gen"; + $peoplemap_langres["add_username"] = "Benutzername"; + $peoplemap_langres["add_fullname"] = "Voller Name"; + + $peoplemap_langres["mylocation"] = "Meine Position auf der Karte"; + $peoplemap_langres["mylocation_login"] = "Sie mÃ¼ssen eingeloggt sein, um Ihre Position festzulegen."; + $peoplemap_langres["mylocation_login_page"] = "Login-Seite"; + $peoplemap_langres["mylocation_intro"] = "Hier kÃ¶nnen Sie ihre eigene Position auf der Karte festlegen. Sie haben dazu mehrere MÃ¶glichkeiten:"; + $peoplemap_langres["mylocation_marker_intro"] = "Einen Marker verwenden und diesen auf Ihre Position auf der Karte ziehen."; + $peoplemap_langres["mylocation_marker_button"] = "Den Marker verwenden"; + $peoplemap_langres["mylocation_marker_save_intro"] = "Klicken Sie auf den folgenden Button,<br>um Ihre Position zu speichern."; + $peoplemap_langres["mylocation_marker_save_button"] = "Meine Position speichern"; + $peoplemap_langres["mylocation_marker_cancel"] = "Abbrechen"; + $peoplemap_langres["mylocation_coordinates_intro"] = "Die Koordinaten in dezimalen Gradzahlen selbst angeben:"; + $peoplemap_langres["mylocation_coordinates_button"] = "Eintragen"; + $peoplemap_langres["mylocation_coordinates_invalid"] = "Dies sind keine gÃ¼ltigen Koordinaten!"; + $peoplemap_langres["mylocation_delete_intro"] = "Ãber den folgenden Button kÃ¶nnen Sie Ihre eigene Position auf der Karte lÃ¶schen."; + $peoplemap_langres["mylocation_delete_button"] = "Eigene Position lÃ¶schen"; + + $peoplemap_langres["latitude"] = "Breite"; + $peoplemap_langres["longitude"] = "LÃ¤nge"; + $peoplemap_langres["removefrommap"] = "Diese Person aus der Karte entfernen"; + $peoplemap_langres["minquerylength"] = "Bitte geben Sie mindestens 3 Zeichen ein."; + $peoplemap_langres["nousers"] = "Keinen Benutzer mit Ortsdaten gefunden."; + $peoplemap_langres["activatejs"] = "Sie mÃ¼ssen JavaScript aktivieren, um die Personen-Karte zu benutzen!"; + $peoplemap_langres["unsupportedbrowser"] = "Die Personen-Karte wird von Ihrem Browser nicht unterstÃ¼tzt."; +?> Propchange: trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php Mon Feb 11 21:43:40 2008 @@ -1,0 +1,47 @@ +ï»¿<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/lang/en.inc.php + PURPOSE: Translation + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + TRANSLATOR: Colin Finck +*/ + + /**** English resources (charset=utf-8) ****/ + $peoplemap_langres["language"] = "Language"; + + $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">Startseite</a> > ReactOS People Map'; + $peoplemap_langres["title"] = "ReactOS People Map"; + $peoplemap_langres["intro"] = "The following map shows the locations of ReactOS Developers and Users"; + + $peoplemap_langres["filter"] = "Filter by User Groups"; + $peoplemap_langres["filter_intro"] = "Click a Checkbox next to a User Group to add all Users of this Group to the Map or remove them."; + + $peoplemap_langres["add"] = "Search for a User and Add him to the Map"; + $peoplemap_langres["add_username"] = "User name"; + $peoplemap_langres["add_fullname"] = "Full name"; + + $peoplemap_langres["mylocation"] = "My Location on the Map"; + $peoplemap_langres["mylocation_login"] = "You must be logged in to set your Location."; + $peoplemap_langres["mylocation_login_page"] = "Login Page"; + $peoplemap_langres["mylocation_intro"] = "Here you can set your own Location on the Map. You have several Possibilities to do so:"; + $peoplemap_langres["mylocation_marker_intro"] = "Use a Marker and drag it to your Location on the Map."; + $peoplemap_langres["mylocation_marker_button"] = "Use the Marker"; + $peoplemap_langres["mylocation_marker_save_intro"] = "Click the following Button<br>to save your Location."; + $peoplemap_langres["mylocation_marker_save_button"] = "Save my Location"; + $peoplemap_langres["mylocation_marker_cancel"] = "Cancel"; + $peoplemap_langres["mylocation_coordinates_intro"] = "Enter the Coordinates in decimal Degrees yourself:"; + $peoplemap_langres["mylocation_coordinates_button"] = "Set"; + $peoplemap_langres["mylocation_coordinates_invalid"] = "These are not valid Coordinates!"; + $peoplemap_langres["mylocation_delete_intro"] = "Using the following Button, you can remove your Location on the Map."; + $peoplemap_langres["mylocation_delete_button"] = "Delete my Location"; + + $peoplemap_langres["latitude"] = "Latitude"; + $peoplemap_langres["longitude"] = "Longitude"; + $peoplemap_langres["removefrommap"] = "Remove this User from the Map"; + $peoplemap_langres["minquerylength"] = "Please enter at least 3 characters."; + $peoplemap_langres["nousers"] = "No user with location data found!"; + $peoplemap_langres["activatejs"] = "You have to activate JavaScript to use the People Map!"; + $peoplemap_langres["unsupportedbrowser"] = "The People Map is not supported by your Browser."; +?> Propchange: trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php Mon Feb 11 21:43:40 2008 @@ -1,0 +1,15 @@ +<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/languages.inc.php + PURPOSE: Language list + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> +*/ + + // The language names have to be saved in an UTF-8 file without the Byte-Order-Mark + $peoplemap_languages = array( + "en" => "English", + "de" => "Deutsch (German)" + ); +?> Propchange: trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/p… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css (added) +++ trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css Mon Feb 11 21:43:40 2008 @@ -1,0 +1,233 @@ +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/peoplemap.css + PURPOSE: Main stylesheet + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> +*/ + +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10pt; + margin: 0 0 1em 0; + padding: 0; /* Only affects Opera */ + background: #FFFFFF url('http://www.reactos.org/images/topbar.jpg') repeat-x scroll top left; +} + +a { + color: #006090; +} + +a:hover { + color: #000000; +} + +tr, td { + vertical-align: top; +} + +h1 { + display: block; + line-height: normal; + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + padding: 0px 0px 1px 10px; + margin-top: 0; +} + +h1 a { + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + text-decoration: none; +} + +h1 a:hover { + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + text-decoration: underline; +} + +h2 { + font-size: 22px; + color: #5984C3; + font-weight: bold; + margin-top: 0; +} + +h3 { + font-size: 10pt; + color: black; + font-weight: bold; + margin-top: 0; + margin-bottom: 1em; +} + +#top { + margin: 0; + background: url('http://www.reactos.org/images/logo.jpg') no-repeat scroll 35px 0; + padding: 103px 0 26px 0; + color: #FFFFFF; + text-align: right; +} + +#top a { + font-size: 13px; + color: #FFFFFF; + text-decoration: none; + padding: 1px 5px 1px 5px; +} + +#top a:hover { + color: #000000; + background-color: #FFCC33; +} + +#topMenu { + font-size: 13px; + margin-left: 300px; + background-color: #5984C3; +} + +#topMenu p { + text-align: left; + margin: 0; +} + +#leftNav { + padding: 0px 10px 10px 7px; +} + +#leftNav ol { + margin: 0; + padding: 0; + list-style-type: none; + background-color: #EEEEEE; + border-top: #3F3849 0px solid; + border-right: #3F3849 1px solid; + border-left: #3F3849 1px solid; +} + +#leftNav ol li { + font-size: 13px; + font-weight: bold; + border-bottom: #3f3849 1px solid; +} + +#leftNav ol li a { + font-size: 12px; + + display: block; + width: 137px; + padding: 2px 4px 2px 4px; + + color: #3F3849; + text-decoration: none; + background-color: #EEEEEE; +} + +#leftNav ol li a:hover { + color: #000000; + background-color: #FFCC33; +} + +#leftNav ol li a.extern { + background: none; + padding-right: 0px; +} + +#leftNav .navTitle { + padding-left: 12px; + border-top: #3F3849 1px solid; + border-right: #3F3849 1px solid; + border-bottom: #3F3849 1px solid; + border-left: #3F3849 1px solid; + + font-weight: bold; + font-size: 14px; + color: #FFFFFF; + background-color: #5984c3; +} + +#content { + padding-right: 10px; +} + +.bubble_bg, .selectable_bubble_bg, .hovered_bubble_bg { + margin-bottom: 10px; +} + +.bubble_bg { + background: #C9DAF8; +} + +.selectable_bubble_bg { + background: #E1EAFB; +} + +.hovered_bubble_bg { + background: #FFFFCC; +} + +.bubble { + padding: 8px; +} + +.rounded_ul { + background: transparent url(images/ul.gif) no-repeat scroll left top; +} +.rounded_ur { + background: transparent url(images/ur.gif) no-repeat scroll right top; +} +.rounded_ll { + background: transparent url(images/ll.gif) no-repeat scroll left bottom; +} +.rounded_lr { + background: transparent url(images/lr.gif) no-repeat scroll right bottom; +} + +#toolbox_td { + width: 300px; + padding-left: 7px; +} + +#toolbox0_image, #toolbox1_image, #toolbox2_image { + height: 40px; + width: 47px; +} + +#toolbox0_image { + background: url(images/filter.png) no-repeat; +} + +#toolbox1_image { + background: url(images/add-user.png) no-repeat; +} + +#toolbox2_image { + background: url(images/set-location.png) no-repeat; +} + +#toolbox1_head, #toolbox2_head { + cursor: pointer; +} + +#toolbox1_controls, #toolbox2_controls { + display: none; +} + +div.colorbox { + border: solid 1px black; + height: 15px; + width: 15px; +} + +td.toolbox_head { + /* This is mainly necessary for IE (as always ;-), but also useful as a general rule for the other browsers */ + width: 220px; +} Propchange: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/p… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php Mon Feb 11 21:43:40 2008 @@ -1,0 +1,524 @@ +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/peoplemap.js.php + PURPOSE: Main JavaScript file (parsed by PHP before) + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> +*/ + +var Map; +var IconTable; +var MarkerTable; +var MyLocationMarker = null; + +function AddUserToMap(UserId, UserName, FullName, Latitude, Longitude, UserGroup) +{ + // Has this user already been added to the map? + if(MarkerTable[UserId] || (UserId == MyUserId && MyLocationMarker)) + return; + + var IconColor; + + if(!UserGroup) + { + UserGroup = ""; + IconColor = "white"; + } + else + IconColor = IconTable[UserGroup]; + + var Icon = new GIcon(G_DEFAULT_ICON, "images/marker_" + IconColor + ".png"); + var Marker = new GMarker( new GLatLng(Latitude, Longitude), Icon ); + var html; + + html = "<strong><a href=\"http://reactos.org/roscms/?page=user&sec=profil&sec2=" + UserId + "\" target=\"_blank\">" + UserName + "</a></strong><br>"; + html += FullName + "<br><br>"; + + // parseFloat strips off trailing zeros + html += "<?php echo $peoplemap_langres["latitude"]; ?>: " + parseFloat(Latitude) + "°<br>"; + html += "<?php echo $peoplemap_langres["longitude"]; ?>: " + parseFloat(Longitude) + "°<br><br>"; + + html += "<a href=\"javascript:RemoveUserFromMap(" + UserId + ")\"><?php echo $peoplemap_langres["removefrommap"]; ?></a>"; + + GEvent.addListener( Marker, "click", function() {Marker.openInfoWindowHtml(html);} ); + + MarkerTable[UserId] = new Object(); + MarkerTable[UserId].group = UserGroup; + MarkerTable[UserId].marker = Marker; + + Map.addOverlay(Marker); +} + +function RemoveUserFromMap(UserId) +{ + Map.removeOverlay(MarkerTable[UserId].marker); + delete MarkerTable[UserId]; +} + +function SetLoading(id, value) +{ + document.getElementById("ajaxloading_" + id).style.visibility = (value ? "visible" : "hidden"); +} + +function AjaxGet(action, parameters, data) +{ + var HttpRequest = false; + + switch(action) + { + case "GetUsersByName": + SetLoading("add", true); + var url = "ajax-getuser.php?" + parameters; + var callback = "GetUsersByNameCallback(HttpRequest);"; + break; + + case "GetUsersByGroup": + SetLoading(data, true); + var url = "ajax-getuser.php?" + parameters; + var callback = "GetUsersByGroupCallback(HttpRequest, data);"; + break; + + case "SetLocation": + SetLoading(data, true); + var url = "ajax-setlocation.php?" + parameters; + var callback = "SetLocationCallback(HttpRequest, data);"; + break; + + case "SetLocation_GetUser": + var url = "ajax-getuser.php?" + parameters; + var callback = "SetLocationMarker_GetUserCallback(HttpRequest);"; + break; + + case "DeleteMyLocation": + var url = "ajax-deletelocation.php?delete=1"; + var callback = ""; + break; + } + + if (window.XMLHttpRequest) + { + // Mozilla, Safari, ... + HttpRequest = new XMLHttpRequest(); + } + else if (window.ActiveXObject) + { + // IE + try + { + HttpRequest = new ActiveXObject("Msxml2.XMLHTTP"); + } + catch (e) + { + try + { + HttpRequest = new ActiveXObject("Microsoft.XMLHTTP"); + } + catch (e) {} + } + } + + if (!HttpRequest) + { + alert("Giving up :( Cannot create an XMLHTTP instance"); + return false; + } + + HttpRequest.open("GET", url, true); + HttpRequest.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache + HttpRequest.send(null); + + HttpRequest.onreadystatechange = function() + { + if(HttpRequest.readyState == 4) + { + if(HttpRequest.status == 200) + eval(callback); + else + alert("AJAX Request problem!" + "\n\nError Code: " + HttpRequest.status + "\nError Text: " + HttpRequest.statusText + "\nURL: " + url); + } + } +} + +function GetUsersByNameCallback(HttpRequest) +{ + // Check for an error + if( HttpRequest.responseXML.getElementsByTagName("error").length > 0 ) + alert( HttpRequest.responseXML.getElementsByTagName("error")[0].firstChild.data ); + else + { + var users = HttpRequest.responseXML.getElementsByTagName("user"); + + if(users.length == 0) + document.getElementById("add_user_result").innerHTML = "<?php echo addslashes($peoplemap_langres["nousers"]); ?>"; + else + { + var html = "<ul>"; + + for( var i = 0; i < users.length; i++ ) + { + var UserId = users[i].getElementsByTagName("id")[0].firstChild.data; + var UserName = users[i].getElementsByTagName("username")[0].firstChild.data; + + var FullName = ""; + if(users[i].getElementsByTagName("fullname")[0].firstChild) + FullName = users[i].getElementsByTagName("fullname")[0].firstChild.data; + + var Latitude = users[i].getElementsByTagName("latitude")[0].firstChild.data; + var Longitude = users[i].getElementsByTagName("longitude")[0].firstChild.data; + + html += "<li>"; + html += "<a href=\"javascript:AddUserToMap(" + UserId + ", '" + UserName + "', '" + FullName + "', " + Latitude + ", " + Longitude + ");\">"; + html += UserName; + html += "</a>"; + + if(FullName != "") + html += " (" + FullName + ")"; + + html += "</li>"; + } + + html += "</ul>"; + + document.getElementById("add_user_result").innerHTML = html; + } + } + + SetLoading("add", false); +} + +function GetUsersByGroupCallback(HttpRequest, UserGroup) +{ + // Check for an error + if( HttpRequest.responseXML.getElementsByTagName("error").length > 0 ) + alert( HttpRequest.responseXML.getElementsByTagName("error")[0].firstChild.data ); + else + { + var users = HttpRequest.responseXML.getElementsByTagName("user"); + + for( var i = 0; i < users.length; i++ ) + { + var UserId = users[i].getElementsByTagName("id")[0].firstChild.data; + var UserName = users[i].getElementsByTagName("username")[0].firstChild.data; + + var FullName = ""; + if(users[i].getElementsByTagName("fullname")[0].firstChild) + FullName = users[i].getElementsByTagName("fullname")[0].firstChild.data; + + var Latitude = users[i].getElementsByTagName("latitude")[0].firstChild.data; + var Longitude = users[i].getElementsByTagName("longitude")[0].firstChild.data; + + AddUserToMap(UserId, UserName, FullName, Latitude, Longitude, UserGroup); + } + } + + SetLoading(UserGroup, false); +} + +function GetUser() +{ + var len = document.getElementById("add_query").value.length; + + if(len == 0) + document.getElementById("add_user_result").innerHTML = ""; + else if(len < 3) + document.getElementById("add_user_result").innerHTML = "<?php echo addslashes($peoplemap_langres["minquerylength"]); ?>"; + else + { + var param = "query=" + document.getElementById("add_query").value + "&subject="; + + if(document.getElementById("add_subject").selectedIndex == 0) + param += "username"; + else + param += "fullname"; + + AjaxGet("GetUsersByName", param); + } +} + +function OnWindowResize() +{ + var MinMapHeight = 300; + var MinWndScrollHeight = 800; + var MinMapWidth = 500; + var SubtractHeight = 300; + var SubtractWidth = 500; + + var MapBox = document.getElementById("map"); + var MapHeight; + var WndHeight; + var MapWidth; + + // Set the height + if(window.innerHeight) + { + // All browsers except IE + WndHeight = window.innerHeight; + MapHeight = window.innerHeight - SubtractHeight; + MapWidth = window.innerWidth - SubtractWidth; + } + else + { + // IE in Strict Mode + WndHeight = document.documentElement.clientHeight; + MapHeight = document.documentElement.clientHeight - SubtractHeight; + MapWidth = document.documentElement.clientWidth - SubtractWidth; + } + + if(MapHeight < MinMapHeight) + MapHeight = MinMapHeight; + + if(MapWidth < MinMapWidth) + MapWidth = MinMapWidth; + + if(Map) + { + if(WndHeight < MinWndScrollHeight) + Map.disableScrollWheelZoom(); + else + Map.enableScrollWheelZoom(); + } + + MapBox.style.height = String(MapHeight) + "px"; + MapBox.style.width = String(MapWidth) + "px"; +} + +function Load() +{ + // Exclude IE 5.5 as well, because it has problems with the CSS cursor attribute and various other stuff + if( !GBrowserIsCompatible() || navigator.userAgent.indexOf("MSIE 5.5") >= 0) + { + alert("<?php echo $peoplemap_langres["unsupportedbrowser"]; ?>"); + return; + } + + window.onresize = OnWindowResize; + + // Call it for setting the MapBox dimensions before creating the map in it + OnWindowResize(); + + Map = new GMap2( document.getElementById("map") ); + Map.addControl(new GLargeMapControl()); + Map.addControl(new GMapTypeControl()); + Map.addControl(new GOverviewMapControl(new GSize(150,150))); + Map.setCenter(new GLatLng(0, 0), 1); + + // Call it again for enabling/disabling scroll wheel zoom + OnWindowResize(); + + MarkerTable = new Object(); +} + +function Unload() +{ + delete IconTable; + delete MarkerTable; + GUnload(); +} + +function ToggleToolbox(id) +{ + var i; + var ToolboxBubble; + var ToolboxHead; + var ToolboxControls; + + for(i = 0; ; i++) + { + ToolboxBubble = document.getElementById("toolbox" + i + "_bubble"); + ToolboxHead = document.getElementById("toolbox" + i + "_head"); + ToolboxControls = document.getElementById("toolbox" + i + "_controls"); + + if(ToolboxBubble && ToolboxHead && ToolboxControls) + { + if(i == id) + { + // Show the toolbox identified by "id", hide all the others + ToolboxBubble.className = "bubble_bg"; + ToolboxBubble.onmouseover = null; + ToolboxBubble.onmouseout = null; + ToolboxHead.style.cursor = "default"; + ToolboxControls.style.display = "block"; + } + else + { + ToolboxBubble.className = "selectable_bubble_bg"; + ToolboxBubble.onmouseover = function() {BubbleHover(this, true);}; + ToolboxBubble.onmouseout = function() {BubbleHover(this, false);}; + ToolboxHead.style.cursor = "pointer"; + ToolboxControls.style.display = "none"; + } + } + else + break; + } +} + +function ToggleUserGroup(CheckBox, UserGroup) +{ + var id; + + if(CheckBox.checked) + { + // Add all users belonging to this group to the map + var param = "query=" + UserGroup + "&subject=group"; + var data = UserGroup; + AjaxGet("GetUsersByGroup", param, data); + } + else + { + // Remove all users from the map, which belong to the group, which has just been unchecked with the checkbox + for(id in MarkerTable) + { + if(MarkerTable[id].group == UserGroup) + RemoveUserFromMap(id); + } + } +} + +function SetLocationMarker() +{ + RemoveMyMarkers(); + + // Get the current location of the user + var param = "subject=userid&query=" + MyUserId; + AjaxGet("SetLocation_GetUser", param); +} + +function SetLocationMarker_GetUserCallback(HttpRequest) +{ + // GMarkerOptions has no constructor, so we use a normal JavaScript Object() here + var opts = new Object(); + opts.draggable = true; + opts.bouncy = true; + + var latitude = 0; + var longitude = 0; + + if(HttpRequest.responseXML.getElementsByTagName("latitude")[0]) + { + latitude = HttpRequest.responseXML.getElementsByTagName("latitude")[0].firstChild.data; + longitude = HttpRequest.responseXML.getElementsByTagName("longitude")[0].firstChild.data; + } + else + { + // We set the marker at 0° N, 0° E. To ensure that the user sees the marker, reset the viewport. + Map.setCenter(new GLatLng(0, 0), 1); + } + + MyLocationMarker = new GMarker( new GLatLng(latitude, longitude), opts ); + var html; + + html = "<?php echo $peoplemap_langres["mylocation_marker_save_intro"]; ?><br><br>"; + html += "<input type=\"button\" onclick=\"SetLocationMarker_Save();\" value=\"<?php echo $peoplemap_langres["mylocation_marker_save_button"]; ?>\"> "; + html += "<input type=\"button\" onclick=\"SetLocationMarker_Cancel();\" value=\"<?php echo $peoplemap_langres["mylocation_marker_cancel"]; ?>\"> "; + html += "<img id=\"ajaxloading_setlocation_marker\" style=\"visibility: hidden;\" src=\"images/ajax_loading.gif\" alt=\"\">"; + + GEvent.addListener( MyLocationMarker, "click", function() {MyLocationMarker.openInfoWindowHtml(html);} ); + GEvent.addListener( MyLocationMarker, "dragstart", function() {MyLocationMarker.closeInfoWindow();} ); + GEvent.addListener( MyLocationMarker, "dragend", function() {MyLocationMarker.openInfoWindowHtml(html);} ); + + Map.addOverlay(MyLocationMarker); +} + +function SetLocationMarker_Cancel() +{ + Map.removeOverlay(MyLocationMarker); + MyLocationMarker = null; +} + +function SetLocationMarker_Save() +{ + var latlng; + var param; + + latlng = MyLocationMarker.getLatLng(); + param = "latitude=" + latlng.lat().toFixed(6) + "&longitude=" + latlng.lng().toFixed(6); + + AjaxGet("SetLocation", param, "setlocation_marker"); +} + +function SetLocationCallback(HttpRequest, data) +{ + // Check for an error + if( HttpRequest.responseXML.getElementsByTagName("error").length > 0 ) + alert( HttpRequest.responseXML.getElementsByTagName("error")[0].firstChild.data ); + else if( HttpRequest.responseXML.getElementsByTagName("userinformation").length > 0 ) + { + RemoveMyMarkers(); + + // Add a normal white marker + var UserId = HttpRequest.responseXML.getElementsByTagName("id")[0].firstChild.data; + var UserName = HttpRequest.responseXML.getElementsByTagName("username")[0].firstChild.data; + + var FullName = ""; + if(HttpRequest.responseXML.getElementsByTagName("fullname")[0].firstChild) + FullName = HttpRequest.responseXML.getElementsByTagName("fullname")[0].firstChild.data; + + var Latitude = HttpRequest.responseXML.getElementsByTagName("latitude")[0].firstChild.data; + var Longitude = HttpRequest.responseXML.getElementsByTagName("longitude")[0].firstChild.data; + + AddUserToMap(UserId, UserName, FullName, Latitude, Longitude); + } + + // Only hide the coordinates loading animation, the other one has already been deleted by the RemoveMyMarkers() call above + if(data == "setlocation_coordinates") + SetLoading(data, false); +} + +function DeleteMyLocation() +{ + RemoveMyMarkers(); + AjaxGet("DeleteMyLocation"); +} + +function SetLocationCoordinates() +{ + lat = parseFloat(document.getElementById("mylocation_latitude").value); + lng = parseFloat(document.getElementById("mylocation_longitude").value); + + if(isNaN(lat) || isNaN(lng)) + { + alert("<?php echo $peoplemap_langres["mylocation_coordinates_invalid"]; ?>"); + return; + } + + if(lat >= -90 && lat <= 90 && + lng >= -180 && lng <= 180) + { + // These are correct coordinates, set them + var param = "latitude=" + lat.toFixed(6) + "&longitude=" + lng.toFixed(6); + + AjaxGet("SetLocation", param, "setlocation_coordinates"); + } + else + alert("<?php echo $peoplemap_langres["mylocation_coordinates_invalid"]; ?>"); +} + +function CheckCoordinate(elem) +{ + var val = elem.value.replace( /[^[0-9-.]/g, ""); + + // First check if something was changed by the replace function. + // If not, don't set elem.value = val. Otherwise the cursor would always jump to the last character in IE, when you press any key. + if( elem.value != val ) + elem.value = val; +} + +function RemoveMyMarkers() +{ + // Is the user already setting his position? + if(MyLocationMarker) + SetLocationMarker_Cancel(); + + // Has the user already been added to the map? + if(MarkerTable[MyUserId]) + RemoveUserFromMap(MyUserId); +} + +function BubbleHover(elem, hover) +{ + if(hover) + elem.className = "hovered_bubble_bg"; + else + elem.className = "selectable_bubble_bg"; +} Propchange: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/p… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/peoplemap.sql (added) +++ trunk/web/reactos.org/htdocs/peoplemap/peoplemap.sql Mon Feb 11 21:43:40 2008 @@ -1,0 +1,8 @@ +-- SQL Dump for the "peoplemap" database + +CREATE TABLE `user_locations` ( + `roscms_user_id` bigint(20) UNSIGNED NOT NULL, + `latitude` float(8,6) NOT NULL, + `longitude` float(9,6) NOT NULL, + PRIMARY KEY (`roscms_user_id`) +); Propchange: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.sql ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 32302: - Minor cleanup. See issue #3054 for more details.
by fireball＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: fireball Date: Mon Feb 11 20:45:56 2008 New Revision: 32302 URL: http://svn.reactos.org/svn/reactos?rev=32302&view=rev Log: - Minor cleanup. See issue #3054 for more details. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/procsup.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c Mon Feb 11 20:45:56 2008 @@ -542,10 +542,6 @@ * PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_GUARD, * PAGE_NOACCESS * RETURNS: Status - * NOTES: Must run at IRQL PASSIVE_LEVEL? (or is APC_LEVEL cool too?) - * MSDN states that ZwAllocateVirtualMemory IRQL must be PASSIVE_LEVEL, - * but why wouldn't APC_LEVEL be valid (or is that only for the Zw* version - * and Nt* can indeed run at APC_LEVEL?) */ { PEPROCESS Process; @@ -561,10 +557,7 @@ PHYSICAL_ADDRESS BoundaryAddressMultiple; KPROCESSOR_MODE PreviousMode; - // TMN: Someone Pick one of these. Until it's clear which - // level is allowed, I play it safe and check for <= APC_LEVEL PAGED_CODE(); -// ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); DPRINT("NtAllocateVirtualMemory(*UBaseAddress %x, " "ZeroBits %d, *URegionSize %x, AllocationType %x, Protect %x)\n", Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c Mon Feb 11 20:45:56 2008 @@ -636,7 +636,7 @@ szDest = Process->ImageFileName; lnFName = min(lnFName, sizeof(Process->ImageFileName) - 1); while (lnFName--) *szDest++ = (UCHAR)*szSrc++; - *szDest = UNICODE_NULL; + *szDest = ANSI_NULL; /* Check if caller wants an audit name */ if (AuditName)

1 0

[hpoussin] 32301: Use dynamic traces Some cleanup
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:54:05 2008 New Revision: 32301 URL: http://svn.reactos.org/svn/reactos?rev=32301&view=rev Log: Use dynamic traces Some cleanup Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/finfo.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/npfs.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/npfs.rbuild trunk/reactos/drivers/filesystems/npfs_new/rw.c trunk/reactos/drivers/filesystems/npfs_new/volume.c Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/create.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/create.c Mon Feb 11 19:54:05 2008 @@ -10,42 +10,43 @@ #include "npfs.h" -//#define NDEBUG -#include <debug.h> - /* FUNCTIONS *****************************************************************/ NTSTATUS NTAPI -NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsCreate(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - NpfsDbgPrint(NPFS_DL_API_TRACE, "IRP_MJ_CREATE\n"); + TRACE_(NPFS, "IRP_MJ_CREATE\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } NTSTATUS NTAPI -NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsCreateNamedPipe(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - NpfsDbgPrint(NPFS_DL_API_TRACE, "IRP_MJ_CREATE Named Pipe\n"); + TRACE_(NPFS, "IRP_MJ_CREATE Named Pipe\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } NTSTATUS NTAPI -NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - NpfsDbgPrint(NPFS_DL_API_TRACE, "Cleanup\n"); + TRACE_(NPFS, "Cleanup\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } NTSTATUS NTAPI -NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - NpfsDbgPrint(NPFS_DL_API_TRACE, "IRP_MJ_CLOSE\n"); + TRACE_(NPFS, "IRP_MJ_CLOSE\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/finfo.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/finfo.c Mon Feb 11 19:54:05 2008 @@ -10,19 +10,17 @@ #include "npfs.h" -//#define NDEBUG -#include <debug.h> - /* FUNCTIONS *****************************************************************/ NTSTATUS NTAPI -NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsQueryInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { + TRACE_(NPFS, "NpfsQueryInformation()\n"); + FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsQueryInformation()\n"); - - /* TODO: Implement */ + UNIMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); FsRtlExitFileSystem(); @@ -31,13 +29,14 @@ } NTSTATUS NTAPI -NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsSetInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { + TRACE_(NPFS, "NpfsSetInformation()\n"); + FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsSetInformation()\n"); - - /* TODO: Implement */ + UNIMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c Mon Feb 11 19:54:05 2008 @@ -10,19 +10,17 @@ #include "npfs.h" -//#define NDEBUG -#include <debug.h> - /* FUNCTIONS *****************************************************************/ NTSTATUS NTAPI -NpfsDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsDirectoryControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { + TRACE_(NPFS, "NpfsDirectoryControl()\n"); + FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsDirectoryControl()\n"); - - /* TODO: Implement */ + UNIMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); FsRtlExitFileSystem(); @@ -31,13 +29,14 @@ } NTSTATUS NTAPI -NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsFileSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { + TRACE_(NPFS, "NpfsFileSystemControl()\n"); + FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsFileSystemControl()\n"); - - /* TODO: Implement */ + UNIMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.c Mon Feb 11 19:54:05 2008 @@ -10,25 +10,34 @@ #include "npfs.h" -//#define NDEBUG -#include <debug.h> - -ULONG NpfsDebugLevel = NPFS_DL_API_TRACE; - -static VOID NpfsInitializeVcb(PNPFS_VCB Vcb); - /* FUNCTIONS *****************************************************************/ +static VOID +NpfsInitializeVcb(OUT PNPFS_VCB Vcb) +{ + /* Initialize Volume Control Block, it's one per whole named pipe + file system. */ + + TRACE_(NPFS, "NpfsInitializeVcb(), Vcb = %p\n", Vcb); + + /* Zero-init whole VCB */ + RtlZeroMemory(Vcb, sizeof(NPFS_VCB)); + + /* Initialize the common header */ + Vcb->NodeTypeCode = NPFS_NODETYPE_VCB; + Vcb->NodeByteSize = sizeof(NPFS_VCB); +} + NTSTATUS NTAPI -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) { PNPFS_DEVICE_EXTENSION DeviceExtension; PDEVICE_OBJECT DeviceObject; - UNICODE_STRING DeviceName; + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\NamedPipe"); NTSTATUS Status; - DPRINT("Named Pipe File System Driver v0.1\n"); + TRACE_(NPFS, "DriverEntry(%p, %wZ)", DriverObject, RegistryPath); ASSERT (sizeof(NPFS_CONTEXT) <= FIELD_OFFSET(IRP, Tail.Overlay.DriverContext)); ASSERT (sizeof(NPFS_WAITER_ENTRY) <= FIELD_OFFSET(IRP, Tail.Overlay.DriverContext)); @@ -50,7 +59,6 @@ DriverObject->DriverUnload = NULL; - RtlInitUnicodeString(&DeviceName, L"\\Device\\NamedPipe"); Status = IoCreateDevice(DriverObject, sizeof(NPFS_DEVICE_EXTENSION), &DeviceName, @@ -60,7 +68,7 @@ &DeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("Failed to create named pipe device! (Status %x)\n", Status); + WARN_(NPFS, "Failed to create named pipe device! (Status 0x%08x)\n", Status); return Status; } @@ -85,36 +93,4 @@ return STATUS_SUCCESS; } -static VOID -NpfsInitializeVcb(PNPFS_VCB Vcb) -{ - /* Initialize Volume Control Block, it's one per whole named pipe - file system. */ - - NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsInitializeVcb(), Vcb = %p\n", Vcb); - - /* Zero-init whole VCB */ - RtlZeroMemory(Vcb, sizeof(NPFS_VCB)); - - /* Initialize the common header */ - Vcb->NodeTypeCode = NPFS_NODETYPE_VCB; - Vcb->NodeByteSize = sizeof(NPFS_VCB); -} - -VOID NTAPI -NpfsDbgPrint(ULONG Level, char *fmt, ...) -{ - va_list args; - char str[300]; - - if (!(NpfsDebugLevel & Level)) - return; - - va_start(args, fmt); - vsnprintf(str, sizeof(str), fmt, args); - va_end(args); - DbgPrint ("%4.4d: NPFS %s", PsGetCurrentProcessId(), str); -} - - /* EOF */ Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.h (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h Mon Feb 11 19:54:05 2008 @@ -6,10 +6,9 @@ #include <stdarg.h> #include <stdio.h> +#include <debug.h> -/* Debug Levels */ -#define NPFS_DL_NONE 0x00000000 -#define NPFS_DL_API_TRACE 0x00000001 +#define DPFLTR_NPFS_ID DPFLTR_FASTFAT_ID /* Node type codes for NPFS */ #define NPFS_NODETYPE_VCB 0x401 @@ -125,29 +124,24 @@ #define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) -NTSTATUS NTAPI NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS NTAPI NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS NTAPI NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS NTAPI NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH NpfsCreate; +DRIVER_DISPATCH NpfsCreateNamedPipe; +DRIVER_DISPATCH NpfsCleanup; +DRIVER_DISPATCH NpfsClose; -NTSTATUS NTAPI NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS NTAPI NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH NpfsRead; +DRIVER_DISPATCH NpfsWrite; -NTSTATUS NTAPI NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH NpfsFlushBuffers; -NTSTATUS NTAPI NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS NTAPI NpfsDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH NpfsFileSystemControl; +DRIVER_DISPATCH NpfsDirectoryControl; -NTSTATUS NTAPI NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS NTAPI NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH NpfsQueryInformation; +DRIVER_DISPATCH NpfsSetInformation; -NTSTATUS NTAPI NpfsQueryVolumeInformation (PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH NpfsQueryVolumeInformation; -NTSTATUS NTAPI -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath); - -VOID NTAPI -NpfsDbgPrint(ULONG Level, char *fmt, ...); +DRIVER_INITIALIZE DriverEntry; #endif /* __DRIVERS_FS_NP_NPFS_H */ Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.rbuild Mon Feb 11 19:54:05 2008 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="npfs" type="kernelmodedriver" installbase="system32/drivers" installname="npfs.sys"> - <include base="npfs">.</include> <define name="__NO_CTYPE_INLINES" /> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/filesystems/npfs_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/rw.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/rw.c Mon Feb 11 19:54:05 2008 @@ -10,18 +10,16 @@ #include "npfs.h" -//#define NDEBUG -#include <debug.h> - /* FUNCTIONS *****************************************************************/ #ifndef NDEBUG -VOID HexDump(PUCHAR Buffer, ULONG Length) +VOID HexDump(IN PUCHAR Buffer, + IN SIZE_T Length) { CHAR Line[65]; UCHAR ch; const char Hex[] = "0123456789ABCDEF"; - int i, j; + ULONG i, j; DbgPrint("---------------\n"); @@ -44,13 +42,14 @@ #endif NTSTATUS NTAPI -NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsRead(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { + TRACE_(NPFS, "NpfsRead()\n"); + FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsRead()\n"); - - /* TODO: Implement */ + UNIMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); FsRtlExitFileSystem(); @@ -59,13 +58,14 @@ } NTSTATUS NTAPI -NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { + TRACE_(NPFS, "NpfsWrite()\n"); + FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsWrite()\n"); - - /* TODO: Implement */ + UNIMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); FsRtlExitFileSystem(); @@ -74,13 +74,14 @@ } NTSTATUS NTAPI -NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsFlushBuffers(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { + TRACE_(NPFS, "NpfsFlushBuffers()\n"); + FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsFlushBuffers()\n"); - - /* TODO: Implement */ + UNIMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/npfs_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/volume.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/volume.c Mon Feb 11 19:54:05 2008 @@ -10,19 +10,17 @@ #include "npfs.h" -//#define NDEBUG -#include <debug.h> - /* FUNCTIONS ****************************************************************/ NTSTATUS NTAPI -NpfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NpfsQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { + TRACE_(NPFS, "NpfsQueryVolumeInformation()\n"); + FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsQueryVolumeInformation()\n"); - - /* TODO: Implement */ + UNIMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); FsRtlExitFileSystem();

1 0

[hpoussin] 32300: Add support for EXT2 partitions (STILL DISABLED ATM!)
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:52:49 2008 New Revision: 32300 URL: http://svn.reactos.org/svn/reactos?rev=32300&view=rev Log: Add support for EXT2 partitions (STILL DISABLED ATM!) Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/native/fslist.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/usetup.rbuild Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Mon Feb 11 19:52:49 2008 @@ -1766,6 +1766,10 @@ { PartType = "FAT32"; } + else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2) + { + PartType = "EXT2"; + } else if (PartEntry->PartInfo[0].PartitionType == PARTITION_IFS) { PartType = "NTFS"; /* FIXME: Not quite correct! */ @@ -1941,6 +1945,10 @@ (PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13)) { PartType = "FAT32"; + } + else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2) + { + PartType = "EXT2"; } else if (PartEntry->PartInfo[0].PartitionType == PARTITION_IFS) { @@ -2191,6 +2199,8 @@ } } } + else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) + PartEntry->PartInfo[0].PartitionType = PARTITION_EXT2; else if (!FileSystemList->Selected->FormatFunc) return QUIT_PAGE; } @@ -2326,6 +2336,25 @@ } } } + else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) + { + wcscpy(PathBuffer, SourceRootPath.Buffer); + wcscat(PathBuffer, L"\\loader\\ext2.bin"); + + DPRINT("Install EXT2 bootcode: %S ==> %S\n", PathBuffer, + DestinationRootPath.Buffer); + Status = InstallFat32BootCodeToDisk(PathBuffer, + DestinationRootPath.Buffer); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("InstallFat32BootCodeToDisk() failed with status 0x%08lx\n", Status); + /* FIXME: show an error dialog */ + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; + return QUIT_PAGE; + } + } else if (FileSystemList->Selected->FormatFunc) { DestroyFileSystemList(FileSystemList); Modified: trunk/reactos/base/setup/usetup/native/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/f… ============================================================================== --- trunk/reactos/base/setup/usetup/native/fslist.c (original) +++ trunk/reactos/base/setup/usetup/native/fslist.c Mon Feb 11 19:52:49 2008 @@ -1,6 +1,7 @@ #include "usetup.h" /* Filesystem headers */ +#include <fslib/ext2lib.h> #include <fslib/vfatlib.h> #include <fslib/vfatxlib.h> @@ -9,6 +10,7 @@ IN PFILE_SYSTEM_LIST List) { FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); + //FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); return TRUE; } Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Mon Feb 11 19:52:49 2008 @@ -257,6 +257,20 @@ { #if 0 if (CheckFatFormat()) + { + PartEntry->FormatState = Preformatted; + } + else + { + PartEntry->FormatState = Unformatted; + } +#endif + PartEntry->FormatState = Preformatted; + } + else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2) + { +#if 0 + if (CheckExt2Format()) { PartEntry->FormatState = Preformatted; } @@ -1148,6 +1162,10 @@ { PartType = "FAT32"; } + else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2) + { + PartType = "EXT2"; + } else if (PartEntry->PartInfo[0].PartitionType == PARTITION_IFS) { PartType = "NTFS"; /* FIXME: Not quite correct! */ Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h (original) +++ trunk/reactos/base/setup/usetup/partlist.h Mon Feb 11 19:52:49 2008 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * COPYRIGHT: See COPYING in the top level directory +/* COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/partlist.h * PURPOSE: Partition list functions @@ -26,6 +25,9 @@ #ifndef __PARTLIST_H__ #define __PARTLIST_H__ + +/* We have to define it there, because it is not in the MS DDK */ +#define PARTITION_EXT2 0x83 typedef enum _FORMATSTATE { Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild Mon Feb 11 19:52:49 2008 @@ -12,6 +12,7 @@ <linkerflag>-lgcc</linkerflag> <library>zlib</library> <library>inflib</library> + <library>ext2lib</library> <library>vfatlib</library> <library>ntdll</library> <directory name="interface">

1 0

[hpoussin] 32299: Display message only if dmDriverExtra != 0
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:51:26 2008 New Revision: 32299 URL: http://svn.reactos.org/svn/reactos?rev=32299&view=rev Log: Display message only if dmDriverExtra != 0 Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Feb 11 19:51:26 2008 @@ -514,7 +514,10 @@ DPRINT1("WARNING!!! Need to Alloc DMW !!!!!!\n"); } // Dont remove until we finish testing other drivers. - DPRINT1("DMW extra %x !!!!!!\n",PrimarySurface.DMW.dmDriverExtra); + if (PrimarySurface.DMW.dmDriverExtra != 0) + { + DPRINT1("**** DMW extra = %u bytes. Please report to ros-dev(a)reactos.org ****\n", PrimarySurface.DMW.dmDriverExtra); + } if (0 == PrimarySurface.GDIInfo.ulLogPixelsX) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs