Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[ros-arm-bringup] 33967: - Fix stupid IRQL/Interrupt handling code that someone wrote ; ): - Get rid of KeSwapIrql -- both lower and higher IRQL handling was treated the same! - We can now re-activate the assert in the IRQL code - Disable interrupts before changing the interrupt mask!!! - And re-enable them solely if they were enabled. - Clear interrupts mask before setting a new one -- raising isn't always additive! - Fix KiInterruptHandler to perform operations in the right order. - Finish imp

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

Author: ros-arm-bringup Date: Sat Jun 14 17:02:50 2008 New Revision: 33967 URL: http://svn.reactos.org/svn/reactos?rev=33967&view=rev Log: - Fix stupid IRQL/Interrupt handling code that someone wrote ;): - Get rid of KeSwapIrql -- both lower and higher IRQL handling was treated the same! - We can now re-activate the assert in the IRQL code - Disable interrupts before changing the interrupt mask!!! - And re-enable them solely if they were enabled. - Clear interrupts mask before setting a new one -- raising isn't always additive! - Fix KiInterruptHandler to perform operations in the right order. - Finish implementing interrupt exit code. - Code KeArmStatusRegisterGet to read CPSR and interrupt status. - Make debug prints a lot more readable and dont trying to acquire the stack during pool allocations. - Setup the clock interval timer!!! - This code regresses progress but makes stuf fwork right. We'll get better after implementing the stall interrupt. Modified: trunk/reactos/hal/hal/hal_arm.def trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/ppool.c Modified: trunk/reactos/hal/hal/hal_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal_arm.def?rev=33… ============================================================================== --- trunk/reactos/hal/hal/hal_arm.def [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal_arm.def [iso-8859-1] Sat Jun 14 17:02:50 2008 @@ -81,7 +81,6 @@ KeFlushWriteBuffer KeGetCurrentIrql KeLowerIrql -KeSwapIrql KeQueryPerformanceCounter KeRaiseIrql KeRaiseIrqlToDpcLevel Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Sat Jun 14 17:02:50 2008 @@ -392,7 +392,6 @@ if (strstr(CommandLine, "BREAK")) DbgBreakPoint(); } } - // // INTs on the Versatile: @@ -491,6 +490,14 @@ #define VICSOFTINT (PVOID)0xE0040018 #define VICSOFTINTCLEAR (PVOID)0xE004001C +#define TIMER_LOAD (PVOID)0xE00E2000 +#define TIMER_VALUE (PVOID)0xE00E2004 +#define TIMER_CONTROL (PVOID)0xE00E2008 +#define TIMER_INT_CLEAR (PVOID)0xE00E200C +#define TIMER_INT_STATUS (PVOID)0xE00E2010 +#define TIMER_INT_MASK (PVOID)0xE00E2014 +#define TIMER_BACKGROUND_LOAD (PVOID)0xE00E2018 + #define _clz(a) \ ({ ULONG __value, __arg = (a); \ @@ -513,6 +520,11 @@ HalpStallInterrupt(VOID) { DPRINT1("STALL INTERRUPT!!!\n"); + + // + // Clear the interrupt + // + WRITE_REGISTER_ULONG(TIMER_INT_CLEAR, 1); while (TRUE); } @@ -520,20 +532,39 @@ HalpInitializeInterrupts(VOID) { PKPCR Pcr = (PKPCR)KeGetPcr(); + ULONG ClockInterval; // // Fill out the IRQL mappings // RtlCopyMemory(Pcr->IrqlTable, HalpIrqlTable, sizeof(Pcr->IrqlTable)); RtlCopyMemory(Pcr->IrqlMask, HalpMaskTable, sizeof(Pcr->IrqlMask)); -// Pcr->IrqlTable = HalpIrqlTable; - // Pcr->IrqlMask = HalpMaskTable; // // Setup the clock and profile interrupt // Pcr->InterruptRoutine[CLOCK2_LEVEL] = HalpStallInterrupt; // Pcr->InterruptRoutine[PROFILE_LEVEL] = HalpCountInterrupt; + + // + // Configure the interval to 10ms + // (INTERVAL (10ms) * TIMCLKfreq (1MHz)) + // --------------------------------------- == 10^4 + // (TIMCLKENXdiv (1) * PRESCALEdiv (1)) + // + ClockInterval = 0x2710; + + // + // Enable the timer + // + WRITE_REGISTER_ULONG(TIMER_LOAD, ClockInterval); + WRITE_REGISTER_ULONG(TIMER_CONTROL, + 0 << 0 | // wrapping mode + 1 << 1 | // 32-bit mode + 0 << 2 | // 0 stages of prescale, divided by 1 + 1 << 5 | // enable interrupt + 1 << 6 | // periodic mode + 1 << 7); // enable it } ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; @@ -1068,11 +1099,14 @@ KfLowerIrql(IN KIRQL NewIrql) { ULONG InterruptMask; + ARM_STATUS_REGISTER Flags; PKPCR Pcr = (PKPCR)KeGetPcr(); // // Validate the new IRQL // + Flags = KeArmStatusRegisterGet(); + _disable(); ASSERT(NewIrql <= Pcr->CurrentIrql); // @@ -1084,7 +1118,7 @@ // Setup the interrupt mask for this IRQL // InterruptMask = KeGetPcr()->IrqlTable[NewIrql]; - DPRINT1("New IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); + DPRINT1("[LOWER] IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); // // Clear interrupts associated to the old IRQL @@ -1101,6 +1135,7 @@ // Save the new IRQL // Pcr->CurrentIrql = NewIrql; + if (!Flags.IrqDisable) _enable(); } KIRQL @@ -1109,11 +1144,14 @@ { KIRQL OldIrql; ULONG InterruptMask; + ARM_STATUS_REGISTER Flags; PKPCR Pcr = (PKPCR)KeGetPcr(); // // Save the current IRQL // + Flags = KeArmStatusRegisterGet(); + _disable(); OldIrql = Pcr->CurrentIrql; // @@ -1125,8 +1163,13 @@ // Setup the interrupt mask for this IRQL // InterruptMask = KeGetPcr()->IrqlTable[NewIrql]; - DPRINT1("New IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); - //ASSERT(NewIrql >= OldIrql); + DPRINT1("[RAISE] IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); + ASSERT(NewIrql >= OldIrql); + + // + // Clear interrupts associated to the old IRQL + // + WRITE_REGISTER_ULONG(VICINTENCLEAR, 0xFFFFFFFF); // // Set the new interrupt mask @@ -1138,6 +1181,7 @@ // Save the new IRQL // Pcr->CurrentIrql = NewIrql; + if (!Flags.IrqDisable) _enable(); return OldIrql; } @@ -1268,15 +1312,6 @@ } KIRQL -KeSwapIrql(IN KIRQL Irql) -{ - // - // Call the generic routine - // - return KfRaiseIrql(Irql); -} - -KIRQL KeRaiseIrqlToDpcLevel(VOID) { // @@ -1317,7 +1352,6 @@ // HalpTestCleanSupported = (IdRegister.Architecture == 6); } - VOID HalSweepDcache(VOID) Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/armddk.h [iso-8859-1] Sat Jun 14 17:02:50 2008 @@ -128,7 +128,12 @@ // IRQL Support on ARM is similar to MIPS/ALPHA // KIRQL -KeSwapIrql( +KfRaiseIrql( + IN KIRQL NewIrql +); + +VOID +KfLowerIrql( IN KIRQL NewIrql ); @@ -142,8 +147,8 @@ VOID ); -#define KeLowerIrql(NewIrql) KeSwapIrql(NewIrql) -#define KeRaiseIrql(NewIrql, OldIrql) *(OldIrql) = KeSwapIrql(NewIrql) +#define KeLowerIrql(NewIrql) KfLowerIrql(NewIrql) +#define KeRaiseIrql(NewIrql, OldIrql) *(OldIrql) = KfRaiseIrql(NewIrql) // // Cache clean and flush Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h [iso-8859-1] Sat Jun 14 17:02:50 2008 @@ -74,6 +74,14 @@ return Value; } +FORCEINLINE +ARM_STATUS_REGISTER +KeArmStatusRegisterGet(VOID) +{ + ARM_STATUS_REGISTER Value; + __asm__ __volatile__ ("mrs %0, cpsr" : "=r"(Value.AsUlong) : : "cc"); + return Value; +} FORCEINLINE VOID Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Sat Jun 14 17:02:50 2008 @@ -23,6 +23,31 @@ }; ULONG AsUlong; } ARM_TTB_REGISTER; + +typedef union _ARM_STATUS_REGISTER +{ + + struct + { + ULONG Mode:5; + ULONG State:1; + ULONG FiqDisable:1; + ULONG IrqDisable:1; + ULONG ImpreciseAbort:1; + ULONG Endianness:1; + ULONG Sbz:6; + ULONG GreaterEqual:4; + ULONG Sbz1:4; + ULONG Java:1; + ULONG Sbz2:2; + ULONG StickyOverflow:1; + ULONG Overflow:1; + ULONG CarryBorrowExtend:1; + ULONG Zero:1; + ULONG NegativeLessThan:1; + }; + ULONG AsUlong; +} ARM_STATUS_REGISTER; typedef union _ARM_DOMAIN_REGISTER { Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sat Jun 14 17:02:50 2008 @@ -273,7 +273,7 @@ // // Raise to Dispatch // - KeSwapIrql(DISPATCH_LEVEL); + KfRaiseIrql(DISPATCH_LEVEL); // // Set the Idle Priority to 0. This will jump into Phase 1 @@ -290,7 +290,7 @@ // // Raise back to HIGH_LEVEL // - KeSwapIrql(HIGH_LEVEL); + KfRaiseIrql(HIGH_LEVEL); } VOID Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Sat Jun 14 17:02:50 2008 @@ -323,10 +323,32 @@ IntExit: // - // FIXME: TODO - // - b . - + // Skip IRQL + // + add sp, sp, #(4) + + // + // Get the SPSR and restore it + // + ldr r0, [sp], #4 + msr spsr_all, r0 + + // + // Restore the registers + // + ldmia sp, {r0-r14}^ + mov r0, r0 + + // + // Advance in the trap frame + // + add sp, sp, #(4*15) + + // + // Restore program execution state + // + ldmia sp, {sp, lr, pc}^ + b . ENTRY_END KiInterruptException NESTED_ENTRY KiFastInterruptException Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sat Jun 14 17:02:50 2008 @@ -199,9 +199,7 @@ // Check if we have a thread to swap to // if (Pcr->Prcb->NextThread) - { - DPRINT1("Switching threads!\n"); - + { // // Next is now current // @@ -219,7 +217,6 @@ // // Make the old thread ready // - DPRINT1("Queueing the ready thread\n"); KxQueueReadyThread(OldThread, Pcr->Prcb); // @@ -241,6 +238,12 @@ KIRQL OldIrql, Irql; ULONG InterruptCause, InterruptMask; PKPCR Pcr; + + // + // Increment interrupt count + // + Pcr = (PKPCR)KeGetPcr(); + Pcr->Prcb->InterruptCount++; // // Get the old IRQL @@ -252,62 +255,49 @@ // Get the interrupt source // InterruptCause = HalGetInterruptSource(); - DPRINT1("Interrupt (%x) @ %p %p\n", InterruptCause, TrapFrame->SvcLr, TrapFrame->Pc); - DPRINT1("OLD IRQL: %x\n", OldIrql); + DPRINT1("[INT] (%x) @ %p %p\n", InterruptCause, TrapFrame->SvcLr, TrapFrame->Pc); // // Get the new IRQL and Interrupt Mask // - Pcr = (PKPCR)KeGetPcr(); Irql = Pcr->IrqlMask[InterruptCause]; InterruptMask = Pcr->IrqlTable[Irql]; - DPRINT1("IRQL (%x) MASK (%x)\n", Irql, InterruptMask); - - // - // Make sure the IRQL is valid - // - if (OldIrql < Irql) - { - // - // We should just return, probably - // - DPRINT1("IRQL Race!\n"); - while (TRUE); - } - + + // + // Raise to the new IRQL + // + KfRaiseIrql(Irql); + // // Check if this interrupt is at DISPATCH or higher // if (Irql > DISPATCH_LEVEL) - { - // - // ISR Handling Code - // - DPRINT1("ISR!\n"); - while (TRUE); - } - - // - // We know this is APC or DPC. - // Clear the software interrupt. - // Reenable interrupts and update the IRQL - // - HalClearSoftwareInterrupt(Irql); + { + // + // FIXME: Switch to interrupt stack + // + DPRINT1("[ISR]\n"); + } + else + { + // + // We know this is APC or DPC. + // + DPRINT1("[DPC/APC]\n"); + HalClearSoftwareInterrupt(Irql); + } + + // + // Call the registered interrupt routine + // + Pcr->InterruptRoutine[Irql](); + DPRINT1("[ISR RETURN]\n"); + + // + // Re-enable interrupts and return IRQL + // + KeLowerIrql(OldIrql); _enable(); - Pcr->CurrentIrql = Irql; - - // - // Increment interrupt count - // - Pcr->Prcb->InterruptCount++; - - // - // Call the registered interrupt routine - // - DPRINT1("Calling handler\n"); - Pcr->InterruptRoutine[Irql](); - DPRINT1("Done!\n"); - while (TRUE); } NTSTATUS @@ -315,8 +305,8 @@ { NTSTATUS Status; PVOID Address = (PVOID)KeArmFaultAddressRegisterGet(); - DPRINT1("Data Abort (%x) @ %p %p\n", Address, TrapFrame->SvcLr, TrapFrame->Pc); - DPRINT1("Abort Reason: %d\n", KeArmFaultStatusRegisterGet()); + DPRINT1("[ABORT] (%x) @ %p/%p/%p\n", + KeArmFaultStatusRegisterGet(), Address, TrapFrame->SvcLr, TrapFrame->Pc); // // Check if this is a page fault @@ -327,10 +317,10 @@ Address, KernelMode, TrapFrame); - DPRINT1("Status: %x\n", Status); if (Status == STATUS_SUCCESS) return Status; } + UNIMPLEMENTED; while (TRUE); return STATUS_SUCCESS; } @@ -358,7 +348,7 @@ // Get the system call ID // Id = Instruction & 0xFFFFF; - DPRINT1("System call (%X) from thread: %p (%d) \n", Id, Thread, Thread->PreviousMode); + DPRINT1("[SWI] (%x) %p (%d) \n", Id, Thread, Thread->PreviousMode); // // Get the descriptor table @@ -367,7 +357,6 @@ Offset = ((Id >> SERVICE_TABLE_SHIFT) & SERVICE_TABLE_MASK); ServiceTable += Offset; DescriptorTable = (PVOID)ServiceTable; - DPRINT1("Descriptor Table: %p (Count %d)\n", DescriptorTable, DescriptorTable->Limit); // // Get the service call number and validate it @@ -386,8 +375,6 @@ // Save the function responsible for handling this system call // SystemCall = (PVOID)DescriptorTable->Base[Number]; - DPRINT1("Handler: %p\n", SystemCall); - DPRINT1("NtClose: %p\n", NtClose); // // Check if this is a GUI call @@ -404,10 +391,8 @@ // // Check how many arguments this system call takes // - DPRINT1("Number: %d\n", Number); ArgumentCount = DescriptorTable->Number[Number] / 4; ASSERT(ArgumentCount <= 20); - DPRINT1("Argument Count: %d\n", ArgumentCount); // // Copy the register-arguments first @@ -421,7 +406,6 @@ // Arguments[i] = *Argument; Argument++; - DPRINT1("Argument %d: %x\n", i, Arguments[i]); } // @@ -432,7 +416,6 @@ // // FIXME: Validate the user stack // - DPRINT1("User stack: %p\n", TrapFrame->UserSp); // // Copy the rest @@ -445,7 +428,6 @@ // Arguments[i] = *Argument; Argument++; - DPRINT1("Argument %d: %x\n", i, Arguments[i]); } } @@ -461,7 +443,6 @@ PKTHREAD Thread; KPROCESSOR_MODE PreviousMode; ULONG Instruction; - DPRINT1("SWI @ %p %p \n", TrapFrame->Pc, TrapFrame->UserLr); // // Get the current thread Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sat Jun 14 17:02:50 2008 @@ -350,8 +350,7 @@ MMPTE TempPte, TempPde; NTSTATUS Status; PFN_NUMBER Pfn; - DPRINT1("MmCreateVirtualMappingForKernel(%x, %x, %x, %d)\n", - Address, Protection, *Pages, PageCount); + DPRINT1("[KMAP]: %p %d\n", Address, PageCount); ASSERT(Address >= MmSystemRangeStart); // @@ -466,9 +465,6 @@ IN PPFN_TYPE Pages, IN ULONG PageCount) { - DPRINT1("MmCreateVirtualMappingUnsafe(%p %x, %x, %x, %d)\n", - Process, Address, Protection, *Pages, PageCount); - // // Are we only handling the kernel? // @@ -499,9 +495,7 @@ IN ULONG PageCount) { ULONG i; - DPRINT1("MmCreateVirtualMapping(%p %x, %x, %x, %d)\n", - Process, Address, Protection, *Pages, PageCount); - + // // Loop each page // @@ -556,7 +550,6 @@ { PHYSICAL_ADDRESS PhysicalAddress = {{0}}; PMMPTE PointerPte; - DPRINT1("MmGetPhysicalAddress(%lx)\n", Address); // // Early boot PCR check @@ -570,7 +563,6 @@ ASSERT(PointerPte->u.Hard.L1.Section.Type == SectionPte); PhysicalAddress.QuadPart = PointerPte->u.Hard.L1.Section.BaseAddress; PhysicalAddress.QuadPart <<= CPT_SHIFT; - DPRINT1("Base: %p\n", PhysicalAddress.LowPart); PhysicalAddress.LowPart += BYTE_OFFSET(Address); return PhysicalAddress; } @@ -605,7 +597,6 @@ PMMPTE PointerPte, FirstPte, LastPte; MMPTE TempPte; PVOID Address; - DPRINT1("MmCreateHyperspaceMapping(%lx)\n", Page); // // Loop hyperspace PTEs (1MB) @@ -650,7 +641,7 @@ // Address = HYPER_SPACE + ((PointerPte - FirstPte) * PAGE_SIZE); KiFlushSingleTb(FALSE, Address); - DPRINT1("MmCreateHyperspaceMapping(%lx)\n", Address); + DPRINT1("[HMAP]: %p %lx\n", Address, Page); return Address; } @@ -660,7 +651,7 @@ { PFN_TYPE Pfn; PMMPTE PointerPte; - DPRINT1("MmDeleteHyperspaceMapping(%lx)\n", Address); + DPRINT1("[HUNMAP]: %p\n", Address); // // Get the PTE @@ -740,7 +731,6 @@ PHYSICAL_ADDRESS BoundaryAddressMultiple; PVOID BaseAddress; NTSTATUS Status; - DPRINT1("MiInitPageDirectoryMap()\n"); // // Create memory area for the PTE area Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Sat Jun 14 17:02:50 2008 @@ -29,7 +29,12 @@ #define R_PRINT_ADDRESS(addr) KeRosPrintAddress(addr) #define R_PANIC() KeBugCheck(0) #define R_DEBUG DbgPrint + +#ifdef _ARM_ +#define R_GET_STACK_FRAMES(ptr,cnt) +#else #define R_GET_STACK_FRAMES(ptr,cnt) RtlWalkFrameChain((PVOID*)ptr,cnt, 0) +#endif #include "rpoolmgr.h"

