Ros-diffs September 2009

ros-diffs@reactos.org

16 participants
270 discussions

[arty] 43106: Use Bcb before initialization. What I meant was just to check alignment here. Mostly for historical interest atm. Spotted by amine khaldi

by arty＠svn.reactos.org

Author: arty Date: Mon Sep 21 20:24:39 2009 New Revision: 43106 URL: http://svn.reactos.org/svn/reactos?rev=43106&view=rev Log: Use Bcb before initialization. What I meant was just to check alignment here. Mostly for historical interest atm. Spotted by amine khaldi Modified: branches/arty-newcc/ntoskrnl/cache/copysup.c Modified: branches/arty-newcc/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/copys… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/copysup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/copysup.c [iso-8859-1] Mon Sep 21 20:24:39 2009 @@ -151,7 +151,7 @@ (FileObject, &CacheOffset, WriteLen, - (CacheOffset.QuadPart == Bcb->FileOffset.QuadPart && + (!(CacheOffset.QuadPart & (CACHE_STRIPE - 1)) && WriteLen == CACHE_STRIPE), Wait ? PIN_WAIT : PIN_IF_BCB, (PVOID*)&Bcb,

15 years, 3 months

[janderwald] 43105: - Fix playing global thermo nuclear war in ReactOS - Found by encoded

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Sep 21 20:11:52 2009 New Revision: 43105 URL: http://svn.reactos.org/svn/reactos?rev=43105&view=rev Log: - Fix playing global thermo nuclear war in ReactOS - Found by encoded Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Mon Sep 21 20:11:52 2009 @@ -772,7 +772,7 @@ /* check all stream headers */ StreamHeader = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; - + ASSERT(StreamHeader); _SEH2_TRY { do @@ -880,7 +880,10 @@ /* now probe the allocated mdl's */ if (!NT_SUCCESS(Status)) + { + DPRINT("Status %x\n", Status); return Status; + } else goto ProbeMdl; } @@ -1607,7 +1610,7 @@ PIO_STACK_LOCATION IoStack; KIRQL OldLevel; - DPRINT1("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); + DPRINT("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); /* check for required parameters */ if (!QueueHead || !SpinLock || !Irp) return;

15 years, 3 months

[jimtabor] 43104: - Add the missing Result return pointed out by Michael Martin.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Sep 21 19:29:26 2009 New Revision: 43104 URL: http://svn.reactos.org/svn/reactos?rev=43104&view=rev Log: - Add the missing Result return pointed out by Michael Martin. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Sep 21 19:29:26 2009 @@ -689,6 +689,8 @@ UserEnterCo(); + Result = *(LRESULT*)ResultPointer; + IntCbFreeMemory(Argument); if (!NT_SUCCESS(Status))

15 years, 3 months