16 years, 6 months

[cfinck] 33966: - Implement the code for the "Run" and "Shutdown" menu items, create stubs for the other custom commands - Replace the ROS-specific STDCALL by APIENTRY for the function prototypes

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Jun 14 16:18:08 2008 New Revision: 33966 URL: http://svn.reactos.org/svn/reactos?rev=33966&view=rev Log: - Implement the code for the "Run" and "Shutdown" menu items, create stubs for the other custom commands - Replace the ROS-specific STDCALL by APIENTRY for the function prototypes Modified: trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Sat Jun 14 16:18:08 2008 @@ -25,15 +25,21 @@ #include "undoc.h" /* dynamic imports due to lack of support in msvc linker libs */ -typedef INT (STDCALL *REGSHELLHOOK)(HWND, DWORD); +typedef INT (APIENTRY *REGSHELLHOOK)(HWND, DWORD); #ifdef UNICODE #define PROC_NAME_DRAWCAPTIONTEMP "DrawCaptionTempW" -typedef BOOL (STDCALL *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCWSTR, UINT); +typedef BOOL (APIENTRY *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCWSTR, UINT); #else #define PROC_NAME_DRAWCAPTIONTEMP "DrawCaptionTempA" -typedef BOOL (STDCALL *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCSTR, UINT); +typedef BOOL (APIENTRY *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCSTR, UINT); #endif -typedef HRESULT (STDCALL *SHINVDEFCMD)(HWND, IShellFolder*, LPCITEMIDLIST); +typedef HRESULT (APIENTRY *SHINVDEFCMD)(HWND, IShellFolder*, LPCITEMIDLIST); +typedef void (APIENTRY *RUNFILEDLG)(HWND, HICON, LPCWSTR, LPCWSTR, LPCWSTR, UINT); +typedef void (APIENTRY *EXITWINDLG)(HWND); +typedef HRESULT (APIENTRY *SHWINHELP)(HWND, LPWSTR, UINT, DWORD); + +/* Constants for RunFileDlg */ +#define RFF_CALCDIRECTORY 0x04 /* Calculates the working directory from the file name. */ static ULONG __inline Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Sat Jun 14 16:18:08 2008 @@ -2260,7 +2260,45 @@ lParam, &Ret))) { - /* FIXME: Handle own commands */ + switch(LOWORD(wParam)) + { + /* FIXME: Handle these commands as well */ + case IDM_TASKBARANDSTARTMENU: + case IDM_SEARCH: + case IDM_HELPANDSUPPORT: + break; + + case IDM_RUN: + { + HANDLE hShell32; + RUNFILEDLG RunFileDlg; + + hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); + RunFileDlg = (RUNFILEDLG)GetProcAddress(hShell32, (LPCSTR)61); + + RunFileDlg(hwnd, NULL, NULL, NULL, NULL, RFF_CALCDIRECTORY); + break; + } + + /* FIXME: Handle these commands as well */ + case IDM_SYNCHRONIZE: + case IDM_LOGOFF: + case IDM_DISCONNECT: + case IDM_UNDOCKCOMPUTER: + break; + + case IDM_SHUTDOWN: + { + HANDLE hShell32; + EXITWINDLG ExitWinDlg; + + hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); + ExitWinDlg = (EXITWINDLG)GetProcAddress(hShell32, (LPCSTR)60); + + ExitWinDlg(hwnd); + break; + } + } } break;

16 years, 6 months

[jimtabor] 33965: Patch by carlo bramix at libero dot it: Bug 3336 statusbar in the wrong place.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jun 14 12:10:55 2008 New Revision: 33965 URL: http://svn.reactos.org/svn/reactos?rev=33965&view=rev Log: Patch by carlo bramix at libero dot it: Bug 3336 statusbar in the wrong place. Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sat Jun 14 12:10:55 2008 @@ -496,6 +496,7 @@ { MoveWindow(SolWnd, 0, 0, nWidth, nHeight - nStatusHeight, TRUE); MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nHeight, TRUE); + SendMessage(hwndStatus, WM_SIZE, wParam, lParam); } else {

16 years, 6 months

[mkupfer] 33964: Vytis Girdzijauskas <cman AT cman DOT us> - time zone update to sync with Windows tz data - See issue #3084 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Jun 14 06:49:55 2008 New Revision: 33964 URL: http://svn.reactos.org/svn/reactos?rev=33964&view=rev Log: Vytis Girdzijauskas <cman AT cman DOT us> - time zone update to sync with Windows tz data - See issue #3084 for more details. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sat Jun 14 06:49:55 2008 @@ -77,69 +77,54 @@ ; Time zone settings HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones","IndexMapping",0x00010000,\ + "409", "4",\ "1009", "4",\ + "2809", "20",\ "80a", "30",\ "440a", "30",\ "480a", "30",\ "4c0a", "30",\ - "409", "35",\ + "140a", "30",\ + "100a", "33",\ "c0c", "35",\ + "2009", "35",\ "240a", "45",\ "280a", "45",\ "300a", "45",\ + "180a", "45",\ + "500a", "50",\ + "2409", "50",\ + "1c0a", "50",\ + "2c09", "50",\ "200a", "55",\ - "340a", "55",\ "3c0a", "55",\ "400a", "55",\ - "500a", "55",\ + "340a", "56",\ "416", "65",\ "2c0a", "70",\ "380a", "70",\ - "422", "85",\ "438", "85",\ - "441", "85",\ "809", "85",\ "816", "85",\ - "1001", "85",\ - "1401", "85",\ - "1404", "85",\ "1809", "85",\ - "2009", "85",\ - "2401", "85",\ - "2409", "85",\ - "2801", "85",\ - "2809", "85",\ - "3001", "85",\ - "3409", "85",\ - "4001", "85",\ - "40f", "85",\ - "41c", "85",\ - "43e", "85",\ - "83e", "85",\ - "100a", "85",\ - "140a", "85",\ - "140c", "85",\ - "180a", "85",\ - "180c", "85",\ - "1c01", "85",\ - "1c0a", "85",\ - "2c01", "85",\ - "2c09", "85",\ - "3c01", "85",\ + "40f", "90",\ + "1801", "90",\ + "41c", "95",\ "405", "95",\ + "40e", "95",\ "424", "95",\ "41b", "95",\ "81a", "95",\ "c1a", "95",\ - "402", "125",\ "415", "100",\ - "1801", "100",\ + "1401", "100",\ "41a", "100",\ "42f", "100",\ + "140c", "100",\ + "180c", "100",\ + "1c01", "100",\ "403", "105",\ "406", "105",\ - "410", "105",\ - "427", "105",\ "813", "105",\ "827", "105",\ "40a", "105",\ @@ -148,6 +133,7 @@ "80c", "105",\ "c0a", "105",\ "407", "110",\ + "410", "110",\ "413", "110",\ "414", "110",\ "807", "110",\ @@ -158,24 +144,35 @@ "41d", "110",\ "c07", "110",\ "100c", "110",\ - "418", "115",\ - "40e", "115",\ + "1001", "115",\ + "2801", "115",\ + "3001", "115",\ + "43e", "115",\ + "2c01", "115",\ + "423", "115",\ "c01", "120",\ "425", "125",\ "426", "125",\ "40b", "125",\ "81d", "125",\ + "422", "125",\ + "402", "125",\ + "427", "125",\ "408", "130",\ - "423", "130",\ "41f", "130",\ + "418", "130",\ "40d", "135",\ "436", "140",\ "3009", "140",\ "1c09", "140",\ "419", "145",\ "401", "150",\ - "801", "150",\ + "4001", "150",\ + "3c01", "150",\ "3401", "150",\ + "441", "155",\ + "801", "158",\ + "2401", "158",\ "429", "160",\ "2001", "165",\ "3801", "165",\ @@ -186,15 +183,18 @@ "42a", "205",\ "804", "210",\ "c04", "210",\ + "1404", "210",\ + "83e", "210",\ "1004", "215",\ "404", "220",\ + "3409", "220",\ "412", "230",\ "812", "230",\ "411", "235",\ "c09", "255",\ "1409", "290" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Dateline Standard Time","Display",0x00000000,"(GMT-12:00) Eniwetok, Kwajalein" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Dateline Standard Time","Display",0x00000000,"(GMT-12:00) International Date Line West" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Dateline Standard Time","Dlt",0x00000000,"Dateline Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Dateline Standard Time","Std",0x00000000,"Dateline Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Dateline Standard Time","Index",0x00010001,0 @@ -227,17 +227,17 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Alaskan Standard Time","Index",0x00010001,3 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Alaskan Standard Time","TZI",0x00000001,\ 0x1c,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 - -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific Standard Time","Display",0x00000000,"(GMT-08:00) Pacific Time (US & Canada); Tijuana" +0x00,0x00,0x0b,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific Standard Time","Display",0x00000000,"(GMT-08:00) Pacific Time (US & Canada)" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific Standard Time","Dlt",0x00000000,"Pacific Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific Standard Time","Std",0x00000000,"Pacific Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific Standard Time","Index",0x00010001,4 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific Standard Time","TZI",0x00000001,\ 0xe0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x0b,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time","Display",0x00000000,"(GMT-07:00) Mountain Time (US & Canada)" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time","Dlt",0x00000000,"Mountain Daylight Time" @@ -245,6 +245,15 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time","Index",0x00010001,10 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time","TZI",0x00000001,\ 0xa4,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x0b,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","Display",0x00000000,"(GMT-07:00) Chihuahua, La Paz, Mazatlan" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","Dlt",0x00000000,"Mountain Daylight Time (Mexico)" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","Std",0x00000000,"Mountain Standard Time (Mexico)" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","Index",0x00010001,13 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","TZI",0x00000001,\ +0xa4,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -263,8 +272,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Standard Time","Index",0x00010001,20 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Standard Time","TZI",0x00000001,\ 0x68,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x0b,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Canada Central Standard Time","Display",0x00000000,"(GMT-06:00) Saskatchewan" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Canada Central Standard Time","Dlt",0x00000000,"Canada Central Daylight Time" @@ -275,11 +284,20 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mexico Standard Time","Display",0x00000000,"(GMT-06:00) Mexico City, Tegucigalpa" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mexico Standard Time","Dlt",0x00000000,"Mexico Daylight Time" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mexico Standard Time","Std",0x00000000,"Mexico Standard Time" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mexico Standard Time","Index",0x00010001,30 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mexico Standard Time","TZI",0x00000001,\ +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Standard Time (Mexico)","Display",0x00000000,"(GMT-06:00) Guadalajara, Mexico City, Monterrey" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Standard Time (Mexico)","Dlt",0x00000000,"Central Daylight Time (Mexico)" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Standard Time (Mexico)","Std",0x00000000,"Central Standard Time (Mexico)" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Standard Time (Mexico)","Index",0x00010001,30 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Standard Time (Mexico)","TZI",0x00000001,\ +0x68,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central America Standard Time","Display",0x00000000,"(GMT-06:00) Central America" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central America Standard Time","Dlt",0x00000000,"Central America Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central America Standard Time","Std",0x00000000,"Central America Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central America Standard Time","Index",0x00010001,33 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central America Standard Time","TZI",0x00000001,\ 0x68,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -290,8 +308,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Eastern Standard Time","Index",0x00010001,35 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Eastern Standard Time","TZI",0x00000001,\ 0x2c,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x0b,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\US Eastern Standard Time","Display",0x00000000,"(GMT-05:00) Indiana (East)" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\US Eastern Standard Time","Dlt",0x00000000,"US Eastern Daylight Time" @@ -302,7 +320,7 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Pacific Standard Time","Display",0x00000000,"(GMT-05:00) Bogota, Lima, Quito" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Pacific Standard Time","Display",0x00000000,"(GMT-05:00) Bogota, Lima, Quito, Rio Branco" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Pacific Standard Time","Dlt",0x00000000,"SA Pacific Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Pacific Standard Time","Std",0x00000000,"SA Pacific Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Pacific Standard Time","Index",0x00010001,45 @@ -317,10 +335,10 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Atlantic Standard Time","Index",0x00010001,50 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Atlantic Standard Time","TZI",0x00000001,\ 0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 - -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Western Standard Time","Display",0x00000000,"(GMT-04:00) Caracas, La Paz" +0x00,0x00,0x0b,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Western Standard Time","Display",0x00000000,"(GMT-04:00) La Paz" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Western Standard Time","Dlt",0x00000000,"SA Western Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Western Standard Time","Std",0x00000000,"SA Western Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Western Standard Time","Index",0x00010001,55 @@ -328,6 +346,15 @@ 0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","Display",0x00000000,"(GMT-04:00) Santiago" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","Dlt",0x00000000,"Pacific SA Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","Std",0x00000000,"Pacific SA Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","Index",0x00010001,56 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","TZI",0x00000001,\ +0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x03,0x00,0x06,0x00,0x02,0x00,0x17,0x00,0x3b,0x00,0x3b,0x00,0xe7,0x03,\ +0x00,0x00,0x0a,0x00,0x06,0x00,0x02,0x00,0x17,0x00,0x3b,0x00,0x3b,0x00,0xe7,0x03 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Newfoundland Standard Time","Display",0x00000000,"(GMT-03:30) Newfoundland" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Newfoundland Standard Time","Dlt",0x00000000,"Newfoundland Daylight Time" @@ -335,8 +362,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Newfoundland Standard Time","Index",0x00010001,60 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Newfoundland Standard Time","TZI",0x00000001,\ 0xd2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x0b,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. South America Standard Time","Display",0x00000000,"(GMT-03:00) Brasilia" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. South America Standard Time","Dlt",0x00000000,"E. South America Daylight Time" @@ -344,8 +371,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. South America Standard Time","Index",0x00010001,65 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. South America Standard Time","TZI",0x00000001,\ 0xb4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x03,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x02,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x0b,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Eastern Standard Time","Display",0x00000000,"(GMT-03:00) Buenos Aires, Georgetown" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SA Eastern Standard Time","Dlt",0x00000000,"SA Eastern Daylight Time" @@ -355,6 +382,15 @@ 0xb4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Greenland Standard Time","Display",0x00000000,"(GMT-03:00) Greenland" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Greenland Standard Time","Dlt",0x00000000,"Greenland Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Greenland Standard Time","Std",0x00000000,"Greenland Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Greenland Standard Time","Index",0x00010001,73 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Greenland Standard Time","TZI",0x00000001,\ +0xb4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mid-Atlantic Standard Time","Display",0x00000000,"(GMT-02:00) Mid-Atlantic" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mid-Atlantic Standard Time","Dlt",0x00000000,"Mid-Atlantic Daylight Time" @@ -365,7 +401,7 @@ 0x00,0x00,0x09,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Azores Standard Time","Display",0x00000000,"(GMT-01:00) Azores, Cape Verde Is." +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Azores Standard Time","Display",0x00000000,"(GMT-01:00) Azores" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Azores Standard Time","Dlt",0x00000000,"Azores Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Azores Standard Time","Std",0x00000000,"Azores Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Azores Standard Time","Index",0x00010001,80 @@ -373,6 +409,15 @@ 0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Cape Verde Standard Time","Display",0x00000000,"(GMT-01:00) Cape Verde Is." +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Cape Verde Standard Time","Dlt",0x00000000,"Cape Verde Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Cape Verde Standard Time","Std",0x00000000,"Cape Verde Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Cape Verde Standard Time","Index",0x00010001,83 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Cape Verde Standard Time","TZI",0x00000001,\ +0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\GMT Standard Time","Display",0x00000000,"(GMT) Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\GMT Standard Time","Dlt",0x00000000,"GMT Daylight Time" @@ -383,7 +428,7 @@ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Greenwich Standard Time","Display",0x00000000,"(GMT) Casablanca, Monrovia" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Greenwich Standard Time","Display",0x00000000,"(GMT) Casablanca, Monrovia, Reykjavik" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Greenwich Standard Time","Dlt",0x00000000,"Greenwich Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Greenwich Standard Time","Std",0x00000000,"Greenwich Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Greenwich Standard Time","Index",0x00010001,90 @@ -392,7 +437,7 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Europe Standard Time","Display",0x00000000,"(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prag" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Europe Standard Time","Display",0x00000000,"(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Europe Standard Time","Dlt",0x00000000,"Central Europe Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Europe Standard Time","Std",0x00000000,"Central Europe Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Europe Standard Time","Index",0x00010001,95 @@ -410,7 +455,7 @@ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Romance Standard Time","Display",0x00000000,"(GMT+01:00) Brussels, Copenhagen, Madrid, Paris, Vilnius" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Romance Standard Time","Display",0x00000000,"(GMT+01:00) Brussels, Copenhagen, Madrid, Paris" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Romance Standard Time","Dlt",0x00000000,"Romance Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Romance Standard Time","Std",0x00000000,"Romance Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Romance Standard Time","Index",0x00010001,105 @@ -428,14 +473,14 @@ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. Europe Standard Time","Display",0x00000000,"(GMT+02:00) Bucharest" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. Europe Standard Time","Display",0x00000000,"(GMT+02:00) Minsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. Europe Standard Time","Dlt",0x00000000,"E. Europe Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. Europe Standard Time","Std",0x00000000,"E. Europe Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. Europe Standard Time","Index",0x00010001,115 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. Europe Standard Time","TZI",0x00000001,\ 0x88,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x09,0x00,0x00,0x00,0x05,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Egypt Standard Time","Display",0x00000000,"(GMT+02:00) Cairo" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Egypt Standard Time","Dlt",0x00000000,"Egypt Daylight Time" @@ -443,8 +488,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Egypt Standard Time","Index",0x00010001,120 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Egypt Standard Time","TZI",0x00000001,\ 0x88,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x09,0x00,0x03,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x05,0x00,0x05,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x09,0x00,0x04,0x00,0x05,0x00,0x17,0x00,0x3b,0x00,0x3b,0x00,0x00,0x00,\ +0x00,0x00,0x04,0x00,0x04,0x00,0x05,0x00,0x17,0x00,0x3b,0x00,0x3b,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\FLE Standard Time","Display",0x00000000,"(GMT+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\FLE Standard Time","Dlt",0x00000000,"FLE Daylight Time" @@ -455,23 +500,23 @@ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\GTB Standard Time","Display",0x00000000,"(GMT+02:00) Athens, Istanbul, Minsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\GTB Standard Time","Display",0x00000000,"(GMT+02:00) Athens, Bucharest, Istanbul" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\GTB Standard Time","Dlt",0x00000000,"GTB Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\GTB Standard Time","Std",0x00000000,"GTB Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\GTB Standard Time","Index",0x00010001,130 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\GTB Standard Time","TZI",0x00000001,\ 0x88,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 - -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Israel Standard Time","Display",0x00000000,"(GMT+02:00) Israel" +0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Israel Standard Time","Display",0x00000000,"(GMT+02:00) Jerusalem" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Israel Standard Time","Dlt",0x00000000,"Israel Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Israel Standard Time","Std",0x00000000,"Israel Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Israel Standard Time","Index",0x00010001,135 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Israel Standard Time","TZI",0x00000001,\ 0x88,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x0a,0x00,0x05,0x00,0x05,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x05,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\South Africa Standard Time","Display",0x00000000,"(GMT+02:00) Harare, Pretoria" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\South Africa Standard Time","Dlt",0x00000000,"South Africa Daylight Time" @@ -491,7 +536,7 @@ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arab Standard Time","Display",0x00000000,"(GMT+03:00) Baghdad, Kuwait, Riyadh" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arab Standard Time","Display",0x00000000,"(GMT+03:00) Kuwait, Riyadh" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arab Standard Time","Dlt",0x00000000,"Arab Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arab Standard Time","Std",0x00000000,"Arab Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arab Standard Time","Index",0x00010001,150 @@ -509,14 +554,23 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arabic Standard Time","Display",0x00000000,"(GMT+03:00) Baghdad" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arabic Standard Time","Dlt",0x00000000,"Arabic Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arabic Standard Time","Std",0x00000000,"Arabic Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arabic Standard Time","Index",0x00010001,158 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arabic Standard Time","TZI",0x00000001,\ +0x4c,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Iran Standard Time","Display",0x00000000,"(GMT+03:30) Tehran" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Iran Standard Time","Dlt",0x00000000,"Iran Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Iran Standard Time","Std",0x00000000,"Iran Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Iran Standard Time","Index",0x00010001,160 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Iran Standard Time","TZI",0x00000001,\ 0x2e,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x09,0x00,0x02,0x00,0x04,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arabian Standard Time","Display",0x00000000,"(GMT+04:00) Abu Dhabi, Muscat" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arabian Standard Time","Dlt",0x00000000,"Arabian Daylight Time" @@ -527,7 +581,7 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Caucasus Standard Time","Display",0x00000000,"(GMT+04:00) Baku, Tbilisi" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Caucasus Standard Time","Display",0x00000000,"(GMT+04:00) Caucasus Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Caucasus Standard Time","Dlt",0x00000000,"Caucasus Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Caucasus Standard Time","Std",0x00000000,"Caucasus Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Caucasus Standard Time","Index",0x00010001,170 @@ -563,7 +617,7 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\India Standard Time","Display",0x00000000,"(GMT+05:30) Bombay, Calcutta, Madras, New Delhi" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\India Standard Time","Display",0x00000000,"(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\India Standard Time","Dlt",0x00000000,"India Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\India Standard Time","Std",0x00000000,"India Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\India Standard Time","Index",0x00010001,190 @@ -572,7 +626,25 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Asia Standard Time","Display",0x00000000,"(GMT+06:00) Akmola, Almaty, Dhaka" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Nepal Standard Time","Display",0x00000000,"(GMT+05:45) Kathmandu" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Nepal Standard Time","Dlt",0x00000000,"Nepal Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Nepal Standard Time","Std",0x00000000,"Nepal Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Nepal Standard Time","Index",0x00010001,193 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Nepal Standard Time","TZI",0x00000001,\ +0xa7,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Sri Lanka Standard Time","Display",0x00000000,"(GMT+05:30) Sri Jayawardenepura" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Sri Lanka Standard Time","Dlt",0x00000000,"Sri Lanka Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Sri Lanka Standard Time","Std",0x00000000,"Sri Lanka Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Sri Lanka Standard Time","Index",0x00010001,194 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Sri Lanka Standard Time","TZI",0x00000001,\ +0xb6,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Asia Standard Time","Display",0x00000000,"(GMT+06:00) Astana, Dhaka" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Asia Standard Time","Dlt",0x00000000,"Central Asia Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Asia Standard Time","Std",0x00000000,"Central Asia Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Asia Standard Time","Index",0x00010001,195 @@ -581,12 +653,21 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Sri Lanka Standard Time","Display",0x00000000,"(GMT+06:00) Colombo" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Sri Lanka Standard Time","Dlt",0x00000000,"Sri Lanka Daylight Time" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Sri Lanka Standard Time","Std",0x00000000,"Sri Lanka Standard Time" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Sri Lanka Standard Time","Index",0x00010001,200 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Sri Lanka Standard Time","TZI",0x00000001,\ +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Display",0x00000000,"(GMT+06:00) Almaty, Novosibirsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Dlt",0x00000000,"N. Central Asia Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Std",0x00000000,"N. Central Asia Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Index",0x00010001,201 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","TZI",0x00000001,\ 0x98,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Myanmar Standard Time","Display",0x00000000,"(GMT+06:30) Yangon (Rangoon)" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Myanmar Standard Time","Dlt",0x00000000,"Myanmar Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Myanmar Standard Time","Std",0x00000000,"Myanmar Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Myanmar Standard Time","Index",0x00010001,203 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Myanmar Standard Time","TZI",0x00000001,\ +0x7a,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -599,6 +680,15 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Display",0x00000000,"(GMT+07:00) Krasnoyarsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Dlt",0x00000000,"North Asia Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Std",0x00000000,"North Asia Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Index",0x00010001,207 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","TZI",0x00000001,\ +0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time","Display",0x00000000,"(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time","Dlt",0x00000000,"China Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time","Std",0x00000000,"China Standard Time" @@ -608,7 +698,7 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Singapore Standard Time","Display",0x00000000,"(GMT+08:00) Singapore" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Singapore Standard Time","Display",0x00000000,"(GMT+08:00) Kuala Lumpur, Singapore" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Singapore Standard Time","Dlt",0x00000000,"Singapore Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Singapore Standard Time","Std",0x00000000,"Singapore Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Singapore Standard Time","Index",0x00010001,215 @@ -632,8 +722,17 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\W. Australia Standard Time","Index",0x00010001,225 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\W. Australia Standard Time","TZI",0x00000001,\ 0x20,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Display",0x00000000,"(GMT+08:00) Irkutsk, Ulaan Bataar" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Dlt",0x00000000,"North Asia East Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Std",0x00000000,"North Asia East Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Index",0x00010001,227 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","TZI",0x00000001,\ +0x20,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Korea Standard Time","Display",0x00000000,"(GMT+09:00) Seoul" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Korea Standard Time","Dlt",0x00000000,"Korea Daylight Time" @@ -677,7 +776,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Cen. Australia Standard Time","Index",0x00010001,250 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Cen. Australia Standard Time","TZI",0x00000001,\ 0xc6,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\AUS Eastern Standard Time","Display",0x00000000,"(GMT+10:00) Canberra, Melbourne, Sydney" @@ -686,7 +785,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\AUS Eastern Standard Time","Index",0x00010001,255 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\AUS Eastern Standard Time","TZI",0x00000001,\ 0xa8,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\E. Australia Standard Time","Display",0x00000000,"(GMT+10:00) Brisbane" @@ -704,8 +803,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tasmania Standard Time","Index",0x00010001,265 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tasmania Standard Time","TZI",0x00000001,\ 0xa8,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Display",0x00000000,"(GMT+10:00) Vladivostok" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Dlt",0x00000000,"Vladivostok Daylight Time" @@ -749,10 +848,10 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\New Zealand Standard Time","Index",0x00010001,290 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\New Zealand Standard Time","TZI",0x00000001,\ 0x30,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x03,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 - -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tonga Standard Time","Display",0x00000000,"(GMT+13:00) Nuku` alofa" +0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x09,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tonga Standard Time","Display",0x00000000,"(GMT+13:00) Nuku'alofa" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tonga Standard Time","Dlt",0x00000000,"Tonga Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tonga Standard Time","Std",0x00000000,"Tonga Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tonga Standard Time","Index",0x00010001,300