[sginsberg] 43103: Mega compiler intrinsics patch: FreeLdr - Goodbye Ke386EraseFlags & KeAmd64EraseFlags. Welcome __writeeflags. - Respect MSVC when generating clc (clear carry flag) instruction in PcGetTime. - Use portable __wbinvd instead of __asm__ in XboxMemInit. - Replace broken gcc assembly by portable intrinsics in WinLdrpMapApic. - Use portable Ke386SetSs and Ke386SetGs (new) in WinLdrSetProcessorContext. - The far jump in WinLdrSetProcessorContext can not be expressed in masm, so we use

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Sep 21 17:20:18 2009 New Revision: 43103 URL: http://svn.reactos.org/svn/reactos?rev=43103&view=rev Log: Mega compiler intrinsics patch: FreeLdr - Goodbye Ke386EraseFlags & KeAmd64EraseFlags. Welcome __writeeflags. - Respect MSVC when generating clc (clear carry flag) instruction in PcGetTime. - Use portable __wbinvd instead of __asm__ in XboxMemInit. - Replace broken gcc assembly by portable intrinsics in WinLdrpMapApic. - Use portable Ke386SetSs and Ke386SetGs (new) in WinLdrSetProcessorContext. - The far jump in WinLdrSetProcessorContext can not be expressed in masm, so we use a (untested) far return instead. Kernel - Replace Ke386Set/GetInterruptDescriptorTable, Ke386Save/RestoreFlags, Ke386Set/GetDr, Ki386Cpuid, Ke386Rdmsr and Ke386Wrmsr by MSVC alternatives present in intrin.h. - Fixed Ke386Get/SetGlobalDescriptorTable, Ke386GetLocalDescriptorTable and Ke386GetTr -- the intrinsics were completely broken for MSVC and generated bogus code. Moreover, Ke386Set/GetInterruptDescriptorTable and Ke386Rdmsr were also affected. This lets us (in addition to having a bootable, working msvc compiled kernel) get rid of several hacky variable zero-initializations that hid this bug -- the way MSVC interpreted the inlined assembly resulted in uninitialized variable usage. - Implement Ke386SetGs and add missing Ke386SetGs for gcc. - KdPollBreakIn: Use portable KeDisableInterrupts instead of x86 intrinsics and flags. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c trunk/reactos/ntoskrnl/kd64/kdlock.c trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -90,7 +90,7 @@ _disable(); /* Re-initalize EFLAGS */ - KeAmd64EraseFlags(); + __writeeflags(0); /* Initialize the page directory */ FrLdrSetupPageDirectory(); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -58,7 +58,7 @@ _disable(); /* Re-initalize EFLAGS */ - Ke386EraseFlags(); + __writeeflags(0); /* Initialize the page directory */ FrLdrSetupPageDirectory(); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -19,6 +19,19 @@ #include <freeldr.h> +FORCEINLINE +VOID +ClearCarryFlag(VOID) +{ +#if defined(__GNUC__) + __asm__ ("clc"); +#elif defined(_MSC_VER) + __asm clc; +#else +#error +#endif +} + #define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f)) TIMEINFO* @@ -31,7 +44,7 @@ * in the Compaq Deskpro EP/SB, leave CF unchanged * if successful, so CF should be cleared before * calling this function. */ - __asm__ ("clc"); + ClearCarryFlag(); /* Int 1Ah AH=04h * TIME - GET REAL-TIME CLOCK DATE (AT,XT286,PS) @@ -55,7 +68,7 @@ /* Some BIOSes leave CF unchanged if successful, * so CF should be cleared before calling this function. */ - __asm__ ("clc"); + ClearCarryFlag(); /* Int 1Ah AH=02h * TIME - GET REAL-TIME CLOCK TIME (AT,XT286,PS) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -45,14 +45,14 @@ InstalledMemoryMb = 64; memset(ControlRegion, TEST_PATTERN1, TEST_SIZE); memset(MembaseTop, TEST_PATTERN1, TEST_SIZE); - __asm__ ("wbinvd\n"); + __wbinvd(); if (0 == memcmp(MembaseTop, ControlRegion, TEST_SIZE)) { /* Looks like there is memory .. maybe a 128MB box */ memset(ControlRegion, TEST_PATTERN2, TEST_SIZE); memset(MembaseTop, TEST_PATTERN2, TEST_SIZE); - __asm__ ("wbinvd\n"); + __wbinvd(); if (0 == memcmp(MembaseTop, ControlRegion, TEST_SIZE)) { /* Definitely looks like there is memory */ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -109,25 +109,6 @@ /* Swap */ #include <bytesex.h> -/* arch defines */ -#ifdef __GNUC__ -#ifdef _X86_ -#define Ke386EraseFlags() __asm__ __volatile__("pushl $0 ; popfl\n") -#endif - -#ifdef _M_AMD64 -#define KeAmd64EraseFlags() __asm__ __volatile__("pushq $0 ; popfq\n") -#endif -#else -#ifdef _X86_ -#define Ke386EraseFlags() __asm push 0; __asm popf; -#endif - -#ifdef _M_AMD64 -#error FIXME -#endif -#endif - VOID BootMain(LPSTR CmdLine); VOID RunLoader(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -401,33 +401,24 @@ } #ifdef _M_IX86 - -BOOLEAN LocalAPIC = FALSE; -ULONG_PTR APICAddress = 0; - VOID WinLdrpMapApic() { + BOOLEAN LocalAPIC; + LARGE_INTEGER MsrValue; + ULONG APICAddress, CpuInfo[4]; + /* Check if we have a local APIC */ - asm(".intel_syntax noprefix\n"); - asm("mov eax, 1\n"); - asm("cpuid\n"); - asm("shr edx, 9\n"); - asm("and edx, 0x1\n"); - asm("mov _LocalAPIC, edx\n"); - asm(".att_syntax\n"); + __cpuid((int*)CpuInfo, 1); + LocalAPIC = (((CpuInfo[3] >> 9) & 1) != 0); /* If there is no APIC, just return */ if (!LocalAPIC) return; - asm(".intel_syntax noprefix\n"); - asm("mov ecx, 0x1B\n"); - asm("rdmsr\n"); - asm("mov edx, eax\n"); - asm("and edx, 0xFFFFF000\n"); - asm("mov _APICAddress, edx"); - asm(".att_syntax\n"); + /* Read the APIC Address */ + MsrValue.QuadPart = __readmsr(0x1B); + APICAddress = (MsrValue.LowPart & 0xFFFFF000); DPRINTM(DPRINT_WINDOWS, "Local APIC detected at address 0x%x\n", APICAddress); @@ -643,7 +634,7 @@ _disable(); // Re-initalize EFLAGS - Ke386EraseFlags(); + __writeeflags(0); // Set the PDBR __writecr3((ULONG_PTR)PDE); @@ -743,8 +734,8 @@ RtlZeroMemory((PVOID)Pcr, MM_PAGE_SIZE); //FIXME: Why zero only 1 page when we allocate 2? // Get old values of GDT and IDT - Ke386GetGlobalDescriptorTable(GdtDesc); - Ke386GetInterruptDescriptorTable(IdtDesc); + Ke386GetGlobalDescriptorTable(&GdtDesc); + __sidt(&IdtDesc); // Save old IDT OldIdt.Base = IdtDesc.Base; @@ -918,18 +909,28 @@ //asm("cli\n"); // they are already masked before enabling paged mode // Load GDT+IDT - Ke386SetGlobalDescriptorTable(GdtDesc); - Ke386SetInterruptDescriptorTable(IdtDesc); + Ke386SetGlobalDescriptorTable(&GdtDesc); + __lidt(&IdtDesc); // Jump to proper CS and clear prefetch queue +#if defined(__GNUC__) asm("ljmp $0x08, $1f\n" "1:\n"); +#elif defined(_MSC_VER) + /* We can't express the above in MASM so we use this far return instead */ + DbgPrint("WinLdrSetProcessorContext: Performing untested far-return\n"); + __asm { + push 8 + push offset resume + retf + resume: + }; +#else +#error +#endif // Set SS selector - asm(".intel_syntax noprefix\n"); - asm("mov ax, 0x10\n"); // DataSelector=0x10 - asm("mov ss, ax\n"); - asm(".att_syntax\n"); + Ke386SetSs(0x10); // DataSelector=0x10 // Set DS and ES selectors Ke386SetDs(0x10); @@ -942,10 +943,7 @@ Ke386SetTr(0x28); // Clear GS - asm(".intel_syntax noprefix\n"); - asm("push 0\n"); - asm("pop gs\n"); - asm(".att_syntax\n"); + Ke386SetGs(0); // Set FS to PCR Ke386SetFs(0x30); Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -238,7 +238,7 @@ HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle; CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; - ULONG ExtendedId, Dummy; + ULONG ExtendedId, CpuInfo[4]; PKPRCB Prcb; USHORT IndexTable[MaximumType + 1] = {0}; ANSI_STRING TempString; @@ -428,19 +428,17 @@ else { /* Check if we have extended CPUID that supports name ID */ - Ki386Cpuid(0x80000000, &ExtendedId, &Dummy, &Dummy, &Dummy); + CPUID(CpuInfo, 0x80000000); + ExtendedId = CpuInfo[0]; if (ExtendedId >= 0x80000004) { - /* Do all the CPUIDs requred to get the full name */ + /* Do all the CPUIDs required to get the full name */ PartialString = CpuString; for (ExtendedId = 2; ExtendedId <= 4; ExtendedId++) { /* Do the CPUID and save the name string */ - Ki386Cpuid(0x80000000 | ExtendedId, - (PULONG)PartialString, - (PULONG)PartialString + 1, - (PULONG)PartialString + 2, - (PULONG)PartialString + 3); + CPUID((PULONG)PartialString, + 0x80000000 | ExtendedId); /* Go to the next name string */ PartialString += 16; Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -9,31 +9,20 @@ #if defined(__GNUC__) -#define Ke386SetInterruptDescriptorTable(X) \ - __asm__("lidt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); - -#define Ke386GetInterruptDescriptorTable(X) \ - __asm__("sidt %0\n\t" \ - : "=m" (X) \ - : /* no input */ \ - : "memory"); - #define Ke386SetGlobalDescriptorTable(X) \ __asm__("lgdt %0\n\t" \ : /* no outputs */ \ - : "m" (X)); + : "m" (*X)); #define Ke386GetGlobalDescriptorTable(X) \ __asm__("sgdt %0\n\t" \ - : "=m" (X) \ + : "=m" (*X) \ : /* no input */ \ : "memory"); #define Ke386GetLocalDescriptorTable(X) \ __asm__("sldt %0\n\t" \ - : "=m" (X) \ + : "=m" (*X) \ : /* no input */ \ : "memory"); @@ -46,10 +35,7 @@ #define Ke386GetTr(X) \ __asm__("str %0\n\t" \ - : "=m" (X)); - -#define Ke386SaveFlags(x) __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */) -#define Ke386RestoreFlags(x) __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory") + : "=m" (*X)); #define _Ke386GetSeg(N) ({ \ unsigned int __d; \ @@ -59,25 +45,6 @@ #define _Ke386SetSeg(N,X) __asm__ __volatile__("movl %0,%%" #N : :"r" (X)); -#define _Ke386GetDr(N) ({ \ - unsigned int __d; \ - __asm__("movl %%dr" #N ",%0\n\t" :"=r" (__d)); \ - __d; \ - }) - -#define _Ke386SetDr(N,X) __asm__ __volatile__("movl %0,%%dr" #N : :"r" (X)); - - -static inline void Ki386Cpuid(ULONG Op, PULONG Eax, PULONG Ebx, PULONG Ecx, PULONG Edx) -{ - __asm__("cpuid" - : "=a" (*Eax), "=b" (*Ebx), "=c" (*Ecx), "=d" (*Edx) - : "0" (Op)); -} - -#define Ke386Rdmsr(msr,val1,val2) __asm__ __volatile__("rdmsr" : "=a" (val1), "=d" (val2) : "c" (msr)) -#define Ke386Wrmsr(msr,val1,val2) __asm__ __volatile__("wrmsr" : /* no outputs */ : "c" (msr), "a" (val1), "d" (val2)) - #define Ke386HaltProcessor() __asm__("hlt\n\t"); #define Ke386FnInit() __asm__("fninit\n\t"); @@ -87,24 +54,6 @@ // CR Macros // #define Ke386SetCr2(X) __asm__ __volatile__("movl %0,%%cr2" : :"r" (X)); - -// -// DR Macros -// -#define Ke386GetDr0() _Ke386GetDr(0) -#define Ke386GetDr1() _Ke386GetDr(1) -#define Ke386SetDr0(X) _Ke386SetDr(0,X) -#define Ke386SetDr1(X) _Ke386SetDr(1,X) -#define Ke386GetDr2() _Ke386GetDr(2) -#define Ke386SetDr2(X) _Ke386SetDr(2,X) -#define Ke386GetDr3() _Ke386GetDr(3) -#define Ke386SetDr3(X) _Ke386SetDr(3,X) -#define Ke386GetDr4() _Ke386GetDr(4) -#define Ke386SetDr4(X) _Ke386SetDr(4,X) -#define Ke386GetDr6() _Ke386GetDr(6) -#define Ke386SetDr6(X) _Ke386SetDr(6,X) -#define Ke386GetDr7() _Ke386GetDr(7) -#define Ke386SetDr7(X) _Ke386SetDr(7,X) // // Segment Macros @@ -114,51 +63,13 @@ #define Ke386SetFs(X) _Ke386SetSeg(fs, X) #define Ke386SetDs(X) _Ke386SetSeg(ds, X) #define Ke386SetEs(X) _Ke386SetSeg(es, X) +#define Ke386SetSs(X) _Ke386SetSeg(ss, X) +#define Ke386SetGs(X) _Ke386SetSeg(gs, X) #elif defined(_MSC_VER) FORCEINLINE VOID -Ke386Wrmsr(IN ULONG Register, - IN ULONG Var1, - IN ULONG Var2) -{ - __asm mov ecx, Register; - __asm mov eax, Var1; - __asm mov edx, Var2; - __asm wrmsr; -} - -FORCEINLINE -ULONGLONG -Ke386Rdmsr(IN ULONG Register, - IN ULONG Var1, - IN ULONG Var2) -{ - __asm mov ecx, Register; - __asm mov eax, Var1; - __asm mov edx, Var2; - __asm rdmsr; -} - -FORCEINLINE -VOID -Ki386Cpuid(IN ULONG Operation, - OUT PULONG Var1, - OUT PULONG Var2, - OUT PULONG Var3, - OUT PULONG Var4) -{ - __asm mov eax, Operation; - __asm cpuid; - __asm mov [Var1], eax; - __asm mov [Var2], ebx; - __asm mov [Var3], ecx; - __asm mov [Var4], edx; -} - -FORCEINLINE -VOID Ke386FnInit(VOID) { __asm fninit; @@ -173,37 +84,25 @@ FORCEINLINE VOID -Ke386GetInterruptDescriptorTable(OUT KDESCRIPTOR Descriptor) -{ - __asm sidt Descriptor; -} - -FORCEINLINE -VOID -Ke386SetInterruptDescriptorTable(IN KDESCRIPTOR Descriptor) -{ - __asm lidt Descriptor; -} - -FORCEINLINE -VOID -Ke386GetGlobalDescriptorTable(OUT KDESCRIPTOR Descriptor) -{ - __asm sgdt Descriptor; -} - -FORCEINLINE -VOID -Ke386SetGlobalDescriptorTable(IN KDESCRIPTOR Descriptor) -{ - __asm lgdt Descriptor; -} - -FORCEINLINE -VOID -Ke386GetLocalDescriptorTable(OUT USHORT Descriptor) -{ - __asm sldt Descriptor; +Ke386GetGlobalDescriptorTable(OUT PVOID Descriptor) +{ + __asm sgdt [Descriptor]; +} + +FORCEINLINE +VOID +Ke386SetGlobalDescriptorTable(IN PVOID Descriptor) +{ + __asm lgdt [Descriptor]; +} + +FORCEINLINE +VOID +Ke386GetLocalDescriptorTable(OUT PUSHORT Descriptor) +{ + USHORT _Descriptor; + __asm sldt _Descriptor; + *Descriptor = _Descriptor; } FORCEINLINE @@ -215,22 +114,6 @@ FORCEINLINE VOID -Ke386SaveFlags(IN ULONG Flags) -{ - __asm pushf; - __asm pop Flags; -} - -FORCEINLINE -VOID -Ke386RestoreFlags(IN ULONG Flags) -{ - __asm push Flags; - __asm popf; -} - -FORCEINLINE -VOID Ke386SetTr(IN USHORT Tr) { __asm ltr Tr; @@ -238,9 +121,11 @@ FORCEINLINE USHORT -Ke386GetTr(IN USHORT Tr) -{ - __asm str Tr; +Ke386GetTr(OUT PUSHORT Tr) +{ + USHORT _Tr; + __asm str _Tr; + *Tr = _Tr; } // @@ -255,99 +140,6 @@ } // -// DR Macros -// -FORCEINLINE -ULONG -Ke386GetDr0(VOID) -{ - __asm mov eax, dr0; -} - -FORCEINLINE -ULONG -Ke386GetDr1(VOID) -{ - __asm mov eax, dr1; -} - -FORCEINLINE -ULONG -Ke386GetDr2(VOID) -{ - __asm mov eax, dr2; -} - -FORCEINLINE -ULONG -Ke386GetDr3(VOID) -{ - __asm mov eax, dr3; -} - -FORCEINLINE -ULONG -Ke386GetDr6(VOID) -{ - __asm mov eax, dr6; -} - -FORCEINLINE -ULONG -Ke386GetDr7(VOID) -{ - __asm mov eax, dr7; -} - -FORCEINLINE -VOID -Ke386SetDr0(IN ULONG Value) -{ - __asm mov eax, Value; - __asm mov dr0, eax; -} - -FORCEINLINE -VOID -Ke386SetDr1(IN ULONG Value) -{ - __asm mov eax, Value; - __asm mov dr1, eax; -} - -FORCEINLINE -VOID -Ke386SetDr2(IN ULONG Value) -{ - __asm mov eax, Value; - __asm mov dr2, eax; -} - -FORCEINLINE -VOID -Ke386SetDr3(IN ULONG Value) -{ - __asm mov eax, Value; - __asm mov dr3, eax; -} - -FORCEINLINE -VOID -Ke386SetDr6(IN ULONG Value) -{ - __asm mov eax, Value; - __asm mov dr6, eax; -} - -FORCEINLINE -VOID -Ke386SetDr7(IN ULONG Value) -{ - __asm mov eax, Value; - __asm mov dr7, eax; -} - -// // Segment Macros // FORCEINLINE @@ -408,6 +200,14 @@ { __asm mov ax, Value; __asm mov es, ax; +} + +FORCEINLINE +VOID +Ke386SetGs(IN USHORT Value) +{ + __asm mov ax, Value; + __asm mov gs, ax; } #else Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -994,6 +994,7 @@ KiI386PentiumLockErrataFixup(VOID); VOID +NTAPI WRMSR( IN ULONG Register, IN LONGLONG Value Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -1115,7 +1115,7 @@ DPRINT("GspUnloadBreakpoints\n"); /* Disable hardware debugging while we are inside the stub */ - Ke386SetDr7(0); + __writedr(7, 0); for (Index = 0; Index < GspSwBreakpointCount; Index++) { @@ -1402,7 +1402,7 @@ if (Stepping) Context->EFlags |= EFLAGS_TF; - Dr6 = Ke386GetDr6(); + Dr6 = __readdr(6); if (!(Dr6 & DR6_BS)) { for (BreakpointNumber = 0; @@ -1422,7 +1422,7 @@ } GspLoadBreakpoints(TrapFrame); - Ke386SetDr6(0); + __writedr(6, 0); if (NULL != GspDbgThread) { Modified: trunk/reactos/ntoskrnl/kd64/kdlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -74,16 +74,13 @@ NTAPI KdPollBreakIn(VOID) { - BOOLEAN DoBreak = FALSE; - ULONG Flags = 0; + BOOLEAN DoBreak = FALSE, Enable; /* First make sure that KD is enabled */ if (KdDebuggerEnabled) { /* Disable interrupts */ - Ke386SaveFlags(Flags); - //Flags = __getcallerseflags(); - _disable(); + Enable = KeDisableInterrupts(); /* Check if a CTRL-C is in the queue */ if (KdpContext.KdpControlCPending) @@ -115,11 +112,10 @@ } } - /* Re-enable interrupts if they were disabled */ - if (Flags & EFLAGS_INTERRUPT_MASK) _enable(); + /* Re-enable interrupts if they were enabled previously */ + if (Enable) _enable(); } /* Tell the caller to do a break */ return DoBreak; } - Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -413,7 +413,7 @@ } /* Read the interrupt descriptor table register */ - Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&Idtr.Limit); + __sidt(&Idtr.Limit); if (IntVect >= (Idtr.Limit + 1) / 8) { /*KdbpPrint("IDT does not contain interrupt vector %d\n.", IntVect);*/ @@ -1573,14 +1573,7 @@ ULONG_PTR TrapCr2; ULONG Err; -#ifdef __GNUC__ - asm volatile("movl %%cr2, %0" : "=r"(TrapCr2)); -#elif _MSC_VER - __asm mov eax, cr2; - __asm mov TrapCr2, eax; -#else -#error Unknown compiler for inline assembler -#endif + TrapCr2 = __readcr2(); Err = TrapFrame->ErrCode; KdbpPrint("Memory at 0x%p could not be %s: ", TrapCr2, (Err & (1 << 1)) ? "written" : "read"); @@ -1611,13 +1604,13 @@ KdbpTrapFrameToKdbTrapFrame(TrapFrame, &KdbTrapFrame); /* Enter critical section */ - Ke386SaveFlags(OldEflags); + OldEflags = __readeflags(); _disable(); /* Exception inside the debugger? Game over. */ if (InterlockedIncrement(&KdbEntryCount) > 1) { - Ke386RestoreFlags(OldEflags); + __writeeflags(OldEflags); return kdHandleException; } @@ -1654,7 +1647,7 @@ InterlockedDecrement(&KdbEntryCount); /* Leave critical section */ - Ke386RestoreFlags(OldEflags); + __writeeflags(OldEflags); /* Check if user requested a bugcheck */ if (KdbpBugCheckRequested) Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -648,8 +648,8 @@ else if (Argv[0][0] == 'c') /* cregs */ { ULONG Cr0, Cr2, Cr3, Cr4; - KDESCRIPTOR Gdtr = {0}, Ldtr = {0}, Idtr = {0}; - ULONG Tr = 0; + KDESCRIPTOR Gdtr, Ldtr, Idtr; + ULONG Tr; static const PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, " WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL, @@ -665,12 +665,12 @@ Cr4 = KdbCurrentTrapFrame->Cr4; /* Get descriptor table regs */ - Ke386GetGlobalDescriptorTable(*(PKDESCRIPTOR)&Gdtr.Limit); - Ke386GetLocalDescriptorTable(Ldtr.Limit); - Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&Idtr.Limit); + Ke386GetGlobalDescriptorTable(&Gdtr.Limit); + Ke386GetLocalDescriptorTable(&Ldtr.Limit); + __sidt(&Idtr.Limit); /* Get the task register */ - Ke386GetTr(Tr); + Ke386GetTr((PUSHORT)&Tr); /* Display the control registers */ KdbpPrint("CR0 0x%08x ", Cr0); @@ -1541,7 +1541,7 @@ ULONG Argc, PCHAR Argv[]) { - KDESCRIPTOR Reg = {0}; + KDESCRIPTOR Reg; ULONG SegDesc[2]; ULONG SegBase; ULONG SegLimit; @@ -1554,7 +1554,7 @@ if (Argv[0][0] == 'i') { /* Read IDTR */ - Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&Reg.Limit); + __sidt(&Reg.Limit); if (Reg.Limit < 7) { @@ -1614,7 +1614,7 @@ if (Argv[0][0] == 'g') { /* Read GDTR */ - Ke386GetGlobalDescriptorTable(*(PKDESCRIPTOR)&Reg.Limit); + Ke386GetGlobalDescriptorTable(&Reg.Limit); i = 8; } else @@ -1622,7 +1622,7 @@ ASSERT(Argv[0][0] == 'l'); /* Read LDTR */ - Ke386GetLocalDescriptorTable(Reg.Limit); + Ke386GetLocalDescriptorTable(&Reg.Limit); i = 0; ul = 1 << 2; } @@ -2742,7 +2742,7 @@ HANDLE hFile = NULL; INT FileSize; PCHAR FileBuffer; - ULONG OldEflags = 0; + ULONG OldEflags; /* Initialize the object attributes */ RtlInitUnicodeString(&FileName, L"\\SystemRoot\\system32\\drivers\\etc\\KDBinit"); @@ -2793,7 +2793,7 @@ FileBuffer[FileSize] = '\0'; /* Enter critical section */ - Ke386SaveFlags(OldEflags); + OldEflags = __readeflags(); _disable(); /* Interpret the init file... */ @@ -2802,7 +2802,7 @@ KdbInitFileBuffer = NULL; /* Leave critical section */ - Ke386RestoreFlags(OldEflags); + __writeeflags(OldEflags); ExFreePool(FileBuffer); } Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -1269,16 +1269,16 @@ #if defined(_M_IX86) PKTSS Tss; PKGDTENTRY TssEntry; - KDESCRIPTOR IdtDescriptor = { 0, 0, 0 }; - - Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); + KDESCRIPTOR IdtDescriptor; + + __sidt(&IdtDescriptor.Limit); RtlCopyMemory(KiHackIdt, (PVOID)IdtDescriptor.Base, IdtDescriptor.Limit + 1); IdtDescriptor.Base = (ULONG)&KiHackIdt; IdtDescriptor.Limit = sizeof(KiHackIdt) - 1; /* Load the GDT and IDT */ - Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); - Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); + Ke386SetGlobalDescriptorTable(&KiGdtDescriptor.Limit); + __lidt(&IdtDescriptor.Limit); /* Initialize the boot TSS */ Tss = &KiBootTss; Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -90,24 +90,25 @@ CPUID(OUT ULONG CpuInfo[4], IN ULONG InfoType) { - Ki386Cpuid(InfoType, &CpuInfo[0], &CpuInfo[1], &CpuInfo[2], &CpuInfo[3]); -} - -VOID + /* Perform the CPUID Operation */ + __cpuid((int*)CpuInfo, InfoType); +} + +VOID +NTAPI WRMSR(IN ULONG Register, IN LONGLONG Value) { - LARGE_INTEGER LargeVal; - LargeVal.QuadPart = Value; - Ke386Wrmsr(Register, LargeVal.HighPart, LargeVal.LowPart); + /* Write to the MSR */ + __writemsr(Register, Value); } LONGLONG +NTAPI RDMSR(IN ULONG Register) { - LARGE_INTEGER LargeVal = {{0, 0}}; - Ke386Rdmsr(Register, LargeVal.HighPart, LargeVal.LowPart); - return LargeVal.QuadPart; + /* Read from the MSR */ + return __readmsr(Register); } /* FUNCTIONS *****************************************************************/ @@ -116,7 +117,7 @@ NTAPI KiSetProcessorType(VOID) { - ULONG EFlags = 0, NewEFlags; + ULONG EFlags, NewEFlags; ULONG Reg[4]; ULONG Stepping, Type; @@ -124,19 +125,19 @@ KeGetCurrentPrcb()->CpuID = 0; /* Save EFlags */ - Ke386SaveFlags(EFlags); + EFlags = __readeflags(); /* XOR out the ID bit and update EFlags */ NewEFlags = EFlags ^ EFLAGS_ID; - Ke386RestoreFlags(NewEFlags); + __writeeflags(NewEFlags); /* Get them back and see if they were modified */ - Ke386SaveFlags(NewEFlags); + NewEFlags = __readeflags(); if (NewEFlags != EFlags) { /* The modification worked, so CPUID exists. Set the ID Bit again. */ EFlags |= EFLAGS_ID; - Ke386RestoreFlags(EFlags); + __writeeflags(EFlags); /* Peform CPUID 0 to see if CPUID 1 is supported */ CPUID(Reg, 0); @@ -175,7 +176,7 @@ } /* Restore EFLAGS */ - Ke386RestoreFlags(EFlags); + __writeeflags(EFlags); } ULONG @@ -720,18 +721,18 @@ // // Restore the DR registers // - Ke386SetDr0(ProcessorState->SpecialRegisters.KernelDr0); - Ke386SetDr1(ProcessorState->SpecialRegisters.KernelDr1); - Ke386SetDr2(ProcessorState->SpecialRegisters.KernelDr2); - Ke386SetDr3(ProcessorState->SpecialRegisters.KernelDr3); - Ke386SetDr6(ProcessorState->SpecialRegisters.KernelDr6); - Ke386SetDr7(ProcessorState->SpecialRegisters.KernelDr7); + __writedr(0, ProcessorState->SpecialRegisters.KernelDr0); + __writedr(1, ProcessorState->SpecialRegisters.KernelDr1); + __writedr(2, ProcessorState->SpecialRegisters.KernelDr2); + __writedr(3, ProcessorState->SpecialRegisters.KernelDr3); + __writedr(6, ProcessorState->SpecialRegisters.KernelDr6); + __writedr(7, ProcessorState->SpecialRegisters.KernelDr7); // // Restore GDT, IDT, LDT and TSS // - Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&ProcessorState->SpecialRegisters.Gdtr.Limit); - Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&ProcessorState->SpecialRegisters.Idtr.Limit); + Ke386SetGlobalDescriptorTable(&ProcessorState->SpecialRegisters.Gdtr.Limit); + __lidt(&ProcessorState->SpecialRegisters.Idtr.Limit); Ke386SetTr(ProcessorState->SpecialRegisters.Tr); Ke386SetLocalDescriptorTable(ProcessorState->SpecialRegisters.Ldtr); } @@ -748,19 +749,19 @@ __readcr4() : 0; /* Save the DR registers */ - ProcessorState->SpecialRegisters.KernelDr0 = Ke386GetDr0(); - ProcessorState->SpecialRegisters.KernelDr1 = Ke386GetDr1(); - ProcessorState->SpecialRegisters.KernelDr2 = Ke386GetDr2(); - ProcessorState->SpecialRegisters.KernelDr3 = Ke386GetDr3(); - ProcessorState->SpecialRegisters.KernelDr6 = Ke386GetDr6(); - ProcessorState->SpecialRegisters.KernelDr7 = Ke386GetDr7(); - Ke386SetDr7(0); + ProcessorState->SpecialRegisters.KernelDr0 = __readdr(0); + ProcessorState->SpecialRegisters.KernelDr1 = __readdr(1); + ProcessorState->SpecialRegisters.KernelDr2 = __readdr(2); + ProcessorState->SpecialRegisters.KernelDr3 = __readdr(3); + ProcessorState->SpecialRegisters.KernelDr6 = __readdr(6); + ProcessorState->SpecialRegisters.KernelDr7 = __readdr(7); + __writedr(7, 0); /* Save GDT, IDT, LDT and TSS */ - Ke386GetGlobalDescriptorTable(*(PKDESCRIPTOR)&ProcessorState->SpecialRegisters.Gdtr.Limit); - Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&ProcessorState->SpecialRegisters.Idtr.Limit); - Ke386GetTr(ProcessorState->SpecialRegisters.Tr); - Ke386GetLocalDescriptorTable(ProcessorState->SpecialRegisters.Ldtr); + Ke386GetGlobalDescriptorTable(&ProcessorState->SpecialRegisters.Gdtr.Limit); + __sidt(&ProcessorState->SpecialRegisters.Idtr.Limit); + Ke386GetTr(&ProcessorState->SpecialRegisters.Tr); + Ke386GetLocalDescriptorTable(&ProcessorState->SpecialRegisters.Ldtr); } VOID @@ -776,11 +777,11 @@ KiLoadFastSyscallMachineSpecificRegisters(IN ULONG_PTR Context) { /* Set CS and ESP */ - Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); - Ke386Wrmsr(0x175, (ULONG)KeGetCurrentPrcb()->DpcStack, 0); + WRMSR(0x174, KGDT_R0_CODE); + WRMSR(0x175, (ULONG_PTR)KeGetCurrentPrcb()->DpcStack); /* Set LSTAR */ - Ke386Wrmsr(0x176, (ULONG)KiFastCallEntry, 0); + WRMSR(0x176, (ULONG_PTR)KiFastCallEntry); return 0; } @@ -842,7 +843,7 @@ NTAPI KiI386PentiumLockErrataFixup(VOID) { - KDESCRIPTOR IdtDescriptor = { 0, 0, 0 }; + KDESCRIPTOR IdtDescriptor; PKIDTENTRY NewIdt, NewIdt2; /* Allocate memory for a new IDT */ @@ -855,14 +856,14 @@ _disable(); /* Get the current IDT and copy it */ - Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); + __sidt(&IdtDescriptor.Limit); RtlCopyMemory(NewIdt2, (PVOID)IdtDescriptor.Base, IdtDescriptor.Limit + 1); IdtDescriptor.Base = (ULONG)NewIdt2; /* Set the new IDT */ - Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); + __lidt(&IdtDescriptor.Limit); ((PKIPCR)KeGetPcr())->IDT = NewIdt2; /* Restore interrupts */ @@ -877,10 +878,10 @@ KeFreezeExecution(IN PKTRAP_FRAME TrapFrame, IN PKEXCEPTION_FRAME ExceptionFrame) { - ULONG Flags = 0; + ULONG Flags; /* Disable interrupts and get previous state */ - Ke386SaveFlags(Flags); + Flags = __readeflags(); //Flags = __getcallerseflags(); _disable(); Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -27,11 +27,11 @@ NTAPI KeDisableInterrupts(VOID) { - ULONG Flags = 0; + ULONG Flags; BOOLEAN Return; /* Get EFLAGS and check if the interrupt bit is set */ - Ke386SaveFlags(Flags); + Flags = __readeflags(); Return = (Flags & EFLAGS_INTERRUPT_MASK) ? TRUE: FALSE; /* Disable interrupts */ Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Mon Sep 21 17:20:18 2009 @@ -607,20 +607,20 @@ IN PKIPCR *Pcr, IN PKTSS *Tss) { - KDESCRIPTOR GdtDescriptor = { 0, 0, 0 }, IdtDescriptor = { 0, 0, 0 }; + KDESCRIPTOR GdtDescriptor, IdtDescriptor; KGDTENTRY TssSelector, PcrSelector; - USHORT Tr = 0, Fs; + USHORT Tr, Fs; /* Get GDT and IDT descriptors */ - Ke386GetGlobalDescriptorTable(*(PKDESCRIPTOR)&GdtDescriptor.Limit); - Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); + Ke386GetGlobalDescriptorTable(&GdtDescriptor.Limit); + __sidt(&IdtDescriptor.Limit); /* Save IDT and GDT */ *Gdt = (PKGDTENTRY)GdtDescriptor.Base; *Idt = (PKIDTENTRY)IdtDescriptor.Base; /* Get TSS and FS Selectors */ - Ke386GetTr(Tr); + Ke386GetTr(&Tr); if (Tr != KGDT_TSS) Tr = KGDT_TSS; // FIXME: HACKHACK Fs = Ke386GetFs();