16 years, 6 months

[mkupfer] 33963: niski_ (bjauy AT go2 DOT pl) - polish language patch for shell32. - See issue #3338 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Jun 14 05:23:05 2008 New Revision: 33963 URL: http://svn.reactos.org/svn/reactos?rev=33963&view=rev Log: niski_ (bjauy AT go2 DOT pl) - polish language patch for shell32. - See issue #3338 for more details. Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sat Jun 14 05:23:05 2008 @@ -56,7 +56,7 @@ END MENUITEM "&Wyrównaj ikony", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR - MENUITEM "&Odwierz", FCIDM_SHVIEW_REFRESH + MENUITEM "&Odwie¿", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "W&klej", FCIDM_SHVIEW_INSERT MENUITEM "Wklej s&krót", FCIDM_SHVIEW_INSERTLINK

16 years, 6 months

[mkupfer] 33962: fix/add some german translations

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Jun 14 03:51:42 2008 New Revision: 33962 URL: http://svn.reactos.org/svn/reactos?rev=33962&view=rev Log: fix/add some german translations Modified: trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc [iso-8859-1] Sat Jun 14 03:51:42 2008 @@ -341,7 +341,7 @@ IDS_START_HELP "Hilfe" IDS_SEARCH_FILES "Suche Dateien..." IDS_DOCUMENTS "Dokumente" - IDS_FAVORITES "Lesezeichen" + IDS_FAVORITES "Favoriten" IDS_PROGRAMS "Programme" IDS_SETTINGS "Einstellungen" IDS_EXPLORE "Explore" Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] Sat Jun 14 03:51:42 2008 @@ -22,7 +22,7 @@ EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Geografische Lage", -1, 5, 172, 234, 55 - LTEXT "Wählen Sie Ihren Standort, sodass Dienste sie mit lokalen Informationen, wie Nachrichten und Wettervorhersagen, versorgen können.", -1, 14, 184, 210, 24 + LTEXT "Wählen Sie Ihren Standort, sodass Dienste Sie mit lokalen Informationen, wie Nachrichten und Wettervorhersagen, versorgen können.", -1, 14, 184, 210, 24 COMBOBOX IDC_LOCATION_COMBO, 14, 210, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] Sat Jun 14 03:51:42 2008 @@ -44,26 +44,26 @@ IDS_DEV_FAILED_FILTER "Die Treiber für dieses Gerät müssen neuinstalliert werden." IDS_DEV_DEVLOADER_NOT_FOUND "Dieses Gerät arbeitet nicht korrekt, weil ReactOS die Datei $1 nicht laden kann, die die Treiber für dieses Gerät lädt." IDS_DEV_DEVLOADER_NOT_FOUND2 "Dieses Gerät arbeitet nicht korrekt, weil die Datei $1, die die Treiber für dieses Gerät lädt, kaputt ist." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Gerätefehler: Versuchen sie, den Treiber für dieses Gerät auszutauschen. Wenn das nicht hilft, schauen sie in die Gerätedokumentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Gerätefehler: Versuchen Sie, den Treiber für dieses Gerät auszutauschen. Wenn das nicht hilft, schauen Sie in die Gerätedokumentation." IDS_DEV_INVALID_DATA "Dieses Gerät arbeitet nicht korrekt, weil das BIOS ihres Computer die Ressourcen für dieses Gerät falsch angibt." IDS_DEV_INVALID_DATA2 "Dieses Gerät arbeitet nicht korrekt, weil das BIOS dieses Gerätes die Ressourcen für dieses Gerät falsch angibt. " - IDS_DEV_FAILED_START "Dieses Gerät ist entweder nicht vorhanen, funktioniert nicht korrekt, oder es sind nicht nicht alle Treiber installiert." + IDS_DEV_FAILED_START "Dieses Gerät ist entweder nicht vorhanden, funktioniert nicht korrekt, oder es sind nicht alle Treiber installiert." IDS_DEV_LIAR "ReactOS hörte während des Versuchs dieses Gerät zu starten auf zu reagieren und wird deshalb nie wieder versuchen, dieses Gerät zu starten.." IDS_DEV_NORMAL_CONFLICT "Dieses Gerät kann keine freien $1 Ressourcen zur Benutzung finden." - IDS_DEV_NOT_VERIFIED "Dieses Gerät ist entweder nicht vorhanen, funktioniert nicht korrekt, oder es sind nicht nicht alle Treiber installiert." - IDS_DEV_NEED_RESTART "Dieses Gerät wird erst korrekt funktionieren, wenn sie den Computer neugestartet haben." + IDS_DEV_NOT_VERIFIED "Dieses Gerät ist entweder nicht vorhanden, funktioniert nicht korrekt, oder es sind nicht alle Treiber installiert." + IDS_DEV_NEED_RESTART "Dieses Gerät wird erst korrekt funktionieren, wenn Sie den Computer neugestartet haben." IDS_DEV_REENUMERATION "Dieses Gerät verursacht einen Ressourcenkonflikt." IDS_DEV_PARTIAL_LOG_CONF "ReactOS konnte nicht alle Ressourcen identifizieren, die dieses Gerät benutzt." IDS_DEV_UNKNOWN_RESOURCE "The driver information file $1 is telling this child device to use a resource that the parent device does not have or recognize." IDS_DEV_REINSTALL "Die Treiber für dieses Gerät müssen neuinstalliert werden." - IDS_DEV_REGISTRY "Die Registry könnte beschädigt sein." + IDS_DEV_REGISTRY "Die Registrierungsdatenbank könnte beschädigt sein." IDS_DEV_WILL_BE_REMOVED "ReactOS wird dieses Gerät entfernen." IDS_DEV_DISABLED "Dieses Gerät ist nicht gestartet." IDS_DEV_DISABLED2 "Dieses Gerät ist deaktiviert." IDS_DEV_DEVLOADER_NOT_READY "Der Lader für dieses Gerät kann die benötigten Treiber nicht laden." IDS_DEV_DEVLOADER_NOT_READY2 "Dieses Grafikkarte funktioniert einwandfrei." IDS_DEV_DEVLOADER_NOT_READY3 "Die Lader für dieses Gerät können die benötigten Treiber nicht laden." - IDS_DEV_DEVICE_NOT_THERE "Dieses Gerät ist entweder nicht vorhanen, funktioniert nicht korrekt, oder es sind nicht nicht alle Treiber installiert." + IDS_DEV_DEVICE_NOT_THERE "Dieses Gerät ist entweder nicht vorhanden, funktioniert nicht korrekt, oder es sind nicht alle Treiber installiert." IDS_DEV_MOVED "ReactOS ist dabei dieses Gerät zu aktivieren." IDS_DEV_TOO_EARLY "ReactOS ist dabei dieses Gerät zu aktivieren." IDS_DEV_NO_VALID_LOG_CONF "ReactOS kann die Ressourcen für dieses Gerät nicht feststellen." @@ -74,12 +74,12 @@ IDS_DEV_DISABLED_SERVICE "ReactOS kann die Treiber für dieses Gerät nicht installieren, weil auf das (Netz-)Laufwerk, auf dem die Installationsdateien abgelegt sind, nicht zugegriffen werden kann." IDS_DEV_TRANSLATION_FAILED "Dieses Gerät reagiert nicht auf seinen Treiber." IDS_DEV_NO_SOFTCONFIG "ReactOS kann die Einstellungen für dieses Gerät nicht feststellen. Lesen sie die Dokumentation, die mit diesem Gerät kam und benutzen sie den Reiter ""Ressourcen"" umd die Konfiguration vorzunehmen." - IDS_DEV_BIOS_TABLE "Die System-Firmware ihres Computers beinhaltet nicht genug Information um dieses Gerät korrekt konfigurieren und benutzen zu können. Um dieses Gerät benutzen zu können, kontaktieren sie bitte ihren Computerhersteller um ein Firmware oder BIOS update zu erhalten." - IDS_DEV_IRQ_TRANSLATION_FAILED "Dieses Gerät beantragt einen PCI-Interrupt, ist aber für einen ISA-Interrupt konfiguriert (oder andersherum). Bitte benutzen sie das System-Setup Programm dieses Computers, um den Interrupt für dieses Gerät neu zu konfigurieren." + IDS_DEV_BIOS_TABLE "Die System-Firmware ihres Computers beinhaltet nicht genug Information um dieses Gerät korrekt konfigurieren und benutzen zu können. Um dieses Gerät benutzen zu können, kontaktieren Sie bitte Ihren Computerhersteller um ein Firmware- oder BIOS-Update zu erhalten." + IDS_DEV_IRQ_TRANSLATION_FAILED "Dieses Gerät beantragt einen PCI-Interrupt, ist aber für einen ISA-Interrupt konfiguriert (oder andersherum). Bitte benutzen Sie das System-Setup Programm dieses Computers, um den Interrupt für dieses Gerät neu zu konfigurieren." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kann den Gerätetreiber für dieses Gerät nicht initialisieren." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS kann den Gerätetreiber für dieses Gerät nicht laden, weil eine noch frühere Instanz des Gerätetreibers im Speicher ist." IDS_DEV_DRIVER_FAILED_LOAD "Der Gerätetreiber für diese Hardware kann nicht geladen werden. Der Treiber ist möglicherweise beschädigt oder nicht vorhanden." - IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS kann dieses Gerät nicht ansprechen, weil seine Serviceschlüssel Information nicht in der Registry ist oder weil sie falsch ist." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS kann dieses Gerät nicht ansprechen, weil seine Serviceschlüssel-Information nicht in der Registrierungsdatenbank ist oder weil sie falsch ist." IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS hat den Gerätetreiber für dieses Gerät erfolgreich geladen, kann aber das Gerät nicht finden." IDS_DEV_DUPLICATE_DEVICE "ReactOS kann den Gerätetreiber für dieses Gerät nicht laden, weil bereits ein identisches Gerät installiert ist." IDS_DEV_FAILED_POST_START "ReactOS hat dieses Gerät angehalten, weil es Probleme berichtet hat." @@ -87,7 +87,7 @@ IDS_DEV_PHANTOM "Dieses Gerät ist momentan nicht mit dem Computer verbunden." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS kann auf dieses Gerät nicht zugreifen, weil das Betriebssystem heruntergefahren wird." IDS_DEV_HELD_FOR_EJECT "ReactOS kann dieses Gerät nicht benutzen, weil es für ""Sicheres Entfernen"" vorbereitet wurde, aber es wurde bisher nicht vom Computer entfernt." - IDS_DEV_DRIVER_BLOCKED "Die Ausführung der Software für dieses Gerät wurde blockiert, weil bekannt ist, dass sie Probleme mit ReactOS hat. Kontaktieren sie den Hersteller für einen neuen Treiber." + IDS_DEV_DRIVER_BLOCKED "Die Ausführung der Software für dieses Gerät wurde blockiert, weil bekannt ist, dass sie Probleme mit ReactOS hat. Kontaktieren Sie den Hersteller für einen neuen Treiber." IDS_DEV_REGISTRY_TOO_LARGE "Die neuen Hardwaregeräte können nicht gestartet werden, da die Systemstruktur zu groß ist (die Struktur überschreitet die Registrierungsgrößenbeschränkung)." IDS_DEV_SETPROPERTIES_FAILED "ReactOS konnte die Einstellungen für dieses Gerät nicht verändern." END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sat Jun 14 03:51:42 2008 @@ -184,7 +184,7 @@ LTEXT "K&ommentar:", 14018, 8, 152, 57, 10 EDITTEXT 14019, 79, 149, 150, 14, ES_AUTOHSCROLL PUSHBUTTON "&Ziel finden...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "I&con wechseln...", 14021, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "S&ymbol wechseln...", 14021, 84, 172, 70, 14, ES_LEFT PUSHBUTTON "Er&weitert...", 14022, 159, 172, 70, 14, ES_LEFT END @@ -311,7 +311,7 @@ LTEXT "Welches Benutzerkonto wollen Sie zum Starten dieser Anwendung verwenden?", -1, 10, 20, 220, 20 CHECKBOX "Aktueller Benutzer %s", 14000, 10, 45, 150, 10 LTEXT "Computer vor unauthorisierten Programmaktiviäten schützen", -1, 25, 57, 200, 10, WS_DISABLED - CHECKBOX "Diese Einstellung kann Computerviren daran hindern, ihrem Computer oder Ihren persönlichen Daten zu schaden, aber es kann auch Programme daran hindern, Ordnungsgemäß zu arbeiten.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "Diese Einstellung kann Computerviren daran hindern, ihrem Computer oder Ihren persönlichen Daten zu schaden, aber es kann auch Programme daran hindern, ordnungsgemäß zu arbeiten.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE CHECKBOX "Folgender Benutzer:", 14002, 10, 100, 90, 10 LTEXT "Benutzername:", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -659,7 +659,7 @@ IDS_FOLDER_OPTIONS "Ordneroptionen" IDS_RECYCLEBIN_LOCATION "Papierkorbpfad" IDS_RECYCLEBIN_DISKSPACE "freier Speicher" - IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_TITLE "Symbol auswählen" IDS_PICK_ICON_FILTER "Symboldateien(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" IDS_OPEN_WITH_FILTER "Programme\0*.exe\0" IDS_DIRECTORY "Dateiordner" Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sat Jun 14 03:51:42 2008 @@ -100,7 +100,7 @@ LTEXT "Um die lokalen Nutzer- oder Systemeinstellungen zu ändern, klicken Sie auf Einstellen.", IDC_STATIC, 53, 57, 188, 15 PUSHBUTTON "&Einstellen...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 - LTEXT "Das Tastaturlayout gibt vor, welche Zeichen ein Tastendruck bewirkt.", + LTEXT "Das Tastaturlayout gibt vor, welches Zeichen ein Tastendruck bewirkt.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Um das Tastaturlayout zu ändern, klicken Sie auf Einstellen.",

16 years, 6 months

[fireball] 33961: - Release the acquired spinlock in IoUnregisterShutdownNotification(), spotted by Cameron Gutman.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 14 03:16:22 2008 New Revision: 33961 URL: http://svn.reactos.org/svn/reactos?rev=33961&view=rev Log: - Release the acquired spinlock in IoUnregisterShutdownNotification(), spotted by Cameron Gutman. Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sat Jun 14 03:16:22 2008 @@ -1359,6 +1359,9 @@ NextEntry = NextEntry->Flink; } + /* Release the shutdown lock */ + KeReleaseSpinLock(&ShutdownListLock, OldIrql); + /* Now remove the flag */ DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; }

16 years, 6 months

[jimtabor] 33960: Patch by Jeffrey Morlan (mrnobo1024 at yahoo dot com, irc: Goplat), Registers ansi scroll bar proc.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jun 14 00:34:02 2008 New Revision: 33960 URL: http://svn.reactos.org/svn/reactos?rev=33960&view=rev Log: Patch by Jeffrey Morlan (mrnobo1024 at yahoo dot com, irc: Goplat), Registers ansi scroll bar proc. Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sat Jun 14 00:34:02 2008 @@ -69,7 +69,8 @@ HBRUSH DefWndControlColor(HDC hDC, UINT ctlType); -static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); UINT STDCALL SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL STDCALL KillSystemTimer(HWND,UINT_PTR); @@ -81,8 +82,8 @@ { L"ScrollBar", /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ - ScrollBarWndProc, /* procW */ - NULL, /* procA (winproc is Unicode only) */ + ScrollBarWndProcW, /* procW */ + ScrollBarWndProcA, /* procA */ 0, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -1252,7 +1253,7 @@ * ScrollBarWndProc */ static LRESULT WINAPI -ScrollBarWndProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) +ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { if (! IsWindow(Wnd)) { @@ -1454,10 +1455,22 @@ { WARN("unknown msg %04x wp=%04lx lp=%08lx\n", Msg, wParam, lParam); } - return DefWindowProcW(Wnd, Msg, wParam, lParam ); + return DefWindowProc(Wnd, Msg, wParam, lParam ); } return 0; +} + +static LRESULT WINAPI +ScrollBarWndProcW(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + return ScrollBarWndProc(DefWindowProcW, Wnd, Msg, wParam, lParam); +} + +static LRESULT WINAPI +ScrollBarWndProcA(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + return ScrollBarWndProc(DefWindowProcA, Wnd, Msg, wParam, lParam); }