15 years, 3 months

[mjmartin] 43102: LogfWriteData: Add missing LeaveCriticalSection before returning from function. Found by Amine Khaldi

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon Sep 21 14:49:25 2009 New Revision: 43102 URL: http://svn.reactos.org/svn/reactos?rev=43102&view=rev Log: LogfWriteData: Add missing LeaveCriticalSection before returning from function. Found by Amine Khaldi Modified: trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Mon Sep 21 14:49:25 2009 @@ -704,6 +704,7 @@ if (!GetFileSizeEx(LogFile->hFile, &logFileSize)) { + LeaveCriticalSection(&LogFile->cs); return FALSE; } @@ -751,6 +752,7 @@ if (RecBuf->Reserved != LOGFILE_SIGNATURE) { DPRINT1("LogFile corrupt!\n"); + LeaveCriticalSection(&LogFile->cs); return FALSE; }

15 years, 3 months

[jimtabor] 43101: - Working with Michael Martin to fix the LoadMenu callback bug. MenuName is a variable string buffer and not a pointer. The minimum size is always four bytes. Initialization of the structure, zero out the memory, allowing Intersource check to function as it should. To make it Intersource, use the first word character in the buffer.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Sep 21 03:22:32 2009 New Revision: 43101 URL: http://svn.reactos.org/svn/reactos?rev=43101&view=rev Log: - Working with Michael Martin to fix the LoadMenu callback bug. MenuName is a variable string buffer and not a pointer. The minimum size is always four bytes. Initialization of the structure, zero out the memory, allowing Intersource check to function as it should. To make it Intersource, use the first word character in the buffer. Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.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] Mon Sep 21 03:22:32 2009 @@ -3967,7 +3967,10 @@ Common = (PLOADMENU_CALLBACK_ARGUMENTS) Arguments; - Result = (LRESULT)LoadMenuW(Common->hModule, IS_INTRESOURCE(Common->MenuName) ? Common->MenuName : (LPCWSTR)&Common->MenuName); + Result = (LRESULT)LoadMenuW( Common->hModule, + IS_INTRESOURCE(Common->MenuName) ? + MAKEINTRESOURCE(Common->MenuName[0]) : + (LPCWSTR)&Common->MenuName); return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Sep 21 03:22:32 2009 @@ -662,11 +662,13 @@ Argument = IntCbAllocateMemory(ArgumentLength); if (NULL == Argument) { - DPRINT1("EventProc callback failed: out of memory\n"); + DPRINT1("LoadMenu callback failed: out of memory\n"); return 0; } Common = (PLOADMENU_CALLBACK_ARGUMENTS) Argument; + // Help Intersource check and MenuName is now 4 bytes + so zero it. + RtlZeroMemory(Common, ArgumentLength); Common->hModule = hModule; if (pMenuName->Length)