16 years, 6 months

[cfinck] 33959: Don't use MenuCleanupRosMenuItemInfo for an array of Items allocated on the heap! This function is meant to be used for a single menu item info and just frees the memory allocated for dwTypeInfo. Replaced this with a simple HeapFree call to free the memory for the whole array allocated in MenuGetAllRosMenuItemInfo. Fixes a heap corruption discovered by encoded. See issue #3349 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jun 13 19:00:20 2008 New Revision: 33959 URL: http://svn.reactos.org/svn/reactos?rev=33959&view=rev Log: Don't use MenuCleanupRosMenuItemInfo for an array of Items allocated on the heap! This function is meant to be used for a single menu item info and just frees the memory allocated for dwTypeInfo. Replaced this with a simple HeapFree call to free the memory for the whole array allocated in MenuGetAllRosMenuItemInfo. Fixes a heap corruption discovered by encoded. See issue #3349 for more details. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Fri Jun 13 19:00:20 2008 @@ -3963,7 +3963,7 @@ break; } } - MenuCleanupRosMenuItemInfo(Items); + HeapFree(GetProcessHeap(), 0, Items); *pChecked += cChecked; *pUnchecked += cUnchecked;

16 years, 6 months

[cfinck] 33958: Revert parts of r33578: - First of all, MenuSetItemData is only called from InsertMenuA/W and ModifyMenuA/W. Therefore the passed MENUITEMINFO structure will always be empty, so it makes no sense to check for flags in this structure. This way, I could simplify the code block for MF_BITMAP. - Also fType = MFT_BITMAP and fMask = MIIM_BITMAP at the same time passed to win32k don't work. Changing this back to only set fMask fixes bitmap menus. - Furthermore the data for MF_OWNERDRAW

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jun 13 18:14:27 2008 New Revision: 33958 URL: http://svn.reactos.org/svn/reactos?rev=33958&view=rev Log: Revert parts of r33578: - First of all, MenuSetItemData is only called from InsertMenuA/W and ModifyMenuA/W. Therefore the passed MENUITEMINFO structure will always be empty, so it makes no sense to check for flags in this structure. This way, I could simplify the code block for MF_BITMAP. - Also fType = MFT_BITMAP and fMask = MIIM_BITMAP at the same time passed to win32k don't work. Changing this back to only set fMask fixes bitmap menus. - Furthermore the data for MF_OWNERDRAW is really stored in dwItemData and not in dwTypeData. The MSDN documentation for InsertMenu applies here, not the one for the MENUITEMINFO structure. This fixes owner-drawn menus like the one in Abiword. See issue #3272 for more details. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Fri Jun 13 18:14:27 2008 @@ -3712,20 +3712,8 @@ */ if(Flags & MF_BITMAP) { - if (mii->fType & MFT_BITMAP) - { - /* use old way of storing bitmap */ - mii->fMask |= (MIIM_TYPE | MIIM_FTYPE); - mii->fType |= MF_BITMAP; - mii->dwTypeData = (LPWSTR)NewItem; - } - else - { - /* use new way of storing type */ - mii->hbmpItem = (HBITMAP) NewItem; - mii->fType |= MFT_BITMAP; - mii->fMask |= MIIM_BITMAP; - } + mii->fMask |= MIIM_BITMAP; /* Use the new way of seting hbmpItem.*/ + mii->hbmpItem = (HBITMAP) NewItem; if (Flags & MF_HELP) { @@ -3736,8 +3724,8 @@ else if(Flags & MF_OWNERDRAW) { mii->fType |= MFT_OWNERDRAW; - mii->fMask |= (MIIM_TYPE | MIIM_FTYPE); - mii->dwTypeData = (LPWSTR) NewItem; + mii->fMask |= MIIM_DATA; + mii->dwItemData = (DWORD) NewItem; } else if (Flags & MF_SEPARATOR) {

16 years, 6 months

← Newer
1
...
24
25
26
27
28
29
30
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008