15 years, 3 months

[cgutman] 43100: - Stub and export GetAddrInfoW

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Sep 21 00:20:16 2009 New Revision: 43100 URL: http://svn.reactos.org/svn/reactos?rev=43100&view=rev Log: - Stub and export GetAddrInfoW Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c trunk/reactos/dll/win32/ws2_32/ws2_32.spec Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Mon Sep 21 00:20:16 2009 @@ -10,7 +10,6 @@ #include <ws2_32.h> #include <catalog.h> #include <handle.h> - /* * @implemented @@ -936,4 +935,21 @@ return FALSE; } +/* + * @unimplemented + */ +INT +EXPORT +GetAddrInfoW(IN PCWSTR pszNodeName, + IN PCWSTR pszServiceName, + IN const ADDRINFOW *ptHints, + OUT PADDRINFOW *pptResult) +{ + UNIMPLEMENTED + + WSASetLastError(EAI_FAIL); + return EAI_FAIL; +} + + /* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.sp… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] Mon Sep 21 00:20:16 2009 @@ -50,7 +50,7 @@ 500 stub WEP -# @ stdcall GetAddrInfoW(wstr wstr ptr ptr) +@ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall WSApSetPostRoutine(ptr) @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) @ stdcall WSAAccept(long ptr ptr ptr long)

15 years, 3 months

[cgutman] 43099: - Simplify and fix a few bugs in datagram reassembly - Implement reassembly timeout

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Sep 20 23:07:45 2009 New Revision: 43099 URL: http://svn.reactos.org/svn/reactos?rev=43099&view=rev Log: - Simplify and fix a few bugs in datagram reassembly - Implement reassembly timeout Modified: trunk/reactos/drivers/network/tcpip/include/receive.h trunk/reactos/lib/drivers/ip/network/receive.c Modified: trunk/reactos/drivers/network/tcpip/include/receive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] Sun Sep 20 23:07:45 2009 @@ -9,6 +9,8 @@ #include <ip.h> +/* Number of timeout ticks before destroying the IPDR */ +#define MAX_TIMEOUT_COUNT 10 /* IP datagram fragment descriptor. Used to store IP datagram fragments */ typedef struct IP_FRAGMENT { @@ -38,6 +40,7 @@ UINT HeaderSize; /* Length of IP header */ LIST_ENTRY FragmentListHead; /* IP fragment list */ LIST_ENTRY HoleListHead; /* IP datagram hole list */ + UINT TimeoutCount; /* Timeout counter */ } IPDATAGRAM_REASSEMBLY, *PIPDATAGRAM_REASSEMBLY; Modified: trunk/reactos/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rec… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] Sun Sep 20 23:07:45 2009 @@ -17,12 +17,6 @@ NPAGED_LOOKASIDE_LIST IPDRList; NPAGED_LOOKASIDE_LIST IPFragmentList; NPAGED_LOOKASIDE_LIST IPHoleList; - -VOID ReflectPacketComplete( - PVOID Context, - PNDIS_PACKET Packet, - NDIS_STATUS Status ) { -} PIPDATAGRAM_HOLE CreateHoleDescriptor( ULONG First, @@ -299,8 +293,6 @@ TI_DbgPrint(DEBUG_IP, ("Continueing assembly.\n")); /* We have a reassembly structure */ TcpipAcquireSpinLock(&IPDR->Lock, &OldIrql); - CurrentEntry = IPDR->HoleListHead.Flink; - Hole = CONTAINING_RECORD(CurrentEntry, IPDATAGRAM_HOLE, ListEntry); } else { TI_DbgPrint(DEBUG_IP, ("Starting new assembly.\n")); @@ -323,10 +315,10 @@ AddrInitIPv4(&IPDR->DstAddr, IPv4Header->DstAddr); IPDR->Id = IPv4Header->Id; IPDR->Protocol = IPv4Header->Protocol; + IPDR->TimeoutCount = 0; InitializeListHead(&IPDR->FragmentListHead); InitializeListHead(&IPDR->HoleListHead); InsertTailList(&IPDR->HoleListHead, &Hole->ListEntry); - CurrentEntry = IPDR->HoleListHead.Flink; TcpipInitializeSpinLock(&IPDR->Lock); @@ -343,10 +335,12 @@ FragLast = FragFirst + WN2H(IPv4Header->TotalLength); MoreFragments = (WN2H(IPv4Header->FlagsFragOfs) & IPv4_MF_MASK) > 0; + CurrentEntry = IPDR->HoleListHead.Flink; for (;;) { if (CurrentEntry == &IPDR->HoleListHead) - /* No more entries */ - break; + break; + + Hole = CONTAINING_RECORD(CurrentEntry, IPDATAGRAM_HOLE, ListEntry); TI_DbgPrint(DEBUG_IP, ("Comparing Fragment (%d,%d) to Hole (%d,%d).\n", FragFirst, FragLast, Hole->First, Hole->Last)); @@ -357,8 +351,6 @@ descriptor in the list */ CurrentEntry = CurrentEntry->Flink; - if (CurrentEntry != &IPDR->HoleListHead) - Hole = CONTAINING_RECORD(CurrentEntry, IPDATAGRAM_HOLE, ListEntry); continue; } @@ -366,7 +358,7 @@ RemoveEntryList(CurrentEntry); if (FragFirst > Hole->First) { - NewHole = CreateHoleDescriptor(Hole->First, FragLast - 1); + NewHole = CreateHoleDescriptor(Hole->First, FragFirst - 1); if (!NewHole) { /* We don't have the resources to process this packet, discard it */ exFreeToNPagedLookasideList(&IPHoleList, Hole); @@ -378,14 +370,20 @@ InsertTailList(&IPDR->HoleListHead, &NewHole->ListEntry); } - if ((FragLast < Hole->Last) && (MoreFragments)) { - /* We can reuse the descriptor for the new hole */ - Hole->First = FragLast + 1; + if ((FragLast < Hole->Last) && MoreFragments) { + NewHole = CreateHoleDescriptor(FragLast + 1, Hole->Last); + if (!NewHole) { + /* We don't have the resources to process this packet, discard it */ + exFreeToNPagedLookasideList(&IPHoleList, Hole); + Cleanup(&IPDR->Lock, OldIrql, IPDR); + return; + } /* Put the new hole descriptor in the list */ - InsertTailList(&IPDR->HoleListHead, &Hole->ListEntry); - } else - exFreeToNPagedLookasideList(&IPHoleList, Hole); + InsertTailList(&IPDR->HoleListHead, &NewHole->ListEntry); + } + + exFreeToNPagedLookasideList(&IPHoleList, Hole); /* If this is the first fragment, save the IP header */ if (FragFirst == 0) { @@ -424,7 +422,7 @@ /* Copy datagram data into fragment buffer */ CopyPacketToBuffer(Fragment->Data, IPPacket->NdisPacket, - IPPacket->Position, + IPPacket->HeaderSize, Fragment->Size); Fragment->Offset = FragFirst; @@ -434,7 +432,7 @@ /* Put the fragment in the list */ InsertTailList(&IPDR->FragmentListHead, &Fragment->ListEntry); - break; + break; } TI_DbgPrint(DEBUG_IP, ("Done searching for hole descriptor.\n")); @@ -512,6 +510,36 @@ * to hold IP fragments that have taken too long to reassemble */ { + KIRQL OldIrql; + PLIST_ENTRY CurrentEntry, NextEntry; + PIPDATAGRAM_REASSEMBLY CurrentIPDR; + + TcpipAcquireSpinLock(&ReassemblyListLock, &OldIrql); + + CurrentEntry = ReassemblyListHead.Flink; + while (CurrentEntry != &ReassemblyListHead) + { + NextEntry = CurrentEntry->Flink; + CurrentIPDR = CONTAINING_RECORD(CurrentEntry, IPDATAGRAM_REASSEMBLY, ListEntry); + + TcpipAcquireSpinLockAtDpcLevel(&CurrentIPDR->Lock); + + if (++CurrentIPDR->TimeoutCount == MAX_TIMEOUT_COUNT) + { + TcpipReleaseSpinLockFromDpcLevel(&CurrentIPDR->Lock); + RemoveEntryList(CurrentEntry); + FreeIPDR(CurrentIPDR); + } + else + { + ASSERT(CurrentIPDR->TimeoutCount < MAX_TIMEOUT_COUNT); + TcpipReleaseSpinLockFromDpcLevel(&CurrentIPDR->Lock); + } + + CurrentEntry = NextEntry; + } + + TcpipReleaseSpinLock(&ReassemblyListLock, OldIrql); } VOID IPv4Receive(PIP_INTERFACE IF, PIP_PACKET IPPacket)

15 years, 3 months

[dgorbachev] 43098: Update / add Japanese translations. Tomoya Kitagawa, bug #4852.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Sep 20 21:35:23 2009 New Revision: 43098 URL: http://svn.reactos.org/svn/reactos?rev=43098&view=rev Log: Update / add Japanese translations. Tomoya Kitagawa, bug #4852. Added: trunk/reactos/base/applications/kbswitch/lang/ja-JP.rc (with props) trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc (with props) trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc (with props) trunk/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/msgina/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/netid/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/newdev/lang/ja-JP.rc (with props) Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/netid/rsrc.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Added: trunk/reactos/base/applications/kbswitch/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,11 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Ýè(&P)...", ID_PREFERENCES + MENUITEM SEPARATOR + MENUITEM "I¹(&E)", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -5,6 +5,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,82 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "t@C(&F)" + BEGIN + MENUITEM "I¹(&X)", IDC_EXIT + END + POPUP "ì" + BEGIN + MENUITEM "óü", IDC_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "vpeB", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "wv", IDC_PROGHELP, GRAYED + END + POPUP "\\¦" + BEGIN + MENUITEM "foCX (íÞÊ)", IDC_DEVBYTYPE, CHECKED + MENUITEM "foCX (Ú±Ê)", IDC_STATIC, GRAYED + MENUITEM "\\[X (íÞÊ)", IDC_STATIC, GRAYED + MENUITEM "\\[X (Ú±Ê)", IDC_STATIC, GRAYED + END + POPUP "wv" + BEGIN + MENUITEM "wv", IDC_PROGHELP + MENUITEM "o[Wîñ", IDC_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "vpeB", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "wv", IDC_PROGHELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "foCX }l[WÉÂ¢Ä" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "foCX }l[W v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 + PUSHBUTTON "Â¶é", IDOK, 75, 162, 44, 15 + ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "±ÌvOÍt[\\tgEFAÅ·B È½Í±êðAt[\\tgEFAàcÉæÁÄs³ê½ GNUêÊöOpø_ñ(o[W2©Aó]ÉæÁÄÍ»êÈ~Ìo[WÌ¤¿Çê©)ÌèßéðÌºÅÄÐzÜ½ÍüÏ·é±ÆªÅ«Ü·B\r\n\r\n±ÌvOÍLpÅ é±ÆðèÁÄzz³êÜ·ªA*SÌ³ÛØ* Å·B*¤ÆÂ\\«ÌÛØ*â*ÁèÌÚIÖÌK«*ÍA¾OÉ¦³ê½àÌàÜßS¶ÝµÜ¹ñBÚµÍGNUêÊöOpø_ñð²¾³¢B\r\n\r\n È½Í±ÌvOÆ¤ÉAGNUêÊöOpø_ñÌ¡»ðêó¯æÁ½Í¸Å·Bàµó¯æÁÄ¢È¯êÎAt[\\tgEFAàcÜÅ¿µÄ¾³¢(¶æÍ the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)B" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "vpeB" + IDS_TOOLTIP_REFRESH "XV" + IDS_TOOLTIP_HELP "wv" + IDS_TOOLTIP_EXIT "I¹" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS foCX }l[W" + IDS_HINT_BLANK " " + IDS_HINT_EXIT " ±ÌvOðI¹µÜ·B" + IDS_HINT_REFRESH " T[rXÌXgðXVµÜ·B" + IDS_HINT_PROP " »ÝIð³êÄ¢éV[gÌvpeBðJ«Ü·B" + IDS_HINT_HELP " wv EBhEð\\¦µÜ·B" + IDS_HINT_ABOUT " ReactOS foCX }l[WÉÂ¢Ä\\¦µÜ·B" + + IDS_HINT_SYS_RESTORE " ±ÌEBhEðÊíÌå«³É³µÜ·B" + IDS_HINT_SYS_MOVE " ±ÌEBhEðÚ®µÜ·B" + IDS_HINT_SYS_SIZE " ±ÌEBhEÌå«³ðÏXµÜ·B" + IDS_HINT_SYS_MINIMIZE " ±ÌEBhEðACRÉÜè½½ÝÜ·B" + IDS_HINT_SYS_MAXIMIZE " ±ÌEBhEðæÊ¢ÁÏ¢ÉJ«Ü·B" + IDS_HINT_SYS_CLOSE " ±ÌEBhEðÂ¶Ü·B" +END Propchange: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -20,6 +20,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -22,7 +22,7 @@ BEGIN MENUITEM "&Refresh", IDM_REFRESH END - MENUITEM "&Options", ID_OPTIONS + MENUITEM "&Options", ID_OPTIONS POPUP "&Help" BEGIN MENUITEM "H&elp", IDM_HELP Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,104 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/ja-JP.rc + * PURPOSE: Japanese Language File for ReactOS Event Viewer + * TRANSLATORS: Tomoya Kitagawa + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDC_EVENTVWR MENU +BEGIN + POPUP "O(&L)" + BEGIN + MENUITEM "AvP[V(&A)", ID_LOG_APPLICATION + MENUITEM "ZLeB(&S)", ID_LOG_SECURITY + MENUITEM "VXe(&S)", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "I¹(&X)", IDM_EXIT + END + POPUP "\\¦(&V)" + BEGIN + MENUITEM "XV(&R)", IDM_REFRESH + END + MENUITEM "IvV(&O)", ID_OPTIONS + POPUP "wv(&H)" + BEGIN + MENUITEM "wv(&E)", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "o[Wîñ(&A)...", IDM_ABOUT + END +END + +IDC_EVENTVWR ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "o[Wîñ" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "ReactOS Cxg r[A Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP +END + +IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER +CAPTION "¨Ò¿¾³¢.." +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + CTEXT "Cxg OðÇÝñÅ¢Ü·B ¨Ò¿¾³¢ ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX +END + +IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "CxgÌÚ×îñ" +FONT 9, "MS UI Gothic", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Â¶é(&C)",IDOK,12,258,50,14 + PUSHBUTTON "OÖ(&P)",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "Ö(&N)",IDNEXT,144,258,50,14 + PUSHBUTTON "wv(&H)",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "à¾(&D):",IDC_STATIC,15,70,39,8 + LTEXT "út:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT ":",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "[U[(&U):",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "Rs[^(&C):",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "CxgID:",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "\\[X:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "íÞ:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "ªÞ:",IDC_STATIC,133,55,36,8 + LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "f[^(&A)",IDC_STATIC,14,194,20,8 + CONTROL "oCg(&B)",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "[h(&W)",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Cxg r[A" + IDC_EVENTSTRINGIDNOTFOUND "Cxg ID (%lu) (\\[X %s à) ÉÖ·éà¾ª©Â©èÜ¹ñÅµ½B [g Rs[^©çbZ[Wð\\¦·é½ßÉKvÈWXgîñÜ½ÍbZ[W DLL t@Cª[J Rs[^ÉÈ¢Â\\«ª èÜ·B" + IDC_EVENTLOG_ERROR_TYPE "G[" + IDC_EVENTLOG_WARNING_TYPE "x" + IDC_EVENTLOG_INFORMATION_TYPE "îñ" + IDC_EVENTLOG_AUDIT_SUCCESS "¬÷ÌÄ¸" + IDC_EVENTLOG_AUDIT_FAILURE "¸sÌÄ¸" + IDC_EVENTLOG_SUCCESS "¬÷" + IDC_EVENTLOG_UNKNOWN_TYPE "s¾ÈCxg" +END Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -16,6 +16,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,282 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "t@C(&F)" + BEGIN + MENUITEM "GNX|[g...", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "I¹(&X)", ID_EXIT + END + POPUP "ì" + BEGIN + MENUITEM "ÊÌRs[^ÖÚ±...", ID_CONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Jn", ID_START, GRAYED + MENUITEM "â~", ID_STOP, GRAYED + MENUITEM "êâ~", ID_PAUSE, GRAYED + MENUITEM "ÄJ", ID_RESUME, GRAYED + MENUITEM "ÄN®", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "XV", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "ÒW...", ID_EDIT, GRAYED + MENUITEM "ì¬...", ID_CREATE, GRAYED + MENUITEM "í...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "vpeB...", ID_PROP, GRAYED + END + POPUP "\\¦" + BEGIN + MENUITEM "å«¢ACR", ID_VIEW_LARGE + MENUITEM "¬³¢ACR", ID_VIEW_SMALL + MENUITEM "ê", ID_VIEW_LIST + MENUITEM "Ú×", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "JX^}CY...", ID_VIEW_CUST, GRAYED + END + POPUP "wv" + BEGIN + MENUITEM "wv", ID_HELP + MENUITEM "o[Wîñ", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Jn", ID_START, GRAYED + MENUITEM "â~", ID_STOP, GRAYED + MENUITEM "êâ~", ID_PAUSE, GRAYED + MENUITEM "ÄJ", ID_RESUME, GRAYED + MENUITEM "ÄN®", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "XV", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "ÒW...", ID_EDIT, GRAYED + MENUITEM "í...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "vpeB...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "wv...", ID_HELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "T[rX }l[WÉÂ¢Ä" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "T[rX }l[W v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 30 + PUSHBUTTON "Â¶é", IDOK, 75, 162, 44, 15 + ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 +CAPTION "SÊ" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Jn", IDC_START, 6, 155, 54, 15, WS_DISABLED + PUSHBUTTON "â~", IDC_STOP, 68, 155, 54, 15, WS_DISABLED + PUSHBUTTON "êâ~", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "ÄJ", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED + LTEXT "T[rX¼:", IDC_STATIC, 4, 11, 53, 11 + LTEXT "\\¦¼:", IDC_STATIC, 4, 29, 53, 11 + LTEXT "à¾:", IDC_STATIC, 4, 51, 53, 11 + LTEXT "Àst@CÌpX:", IDC_STATIC, 6, 73, 82, 9 + LTEXT "X^[gAbvÌíÞ:", IDC_STATIC, 6, 108, 53, 11 + LTEXT "T[rXÌóÔ:", IDC_STATIC, 4, 138, 53, 11 + LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE + LTEXT "±±ÅT[rXðJn·éÆ«ÉKp·éJnp[^ðwèÅ«Ü·B",IDC_STATIC, 6,177,240,15 + LTEXT "Jnp[^:", IDC_STATIC, 6, 200, 58, 11 + EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ÒW", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED +END + +IDD_DLG_DEPEND DIALOGEX 6,6,253,225 +CAPTION "Ë¶ÖW" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 + CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 + LTEXT "¼ÌT[rXAVXe hCoAÇÝÝO[vÈÇÉË¶µÄ¢éT[rXª èÜ·BVXe R|[lgªâ~·é©AÜ½Í³íÉÀs³êÈ¢êAË¶·éT[rXªe¿³êÄ¢éêª èÜ·B", IDC_STATIC,8, 7, 238, 26 + LTEXT "±ÌT[rXªË¶·éR|[lg", IDC_STATIC, 8, 57, 236, 9 + LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 +END + +IDD_DLG_CREATE DIALOGEX 6,6,225,209 +CAPTION "T[rXÌì¬" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE + EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_PATH, 10, 62, 210, 13, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE + LTEXT "*T[rX¼ :", IDC_STATIC, 12, 12, 54, 9 + LTEXT "*\\¦¼ :", IDC_STATIC, 12, 33, 54, 9 + LTEXT "*Àst@CÌpX :", IDC_STATIC, 10, 51, 68, 9 + LTEXT "à¾ :", IDC_STATIC, 12, 86, 44, 9 + PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 + PUSHBUTTON "LZ", IDCANCEL, 176, 192, 46, 13 + LTEXT "ÇÁIvV (Ú×ÍwvðNbN)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "wv", ID_CREATE_HELP, 10, 192, 44, 13 +END + +IDD_DLG_DELETE DIALOGEX 6,6,185,148 +CAPTION "T[rXÌí" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "ÌT[rXðíµÜ·©? ±ÌìÍæèÁ¹Ü¹ñ!", IDC_STATIC, 50, 6, 125, 25 + LTEXT "T[rX¼:",IDC_STATIC, 6, 40, 80, 9 + LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 + EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + PUSHBUTTON "Í¢", IDOK, 26, 129, 54, 13 + DEFPUSHBUTTON "¢¢¦", IDCANCEL, 102, 129, 54, 13 +END + +IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 +CAPTION "¼ÌT[rXÌâ~" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 + LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL + LTEXT "±êçÌT[rXðâ~µÜ·©?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Í¢", IDOK, 60, 129, 54, 14 + PUSHBUTTON "¢¢¦", IDCANCEL, 120, 129, 54, 14 +END + +IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 +CAPTION "IvV" +FONT 9, "MS UI Gothic",0,0 +STYLE 0x10CF0000 +BEGIN + LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 + PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13 +END + +IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 +CAPTION "T[rX Rg[" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME +EXSTYLE WS_EX_TOOLWINDOW +BEGIN + CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 + LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 + LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 + PUSHBUTTON "Â¶é(&C)", IDOK, 100, 70, 54, 13 +END + + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FIRSTCOLUMN "¼O" + IDS_SECONDCOLUMN "à¾" + IDS_THIRDCOLUMN "óÔ" + IDS_FOURTHCOLUMN "X^[gAbvÌíÞ" + IDS_FITHCOLUMN "OI" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STARTED "Jn" + IDS_SERVICES_STOPPED "â~" + IDS_SERVICES_AUTO "©®" + IDS_SERVICES_MAN "è®" + IDS_SERVICES_DIS "³ø" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NUM_SERVICES "T[rXÌ: %d" + IDS_STOP_DEPENDS "%s ðâ~·éêA±êçÌT[rXàâ~µÜ·" + IDS_NO_DEPENDS "<Ë¶ÖWÈµ>" + IDS_LICENSE "±ÌvOÍt[\\tgEFAÅ·B È½Í±êðAt[\\tgEFAàcÉæÁÄs³ê½ GNUêÊöOpø_ñ(o[W2©Aó]ÉæÁÄÍ»êÈ~Ìo[WÌ¤¿Çê©)ÌèßéðÌºÅÄÐzÜ½ÍüÏ·é±ÆªÅ«Ü·B\r\n\r\n±ÌvOÍLpÅ é±ÆðèÁÄzz³êÜ·ªA*SÌ³ÛØ* Å·B*¤ÆÂ\\«ÌÛØ*â*ÁèÌÚIÖÌK«*ÍA¾OÉ¦³ê½àÌàÜßS¶ÝµÜ¹ñBÚµÍGNUêÊöOpø_ñð²¾³¢B\r\n\r\n È½Í±ÌvOÆ¤ÉAGNUêÊöOpø_ñÌ¡»ðêó¯æÁ½Í¸Å·Bàµó¯æÁÄ¢È¯êÎAt[\\tgEFAàcÜÅ¿µÄ¾³¢(¶æÍ the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)B" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "vpeB" + IDS_TOOLTIP_REFRESH "XV" + IDS_TOOLTIP_EXPORT "êðGNX|[g" + IDS_TOOLTIP_CREATE "Vµ¢T[rXÌì¬" + IDS_TOOLTIP_DELETE "ù¶ÌT[rXÌí" + IDS_TOOLTIP_START "T[rXÌJn" + IDS_TOOLTIP_STOP "T[rXÌâ~" + IDS_TOOLTIP_PAUSE "T[rXÌêâ~" + IDS_TOOLTIP_RESTART "T[rXÌÄN®" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_PROGRESS_INFO_START "ReactOS ÍÌT[rXðJnµæ¤ÆµÄ¢Ü·" + IDS_PROGRESS_INFO_STOP "ReactOS ÍÌT[rXðâ~µæ¤ÆµÄ¢Ü·" + IDS_PROGRESS_INFO_PAUSE "ReactOS ÍÌT[rXðêâ~µæ¤ÆµÄ¢Ü·" + IDS_PROGRESS_INFO_RESUME "ReactOS ÍÌT[rXðÄJµæ¤ÆµÄ¢Ü·" + IDS_CREATE_SUCCESS "T[rXÌì¬É¬÷µÜµ½" + IDS_DELETE_SUCCESS "T[rXÌíÉ¬÷µÜµ½" + IDS_CREATE_REQ "AX^XNÌÂ¢Ä\n¢éÚÍK{Å·" + IDS_DELETE_STOP "T[rXðí·éOÉè®Åâ~µÄ¾³¢!" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_OPTIONS "ì¬IvV:\r\nÓ: IvV¼ÍCR[LðÜñÅ¢Ü·B\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (ùèl = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (ùèl = demand) \r\n error= <normal|severe|critical|ignore>\r\n (ùèl = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (ùèl = LocalSystem)\r\n password= <password>\r\n" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_EXPORT " »ÝÌXgðt@CÉGNX|[gµÜ·B" + IDS_HINT_EXIT " ±ÌvOðI¹µÜ·B" + + IDS_HINT_CONNECT " ¼ÌRs[^ðÇµÜ·B" + IDS_HINT_START " Iðµ½T[rXðJnµÜ·B" + IDS_HINT_STOP " Iðµ½T[rXðâ~µÜ·B" + IDS_HINT_PAUSE " Iðµ½T[rXðêâ~µÜ·B" + IDS_HINT_RESUME " Iðµ½T[rXðÄJµÜ·B" + IDS_HINT_RESTART " Iðµ½T[rXðâ~µAJnµÜ·B" + IDS_HINT_REFRESH " T[rXÌêðXVµÜ·B" + IDS_HINT_EDIT " Iðµ½T[rXÌvpeBðÒWµÜ·B" + IDS_HINT_CREATE " Vµ¢T[rXðì¬µÜ·B" + IDS_HINT_DELETE " Iðµ½T[rXðíµÜ·B" + IDS_HINT_PROP " »ÝIð³êÄ¢éÚÌvpeB V[gðJ«Ü·B" + + IDS_HINT_LARGE " ACeðå«¢ACRÅ\\¦µÜ·B" + IDS_HINT_SMALL " ACeð¬³¢ACRÅ\\¦µÜ·B" + IDS_HINT_LIST " ACeðêÅ\\¦µÜ·B" + IDS_HINT_DETAILS " eACeÌîñðEBhEÉ\\¦µÜ·B" + IDS_HINT_CUST " \\¦ðJX^}CYµÜ·B" + + IDS_HINT_HELP " wv EBhEð\\¦µÜ·B" + IDS_HINT_ABOUT " ReactOS T[rX }l[WÉÂ¢Ä\\¦µÜ·B" + + IDS_HINT_SYS_RESTORE " ±ÌEBhEðÊíÌå«³É³µÜ·B" + IDS_HINT_SYS_MOVE " ±ÌEBhEðÚ®µÜ·B" + IDS_HINT_SYS_SIZE " ±ÌEBhEÌå«³ðÏXµÜ·B" + IDS_HINT_SYS_MINIMIZE " ±ÌEBhEðACRÉÜè½½ÝÜ·B" + IDS_HINT_SYS_MAXIMIZE " ±ÌEBhEðæÊ¢ÁÏ¢ÉJ«Ü·B" + IDS_HINT_SYS_CLOSE " ±ÌEBhEðÂ¶Ü·B" +END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS T[rX }l[W" +END Propchange: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -28,6 +28,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -46,37 +46,37 @@ IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 250, 144 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Settings" -FONT 8, "MS Shell Dlg" +CAPTION "Ýè" +FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "General", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12 - AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12 + GROUPBOX "SÊ", -1, 4, 2, 240, 61 + AUTOCHECKBOX "EBhEÌêðÛ¶·é(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "N®ÉpÅ«évOÌXgðXV·é(&U)", IDC_UPDATE_AVLIST, 15, 29, 219, 12 + AUTOCHECKBOX "vOÌCXg[ÆíðL^·é(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 - GROUPBOX "Downloading", -1, 4, 65, 240, 51 - LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9 + GROUPBOX "_E[h", -1, 4, 65, 240, 51 + LTEXT "_E[h·étH_:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 - AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + PUSHBUTTON "Ið(&C)", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "CXg[ãÉvOÌCXg[ðí·é(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 + PUSHBUTTON "ftHg", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 181, 124, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 216, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Program installation" -FONT 8, "MS Shell Dlg" +CAPTION "vOÌCXg[" +FONT 9, "MS UI Gothic" BEGIN LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP - AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "fBXN©çCXg[ (CD â DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "_E[hµÄCXg[(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 150, 78, 60, 14 END IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 @@ -101,86 +101,86 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_INSTALL "CXg[" - IDS_TOOLTIP_UNINSTALL "ACXg[" - IDS_TOOLTIP_MODIFY "ÏX" - IDS_TOOLTIP_SETTINGS "Ýè" - IDS_TOOLTIP_REFRESH "XV" - IDS_TOOLTIP_EXIT "I¹" + IDS_TOOLTIP_INSTALL "CXg[" + IDS_TOOLTIP_UNINSTALL "ACXg[" + IDS_TOOLTIP_MODIFY "ÏX" + IDS_TOOLTIP_SETTINGS "Ýè" + IDS_TOOLTIP_REFRESH "XV" + IDS_TOOLTIP_EXIT "I¹" END STRINGTABLE DISCARDABLE BEGIN - IDS_APP_NAME "¼O" - IDS_APP_INST_VERSION "o[W" - IDS_APP_DESCRIPTION "Tv" + IDS_APP_NAME "¼O" + IDS_APP_INST_VERSION "o[W" + IDS_APP_DESCRIPTION "Tv" END STRINGTABLE DISCARDABLE BEGIN - IDS_INFO_VERSION "\no[W: " - IDS_INFO_DESCRIPTION "\nTv: " - IDS_INFO_PUBLISHER "\ns³: " - IDS_INFO_HELPLINK "\nwvÖÌN: " - IDS_INFO_HELPPHONE "\nwvÌdbÔ: " - IDS_INFO_README "\nReadmeÌÊu: " - IDS_INFO_REGOWNER "\no^³ê½LÒ: " - IDS_INFO_PRODUCTID "\nv_NgID: " - IDS_INFO_CONTACT "\nAæ: " - IDS_INFO_UPDATEINFO "\nAbvf[gîñ: " - IDS_INFO_INFOABOUT "\n±êÉÖ·éîñ: " - IDS_INFO_COMMENTS "\nRg: " - IDS_INFO_INSTLOCATION "\nCXg[ê: " - IDS_INFO_INSTALLSRC "\nCXg[³: " - IDS_INFO_UNINSTALLSTR "\nACXg[Égp·é¶ñ: " - IDS_INFO_MODIFYPATH "\nÏXÉgp·épX: " - IDS_INFO_INSTALLDATE "\nCXg[µ½út: " + IDS_INFO_VERSION "\no[W: " + IDS_INFO_DESCRIPTION "\nTv: " + IDS_INFO_PUBLISHER "\ns³: " + IDS_INFO_HELPLINK "\nwvÖÌN: " + IDS_INFO_HELPPHONE "\nwvÌdbÔ: " + IDS_INFO_README "\nReadmeÌÊu: " + IDS_INFO_REGOWNER "\no^³ê½LÒ: " + IDS_INFO_PRODUCTID "\nv_NgID: " + IDS_INFO_CONTACT "\nAæ: " + IDS_INFO_UPDATEINFO "\nAbvf[gîñ: " + IDS_INFO_INFOABOUT "\n±êÉÖ·éîñ: " + IDS_INFO_COMMENTS "\nRg: " + IDS_INFO_INSTLOCATION "\nCXg[ê: " + IDS_INFO_INSTALLSRC "\nCXg[³: " + IDS_INFO_UNINSTALLSTR "\nACXg[Égp·é¶ñ: " + IDS_INFO_MODIFYPATH "\nÏXÉgp·épX: " + IDS_INFO_INSTALLDATE "\nCXg[µ½út: " END STRINGTABLE DISCARDABLE BEGIN - IDS_AINFO_VERSION "\no[W: " - IDS_AINFO_DESCRIPTION "\nTv: " - IDS_AINFO_SIZE "\nTCY: " - IDS_AINFO_URLSITE "\nz[y[W: " - IDS_AINFO_LICENCE "\nCZX: " + IDS_AINFO_VERSION "\no[W: " + IDS_AINFO_DESCRIPTION "\nTv: " + IDS_AINFO_SIZE "\nTCY: " + IDS_AINFO_URLSITE "\nz[y[W: " + IDS_AINFO_LICENCE "\nCZX: " END STRINGTABLE DISCARDABLE BEGIN - IDS_CAT_AUDIO "I[fBI" - IDS_CAT_DEVEL "J" - IDS_CAT_DRIVERS "hCo" - IDS_CAT_EDU "³ç" - IDS_CAT_ENGINEER "Hw" - IDS_CAT_FINANCE "oc" - IDS_CAT_GAMES "Q[Æ¨yµÝ" - IDS_CAT_GRAPHICS "OtBbNX" - IDS_CAT_INTERNET "C^[lbgÆlbg[N" - IDS_CAT_LIBS "Cu" - IDS_CAT_OFFICE "ItBX" - IDS_CAT_OTHER "»Ì¼" - IDS_CAT_SCIENCE "Èw" - IDS_CAT_TOOLS "c[" - IDS_CAT_VIDEO "rfI" + IDS_CAT_AUDIO "I[fBI" + IDS_CAT_DEVEL "J" + IDS_CAT_DRIVERS "hCo" + IDS_CAT_EDU "³ç" + IDS_CAT_ENGINEER "Hw" + IDS_CAT_FINANCE "oc" + IDS_CAT_GAMES "Q[Æ¨yµÝ" + IDS_CAT_GRAPHICS "OtBbNX" + IDS_CAT_INTERNET "C^[lbgÆlbg[N" + IDS_CAT_LIBS "Cu" + IDS_CAT_OFFICE "ItBX" + IDS_CAT_OTHER "»Ì¼" + IDS_CAT_SCIENCE "Èw" + IDS_CAT_TOOLS "c[" + IDS_CAT_VIDEO "rfI" END STRINGTABLE DISCARDABLE BEGIN - IDS_APPTITLE "ReactOS AvP[V }l[W[" - IDS_SEARCH_TEXT "õ..." - IDS_INSTALL "CXg[" - IDS_UNINSTALL "ACXg[" - IDS_MODIFY "ÏX" - IDS_APPS_COUNT "AvP[V: %d" - IDS_WELCOME_TITLE "ReactOS AvP[V }l[W[Öæ¤±»!\n\n" - IDS_WELCOME_TEXT "¶¤©çJeSðIðµACXg[ÍACXg[·éAvP[VðIñÅ¾³¢B\nReactOS EFu TCg: " - IDS_WELCOME_URL "http://www.reactos.org" - IDS_INSTALLED "CXg[ÏÝ" - IDS_AVAILABLEFORINST "CXg[Â\\" - IDS_UPDATES "Abvf[g" - IDS_APPLICATIONS "AvP[V" - IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" - IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" - IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" + IDS_APPTITLE "ReactOS AvP[V }l[W[" + IDS_SEARCH_TEXT "õ..." + IDS_INSTALL "CXg[" + IDS_UNINSTALL "ACXg[" + IDS_MODIFY "ÏX" + IDS_APPS_COUNT "AvP[V: %d" + IDS_WELCOME_TITLE "ReactOS AvP[V }l[W[Öæ¤±»!\n\n" + IDS_WELCOME_TEXT "¶¤©çJeSðIðµACXg[ÍACXg[·éAvP[VðIñÅ¾³¢B\nReactOS EFu TCg: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "CXg[ÏÝ" + IDS_AVAILABLEFORINST "CXg[Â\\" + IDS_UPDATES "Abvf[g" + IDS_APPLICATIONS "AvP[V" + IDS_CHOOSE_FOLDER_TEXT "vOÌ_E[hÉgp·étH_ðIðµÄ¾³¢:" + IDS_CHOOSE_FOLDER_ERROR "wè³ê½tH_Í¶ÝµÜ¹ñ!" + IDS_USER_NOT_ADMIN """ReactOS AvP[V }l[W["" ðN®·éÉÍÇÒ ÀÅ éKvª èÜ·!" END Added: trunk/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,17 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "3D eLXg XN[Z[o[ÌÝè" +FONT 9, "MS UI Gothic", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,216,7,50,14 + PUSHBUTTON "LZ",IDCANCEL,216,24,50,14 + EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL + LTEXT "JX^ eLXg",IDC_STATIC,18,17,65,8 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "3D eLXg XN[Z[o[" +END Propchange: trunk/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -18,6 +18,7 @@ #include "lang/eu-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" Added: trunk/reactos/base/applications/screensavers/logon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,7 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "OI XN[Z[o[" + IDS_TEXT "ÝèªKvÈIvVÍ èÜ¹ñB" +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -20,6 +20,7 @@ #include "lang/es-ES.rc" #include "lang/eu-ES.rc" #include "lang/fr-FR.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Added: trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,164 @@ +// Japanese (ja-JP) resources by Tomoya Kitagawa (jptomoya at yahoo dot co dot jp) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "d¹Ýè" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "±ÌRs[^ÉÅàKµ½d¹ÝèðIðµÄ¾³¢BºÌÝèðÏX·éÆAIð³ê½d¹ÝèàÏX³êé_ÉÓµÄ¾³¢B", + -1,37, 6, 209, 36 + GROUPBOX "d¹Ýè(&O)", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "¼Oðt¯ÄÛ¶(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "í(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "s¾", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Rs[^ÌóÔ:",IDC_SAT, 12, 109, 60, 12 + LTEXT "d¹ÉÚ±",IDC_SAC, 123, 110, 45, 15 + ICON IDI_AC, IDC_IAC, 97, 108, 21, 20 + LTEXT "obegp",IDC_SDC, 195, 110, 45, 15 + ICON IDI_DC, IDC_IDC, 170, 108, 21, 20 + LTEXT "j^Ìd¹ðØé(&M):",IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "n[hfBXNÌd¹ðØé(&I):",IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "VXe X^oC(&T):",IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "VXeðx~óÔÉ·é(&H):",IDC_HYBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "A[" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "obeáºA[",-1, 6, 7, 239, 104 + CONTROL "d¹xªÉBµ½çobeáºA[Åmç¹é(&L):",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 + LTEXT "s¾",IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "0%",-1, 28, 43, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 + LTEXT "100%", -1, 214, 43, 25, 10 + PUSHBUTTON "A[Ì®ì(&M)...",-1, 17, 69, 70, 14,WS_DISABLED + LTEXT "Êmû@:",-1, 95, 71, 57, 10 + LTEXT "s¾",IDC_ALARMMSG1, 154, 71, 84, 10 + LTEXT "®ì:",-1, 95, 83, 55, 10 + LTEXT "s¾",IDC_ALARMAKTION1, 154, 83, 84, 10 + LTEXT "vOÌÀs:",-1, 95, 95, 55, 10 + LTEXT "s¾",IDC_ALARMPROG1, 154, 95, 84, 10 + + GROUPBOX "obeÀEA[",-1, 6, 120, 239, 106 + CONTROL "d¹xªÉBµ½çobeÀEA[Åmç¹é(&C):",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 + LTEXT "s¾",IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "0%",-1, 28, 154, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 + LTEXT "100%",-1, 214, 154, 25, 10 + PUSHBUTTON "A[Ì®ì(&M)...",-1, 17, 183, 70, 14, WS_DISABLED + LTEXT "Êmû@:",-1, 95, 185, 50, 10 + LTEXT "s¾",IDC_ALARMMSG2, 154, 185, 84, 10 + LTEXT "®ì:",-1, 95, 198, 45, 10 + LTEXT "s¾",IDC_ALARMAKTION2, 154, 198, 84, 10 + LTEXT "vOÌÀs:",-1, 95, 211, 50, 10 + LTEXT "s¾",IDC_ALARMPROG2, 154, 211, 84, 10 +END + +IDD_PROPPAGEADVANCED DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ú×Ýè" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_ACDC,IDI_ACDC, 7, 7, 20, 20 + LTEXT "gp·éÈdÍÝèðIðµÄ¾³¢B",-1, 37, 6, 207, 20 + GROUPBOX "IvV",-1, 6, 30, 240, 65 + CONTROL "ACRðíÉ^XN o[É\\¦·é(&S)",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 43, 220, 10 + CONTROL "X^oC©çñ·éÆ«ÉpX[hÌüÍðßé(&P)",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 60, 220, 10 + CONTROL "obeðgp·éÆ«ÍAÃ\\¦·é(&D)",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 78, 220, 10 + GROUPBOX "d¹{^",-1, 6, 101, 240, 127 + LTEXT "|[^u Rs[^ðÂ¶½Æ«(&W):", IDC_SLIDCLOSE, 15, 115, 222, 10 + COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Rs[^Ìd¹{^ðµ½Æ«(&E):", IDC_SPOWERBUTTON, 15, 153, 222, 10 + COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Rs[^ÌX[v {^ðµ½Æ«(&N):", IDC_SSLEEPBUTTON, 15, 191, 222, 10 + COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "x~óÔ" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_HIBERNATE,IDI_HIBERNATE, 7, 7, 20, 20 + LTEXT "x~óÔÉÈéÆARs[^ÍãÉ éàÌð·×Än[h fBXNÉi[µÄ©çVbg_EµÜ·Bx~óÔªð³êéÆARs[^ÍÈOÌóÔÉßèÜ·B ", + -1, 37, 6, 210, 35 + GROUPBOX "x~óÔ",-1, 6, 41, 240, 32 + CONTROL "x~óÔðLøÉ·é(&H)",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 55, 210, 10 + GROUPBOX "x~Ì½ßÌfBXNÌæ",-1, 6, 80, 240, 76 + LTEXT "fBXNÌó«Ìæ:",-1, 15, 95, 140, 10 + LTEXT "s¾",IDC_FREESPACE, 160, 95, 80, 10 + LTEXT "x~óÔÉKvÈfBXNÌæ:",-1, 15, 115, 140, 10 + LTEXT "s¾",IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 + LTEXT "x~óÔðT|[g·éÉÍAfBXNÌó«Ìæðâ·Kvª èÜ·B ",IDC_TOLESSFREESPACE, 15, 135, 224, 20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "d¹IvV" + IDS_CPLDESCRIPTION_1 "Rs[^ÌÈdÍÝèð\\¬µÜ·B" + IDS_PROCENT "%i%%" + IDS_SOUND "¹" + IDS_TEXT "eLXg" + IDS_CONFIG1 "[%1] Ìd¹Ýè" + IDS_CONFIG2 "%1ÌÚ×Ýè" + + IDS_SIZEBYTS "%i oCg" + IDS_SIZEMB "%i MB" + + IDS_NOACTION "½àµÈ¢" + + IDS_PowerActionNone1 "½àµÈ¢" + IDS_PowerActionUnknown "s¾" + IDS_PowerActionSleep "X^oC" + IDS_PowerActionHibernate "x~óÔ" + IDS_PowerActionShutdown "Vbg_E" + IDS_PowerActionRestart "ÄN®" + IDS_PowerActionShutdownOff "Vbg_EµÄd¹ðØé" + IDS_PowerActionWarmEject "üÍðßé" + IDS_PowerActionNone2 "Èµ" + + IDS_TIMEOUT1 "1 ªã" + IDS_TIMEOUT2 "2 ªã" + IDS_TIMEOUT3 "3 ªã" + IDS_TIMEOUT4 "5 ªã" + IDS_TIMEOUT5 "10 ªã" + IDS_TIMEOUT6 "15 ªã" + IDS_TIMEOUT7 "20 ªã" + IDS_TIMEOUT8 "25 ªã" + IDS_TIMEOUT9 "30 ªã" + IDS_TIMEOUT10 "45 ªã" + IDS_TIMEOUT11 "1 Ôã" + IDS_TIMEOUT12 "2 Ôã" + IDS_TIMEOUT13 "3 Ôã" + IDS_TIMEOUT14 "4 Ôã" + IDS_TIMEOUT15 "5 Ôã" + IDS_TIMEOUT16 "Èµ" + + IDS_DEL_SCHEME "±Ìd¹ÝèðíµÜ·©?" + IDS_DEL_SCHEME_TITLE "d¹ÝèÌí" +END Propchange: trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -10,6 +10,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,7 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "dbÆfÌIvV" + IDS_CPLSYSTEMDESCRIPTION "dbÌ_CîñÆfÌvpeBð\\¬µÜ·B" +END Propchange: trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/telephon/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -9,6 +9,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Modified: trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -33,36 +33,36 @@ COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE - AUTOCHECKBOX "©®IÉT}[ ^CÌ²®ð·é(&D)", + AUTOCHECKBOX "©®IÉÄÔÌ²®ð·é(&D)", IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP END IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Internet Time" +CAPTION "C^[lbg" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically synchronize with an Internet time server", IDC_AUTOSYNC, - "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 - LTEXT "Server:", -1, 34, 22, 28, 13 - PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + AUTOCHECKBOX "©®IÉC^[lbgT[o[Æ¯ú·é", IDC_AUTOSYNC, + 11 ,7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "T[o[:", IDC_SERVERTEXT, 34, 22, 28, 13 + PUSHBUTTON "¡·®XV", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 - LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 + LTEXT "Rs[^ªC^[lbgÉÚ±µÄ¢éêÉÌÝ¯úÍsíêÜ·B", -1, 12, 114, 225, 25 END STRINGTABLE BEGIN - IDS_CPLNAME "útÆ" - IDS_CPLDESCRIPTION "útAA^C ][ðÝèµÜ·B" - IDS_TIMEZONETEXT "»ÝÌ^C ][: %s" - IDS_TIMEZONEINVALID "s³Èl" + IDS_CPLNAME "útÆ" + IDS_CPLDESCRIPTION "útAÆ^C ][ðÝèµÜ·B" + IDS_TIMEZONETEXT "»ÝÌ^C ][: %s" + IDS_TIMEZONEINVALID "³ø" IDS_TIMEZONEUNKNOWN "s¾" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" - IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" - IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" - IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" + IDS_INETTIMESUCSYNC "Í %s Æ %s %s É³íÉ¯úµÜµ½" + IDS_INETTIMENEXTSYNC "ñÌ¯ú: %s %s" + IDS_INETTIMESYNCING "ReactOSª %s Æ¯ú·éÔA¨Ò¿¾³¢" + IDS_INETTIMEERROR "ReactOSª %s Æ¯úÉG[ª¶µÜµ½" END Added: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,57 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "¨Ò¿¾³¢..." +FONT 9, "MS UI Gothic",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "ReactOS Öæ¤±»" +FONT 9, "MS UI Gothic",400,0,1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 5, 32, 32 + LTEXT "Ctrl-Alt-Del L[ÌgÝí¹ðµÄ¾³¢",IDC_STATIC, 38, 10, 144, 14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "OI" +FONT 9, "MS UI Gothic",400,0,1 +BEGIN + PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "LZ",IDCANCEL,115,122,50,14 + PUSHBUTTON "Vbg_E",IDC_SHUTDOWN,179,122,50,14 + LTEXT "[U[¼:",IDC_STATIC,36,75,40,8 + LTEXT "pX[h:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "ZLeB" +FONT 9, "MS UI Gothic",400,0,1 +BEGIN + PUSHBUTTON "LZ",IDCANCEL,170,95,70,14 + PUSHBUTTON "OIt",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Vbg_E",IDC_SHUTDOWN,170,76,70,14 + LTEXT "½ðµÜ·©?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Rs[^ÌbN",IDC_LOCK,10,76,70,14 + PUSHBUTTON "^XN }l[W",IDC_TASKMGR,90,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "æ¤±»!" + IDS_LOCKEDSAS "±ÌRs[^Í»ÝbN³êÄ¢Ü·B" + IDS_PRESSCTRLALTDELETE "OI·éÉÍAControl+Alt+Delete ðµÄ¾³¢B" + IDS_ASKFORUSER "[U[¼: " + IDS_ASKFORPASSWORD "pX[h: " + IDS_FORCELOGOFF "»ÝÌ[U[ðOAEgµÜ·BÛ¶³êÄ¢È¢f[^Í·×Ä¸íêÜ·B ±sµÜ·©?" +END Propchange: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -17,6 +17,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Added: trunk/reactos/dll/win32/netid/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ja-JP… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/netid/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,78 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Rs[^¼" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "ReactOSÍÌîñðgÁÄlbg[NãÅ±ÌRs[^ð¯ÊµÜ·B", IDC_STATIC, 40, 5, 204, 20 + LTEXT "Rs[^Ìà¾:", IDC_STATIC, 6, 40, 90, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "t Rs[^¼:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "(ùèl)", IDC_COMPUTERNAME, 98, 68, 144, 11 + LTEXT "[NO[v:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "(Èµ)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 + LTEXT "lbg[N ID EBU[hðgÁÄhCÖÌQÁ¨æÑ[J [U[Ìì¬ðs¤ÉÍA[lbg[N ID] ðNbNµÄ¾³¢B", IDC_STATIC, 6, 113, 172, 24 + PUSHBUTTON "lbg[N ID(&N)...", IDC_NETWORK_ID, 190, 114, 58, 15 + LTEXT "Rs[^¼ðÏXµ½èhCÉQÁµ½è·éÉÍ [ÏX] ðNbNµÄ¾³¢B", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "ÏX(&C)...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 + LTEXT "Ó: ±ÌRs[^Ì ID ðÏXÅ«éÌÍÇÒÌÝÅ·B", IDC_STATIC, 6, 179, 300, 9 +END + +IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Rs[^¼ÌÏX" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "(±±ÉbZ[W)", 1017, 7, 5, 218, 30 + LTEXT "Rs[^¼(&C):", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "t Rs[^¼:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "Ú×(&M)...", 1003, 150, 102, 75, 14 + GROUPBOX "Ìo", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "hC(&D):", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "[NO[v(&W):", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "hCÌõ(&F)", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "LZ", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS TtBbNXÆ NetBIOS Rs[^¼" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "±ÌRs[^ÌvC} DNS TtBbNX(&P):", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "hCÌoVbvªÏX³êéÆ«ÉvC} DNS TtBbNXðÏX·é(&C)", 115, 11, 39, 250, 10 + LTEXT "NetBIOS Rs[^¼(&N):", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "LZ", 2, 209, 104, 50, 14 + LTEXT "±Ì¼OÍAÃ¢Rs[^âT[rXÆÌÔÌÝ^pÉgp³êÜ·B", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* s¾ *" + 2 "WORKGROUP" + 3 "hCÌoVbvîñðÇÝæèÉAÌG[ª¶µÜµ½:" + 4 "Rs[^¼ÌÏX" + 5 "[NO[v:" + 6 "hC:" + 22 "%1 [NO[vÖæ¤±»B" + 23 "%1 hCÖæ¤±»B" + 24 "ÏXðLøÉ·éÉÍARs[^ðÄN®µÄ¾³¢B" + 25 "±ÌRs[^Ì¼OÆoVbvðÏXÅ«Ü·BÏX·éÆlbg[N \\[XÖÌANZXÉe¿·éÂ\\«ª èÜ·B" + 1021 "Ó: ±ÌRs[^Ì ID ðÏXÅ«éÌÍÇÒÌÝÅ·B" + 1022 "Ó: ÌRÉæèA±ÌRs[^Ì ID ðÏXÅ«Ü¹ñ:" + 1030 "Vµ¢Rs[^¼ ""%s"" ÉÍAgpÅ«È¢È¶ªÜÜêÄ¢Ü·BgpÅ«È¢¶Í ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / ? Å·B" + 3210 "Ú×(&D) >>" + 3220 "<< Ú×(&D)" + 4000 "îñ" + 4001 "Vµ¢Rs[^¼ðÝèÅ«Ü¹ñ!" +END Propchange: trunk/reactos/dll/win32/netid/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… ============================================================================== --- trunk/reactos/dll/win32/netid/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -9,6 +9,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" +#include "lang/ja-JP.rc" #include "lang/it-IT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Added: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,109 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "æ¤±»",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "±ÌEBU[hÅÍAÈºÌVµ¢foCX hCoðCXg[µÜ·:", + IDC_STATIC,120,21,195,16 + LTEXT "±s·éÉÍA[Ö] ðNbNµÄ¾³¢B",IDC_STATIC,120,169,195,17 + LTEXT "s¾ÈfoCX",IDC_DEVICE,134,36,164,11 + LTEXT "x! JX^ foCXðCXg[·éÆARs[^ªt[Yµ½èAN®s\\ÉÈéÂ\\«ª èÜ·!",IDC_STATIC,120,59,195,16 + CONTROL "hCoð©®IÉCXg[·é",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "hCoðÁèÌê©çCXg[·é",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "CXg[¸s",IDC_FINISHTITLE,120,8,195,24 + LTEXT "hCoª©Â©çÈ©Á½½ßAfoCXÍCXg[³êÜ¹ñÅµ½B", + IDC_STATIC,120,40,195,19 + LTEXT "hCoÌfBXNðÁÄ¢½èAhCoÖÌpXðmÁÄ¢éêÍA[ßé] ðNbNµÄ¾³¢B", + IDC_STATIC,120,98,181,24 + CONTROL "±Ì_CAOð¡ã\\¦µÈ¢",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "CXg[¸s",IDC_FINISHTITLE,120,8,195,24 + LTEXT "\\ú¹ÊG[ª¶µ½½ßAfoCXÍCXg[³êÜ¹ñÅµ½B", + IDC_STATIC,120,40,195,19 + LTEXT "s¾ÈfoCX",IDC_DEVICE,134,55,164,11 +END + +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "Ìêðõ·é",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "è®ÅhCoðIð·é",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "[ou fBAðõ",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "ÌpXðÜßé",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "QÆ",IDC_BROWSE,248,69,50,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "s¾ÈfoCX",IDC_DEVICE,51,20,169,16 +END + +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "s¾ÈfoCX",IDC_DEVICE,51,20,169,16 +END + +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "CXg[®¹",IDC_FINISHTITLE,120,8,195,11 + LTEXT "ÈºÌCXg[ð®¹·éÉÍÄN®ªKvÅ·:", + IDC_STATIC,120,32,195,19 + LTEXT "[®¹] ðNbN·éÆEBU[hðÂ¶Ü·B",IDC_STATIC,120,174, + 179,11 + LTEXT "s¾ÈfoCX",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "CXg[®¹",IDC_FINISHTITLE,120,8,195,11 + LTEXT "EBU[hÍÈºÌhCoÌCXg[ð®¹µÜµ½:", + IDC_STATIC,120,32,195,19 + LTEXT "[®¹] ðNbN·éÆEBU[hðÂ¶Ü·B",IDC_STATIC,120,174, + 179,11 + LTEXT "s¾ÈfoCX",IDC_DEVICE,148,53,147,12 +END + Propchange: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -16,6 +16,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -128,7 +128,7 @@ LTEXT "o[W " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "±ÌReactOSÌo[WÍÌûÉöF³êÄ¢Ü·:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "±ÌReactOSÌo[WÍÌûÉo^³êÄ¢Ü·:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ @@ -143,7 +143,7 @@ STYLE DS_SHELLFONT | WS_CHILD FONT 9, "MS UI Gothic" BEGIN - LTEXT "ReactOSÍÌûXÉæÁÄà½ç³êÜµ½:", IDC_STATIC, 0, 0, 180, 10 + LTEXT "ReactOSÍÌûXÉæÁÄñ³êÄ¢Ü·:", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -219,7 +219,6 @@ AUTOCHECKBOX "ÇÝæèêp(&R)", 14021, 45, 150, 67, 10 AUTOCHECKBOX "Bµt@C(&H)", 14022, 126, 150, 50, 10 END - SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -586,7 +585,7 @@ LTEXT "t@C¼:", -1, 7, 14, 208, 10 PUSHBUTTON "QÆ...",IDC_BUTTON_PATH, 148, 24,67,14 EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 + LTEXT "ACR:", -1, 7, 47, 208, 10 LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 PUSHBUTTON "LZ",IDCANCEL, 167, 181, 50, 14 @@ -634,12 +633,12 @@ IDS_SELECT "Ið" IDS_OPEN "J" IDS_CREATELINK "V[gJbgÌì¬(&L)" - IDS_COPY "Rs[" + IDS_COPY "Rs[(&C)" IDS_DELETE "í" IDS_PROPERTIES "vpeB" - IDS_CUT "Øèæè" + IDS_CUT "Øèæè(&U)" IDS_RESTORE "³Éß·" - IDS_FORMATDRIVE "®..." + IDS_FORMATDRIVE "tH[}bg..." IDS_RENAME "¼OÌÏX" IDS_INSERT "}ü" @@ -669,14 +668,14 @@ /* shell folder path default values */ IDS_PROGRAMS "X^[g j[\\vO" - IDS_PERSONAL "}C hLg" - IDS_FAVORITES "¨CÉüè" + IDS_PERSONAL "My Documents" + IDS_FAVORITES "Favorites" IDS_STARTUP "X^[g j[\\vO\\X^[gAbv" IDS_RECENT "Recent" IDS_SENDTO "SendTo" IDS_STARTMENU "X^[g j[" - IDS_MYMUSIC "}C ~[WbN" - IDS_MYVIDEO "}C rfI" + IDS_MYMUSIC "My Music" + IDS_MYVIDEO "My Videos" IDS_DESKTOPDIRECTORY "fXNgbv" IDS_NETHOOD "NetHood" IDS_TEMPLATES "Templates" @@ -687,13 +686,13 @@ IDS_COOKIES "Cookies" IDS_HISTORY "History" IDS_PROGRAM_FILES "Program Files" - IDS_MYPICTURES "}C sN`" + IDS_MYPICTURES "My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" - IDS_COMMON_DOCUMENTS "hLg" + IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "X^[g j[\\vO\\Çc[" - IDS_COMMON_MUSIC "hLg\\}C ~[WbN" - IDS_COMMON_PICTURES "hLg\\}C sN`" - IDS_COMMON_VIDEO "hLg\\}C rfI" + IDS_COMMON_MUSIC "Documents\\My Music" + IDS_COMMON_PICTURES "Documents\\My Pictures" + IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" IDS_NETWORKPLACE "}C lbg[N" @@ -706,11 +705,11 @@ IDS_OPEN_WITH "vO©çJ" IDS_OPEN_WITH_CHOOSE "vOÌIð..." - IDS_SHELL_ABOUT_AUTHORS "ìÒ(&A)" + IDS_SHELL_ABOUT_AUTHORS "§ìÒ(&A)" IDS_SHELL_ABOUT_BACK "< ßé(&B)" - FCIDM_SHVIEW_NEW "VKì¬" - FCIDM_SHVIEW_NEWFOLDER "tH_(&F)" - FCIDM_SHVIEW_NEWLINK "V[gJbg(&L)" + FCIDM_SHVIEW_NEW "VKì¬" + FCIDM_SHVIEW_NEWFOLDER "tH_(&F)" + FCIDM_SHVIEW_NEWLINK "V[gJbg(&L)" IDS_FOLDER_OPTIONS "tH_ IvV" IDS_RECYCLEBIN_LOCATION "²Ý Ìê" IDS_RECYCLEBIN_DISKSPACE "pÅ«éÌæ" @@ -749,5 +748,5 @@ IDS_INSTALLNEWFONT "Vµ¢tHgÌCXg[..." IDS_DEFAULT_CLUSTER_SIZE "ftHg AP[V TCY" - IDS_COPY_OF "Copy of" -END + IDS_COPY_OF "Rs[ `" +END

15 years, 3 months

[janderwald] 43097: - Fix a crash when an application hasnt defined a event label

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Sep 20 19:44:52 2009 New Revision: 43097 URL: http://svn.reactos.org/svn/reactos?rev=43097&view=rev Log: - Fix a crash when an application hasnt defined a event label Modified: trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sun Sep 20 19:44:52 2009 @@ -66,6 +66,8 @@ while(pMap) { + ASSERT(pMap); + ASSERT(pMap->szName); if (!_tcscmp(pMap->szName, szName)) return pMap; @@ -77,6 +79,8 @@ while(pMap) { + ASSERT(pMap); + ASSERT(pMap->szName); if (!_tcscmp(pMap->szName, szName)) return pMap; @@ -84,8 +88,21 @@ } - - return NULL; + pMap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_MAP)); + if (!pMap) + return NULL; + + pMap->szName = pMap->szDesc = _tcsdup(szName); + if (!pMap->szName) + { + HeapFree(GetProcessHeap(), 0, pMap); + return NULL; + } + pMap->AppMap = pAppMap; + pMap->Next = s_Map; + s_Map = pMap; + + return pMap; } VOID RemoveLabel(PLABEL_MAP pMap) @@ -206,7 +223,7 @@ return FALSE; } - pMap = HeapAlloc(GetProcessHeap(), 0, sizeof(LABEL_MAP)); + pMap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_MAP)); if (!pMap) { return FALSE; @@ -492,10 +509,9 @@ { return FALSE; } - - //MessageBox(hwndDlg, szLabelName, szAppName, MB_OK); - - pLabel = FindLabel(NULL, szLabelName); + pLabel = FindLabel(pAppMap, szLabelName); + + ASSERT(pLabel); RemoveLabel(pLabel); pLabel->AppMap = pAppMap;

15 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
27
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 September 2009