Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[janderwald] 30109: - add static context menus for drives when available
by janderwald＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: janderwald Date: Sun Nov 4 15:19:44 2007 New Revision: 30109 URL: http://svn.reactos.org/svn/reactos?rev=30109&view=rev Log: - add static context menus for drives when available Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Sun Nov 4 15:19:44 2007 @@ -491,6 +491,10 @@ if (_ILIsFolder(This->apidl[0])) // && (This->rfg & SFGAO_BROWSABLE)) { SH_AddStaticEntryForFileClass(This, L"Folder"); + } + else if (_ILIsDrive(This->apidl[0])) + { + SH_AddStaticEntryForFileClass(This, L"Drive"); } }

1 0

[arty] 30108: Add the beginnings of context switch and decrementer exception handler. Move cruddy asm code for syscall trap to an ASM file. Factor out an i386 specific name. Add relevant registers to FX save.
by arty＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: arty Date: Sun Nov 4 15:09:37 2007 New Revision: 30108 URL: http://svn.reactos.org/svn/reactos?rev=30108&view=rev Log: Add the beginnings of context switch and decrementer exception handler. Move cruddy asm code for syscall trap to an ASM file. Factor out an i386 specific name. Add relevant registers to FX save. Added: trunk/reactos/ntoskrnl/ke/powerpc/ctxhelp.S (with props) trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c (with props) Modified: trunk/reactos/include/ndk/powerpc/ketypes.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c trunk/reactos/ntoskrnl/ke/powerpc/stubs.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/include/ndk/powerpc/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/powerpc/ketype… ============================================================================== --- trunk/reactos/include/ndk/powerpc/ketypes.h (original) +++ trunk/reactos/include/ndk/powerpc/ketypes.h Sun Nov 4 15:09:37 2007 @@ -46,7 +46,12 @@ typedef struct _FX_SAVE_AREA { ULONG Fr[32]; -} FX_SAVE_AREA; +} FX_SAVE_AREA, *PFX_SAVE_AREA; + +typedef struct _FXSAVE_FORMAT +{ + ULONG Xer,Fpscr; +} FXSAVE_FORMAT, *PFXSAVE_FORMAT; typedef struct _LDT_ENTRY { USHORT LimitLow; Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Sun Nov 4 15:09:37 2007 @@ -133,6 +133,8 @@ PKSTART_ROUTINE StartRoutine, PVOID StartContext, PCONTEXT Context); +#define KeArchInitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) \ + Ke386InitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) #ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */ VOID Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h Sun Nov 4 15:09:37 2007 @@ -181,6 +181,8 @@ #define KeArchFnInit() KePPCFnInit() #define KeArchHaltProcessor() KePPCHaltProcessor() +#define KeArchInitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) \ + KePPCInitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) #endif /* __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H */ Added: trunk/reactos/ntoskrnl/ke/powerpc/ctxhelp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ctxhel… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/ctxhelp.S (added) +++ trunk/reactos/ntoskrnl/ke/powerpc/ctxhelp.S Sun Nov 4 15:09:37 2007 @@ -1,0 +1,195 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ke/i386/ctxswitch.S + * PURPOSE: Thread Context Switching + * + * PROGRAMMERS: arty + (i386 implementation by Alex Ionescu) + */ + +/* INCLUDES ******************************************************************/ + + .globl KiSystemService + .globl KiSystemService1 + .globl kiss_proceed + .globl kiss_end +KiSystemService1: + stw 2,4(1) // r1 + stw 3,12(1) + stw 4,16(1) + stw 5,20(1) + stw 6,24(1) + stw 7,28(1) + stw 8,32(1) + stw 9,36(1) + stw 10,40(1) + stw 11,44(1) + stw 12,48(1) + stw 13,52(1) + stw 14,56(1) + stw 15,60(1) + stw 16,64(1) + stw 17,68(1) + stw 18,72(1) + stw 19,76(1) + stw 20,80(1) + stw 21,84(1) + stw 22,88(1) + stw 23,92(1) + stw 24,96(1) + stw 25,100(1) + stw 26,104(1) + stw 27,108(1) + stw 28,112(1) + stw 29,116(1) + stw 30,120(1) + stw 31,124(1) + /* This save is important */ + stw 0,140(1) // srr0 + mflr 0 + stw 0,128(1) + mfctr 0 + stw 0,136(1) + mfsrr1 0 + stw 0,144(1) + mfdsisr 0 + stw 0,148(1) + mfdar 0 + stw 0,152(1) + lis 3,KiSystemService@ha + addi 3,3,KiSystemService@l + mtctr 3 + mr 3,1 + subi 1,1,0x100 + bctrl + addi 1,1,0x100 + /* Return from kernel */ + lwz 3,12(1) /* Result */ + lwz 0,128(1) + mtlr 0 + lwz 0,140(1) + mtsrr0 0 + lwz 0,144(1) + mtsrr1 0 + lwz 1,4(1) /* Stack */ + rfi + + .globl KiDecrementerTrapHandler + .globl KiDecrementerTrapHandlerEnd + .globl KiDecrementerTrap +KiDecrementerTrapHandler: + // switch to trap stack until we figure out where to go + mtsprg0 1 + lis 1,_kernel_trap_stack@ha + addi 1,1,_kernel_trap_stack@l + subi 1,1,0x100 + stw 0,0(1) + mfsprg0 0 + stw 0,4(1) + stw 2,8(1) + stw 3,12(1) + stw 4,16(1) + stw 5,20(1) + stw 6,24(1) + stw 7,28(1) + stw 8,32(1) + stw 9,36(1) + stw 10,40(1) + stw 11,44(1) + stw 12,48(1) + stw 13,52(1) + stw 14,56(1) + stw 15,60(1) + stw 16,64(1) + stw 17,68(1) + stw 18,72(1) + stw 19,76(1) + stw 20,80(1) + stw 21,84(1) + stw 22,88(1) + stw 23,92(1) + stw 24,96(1) + stw 25,100(1) + stw 26,104(1) + stw 27,108(1) + stw 28,112(1) + stw 29,116(1) + stw 30,120(1) + stw 31,124(1) + /* This save is important */ + stw 0,140(1) // srr0 + mflr 0 + stw 0,128(1) + mfctr 0 + stw 0,136(1) + mfsrr1 0 + stw 0,144(1) + mfdsisr 0 + stw 0,148(1) + mfdar 0 + stw 0,152(1) + lis 3,KiDecrementerTrap@ha + addi 3,3,KiDecrementerTrap@l + mtctr 3 + lis 3,KiDecrementerTrapFinish@ha + addi 3,3,KiDecrementerTrapFinish@l + mtlr 3 + mr 3,1 + subi 1,1,0x100 + bctr + /* We don't return here */ +KiDecrementerTrapHandlerEnd: + .long 0 + + /* Decrementer needs to restore the full CPU state */ + .globl KiDecrementerTrapFinish +KiDecrementerTrapFinish: + addi 1,1,0x100 + lwz 2,8(1) + lwz 3,12(1) + lwz 4,16(1) + lwz 5,20(1) + lwz 6,24(1) + lwz 7,28(1) + lwz 8,32(1) + lwz 9,36(1) + lwz 10,40(1) + lwz 11,44(1) + lwz 12,48(1) + lwz 13,52(1) + lwz 14,56(1) + lwz 15,60(1) + lwz 16,64(1) + lwz 17,68(1) + lwz 18,72(1) + lwz 19,76(1) + lwz 20,80(1) + lwz 21,84(1) + lwz 22,88(1) + lwz 23,92(1) + lwz 24,96(1) + lwz 25,100(1) + lwz 26,104(1) + lwz 27,108(1) + lwz 28,112(1) + lwz 29,116(1) + lwz 30,120(1) + lwz 31,124(1) + lwz 0,140(1) + mtsrr0 0 + lwz 0,128(1) + mtlr 0 + lwz 0,136(1) + mtctr 0 + lwz 0,144(1) + mtsrr1 0 + lwz 0,148(1) + mtdsisr 0 + lwz 0,152(1) + mtdar 0 + // back out r0 and r1 + lwz 0,0(1) + lwz 1,4(1) + // Bye!!1 + rfi Propchange: trunk/reactos/ntoskrnl/ke/powerpc/ctxhelp.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ctxswi… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c (added) +++ trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c Sun Nov 4 15:09:37 2007 @@ -1,0 +1,78 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ke/i386/ctxswitch.S + * PURPOSE: Thread Context Switching + * + * PROGRAMMERS: arty + (i386 implementation by Alex Ionescu) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/*++ + * KiThreadStartup + * + * The KiThreadStartup routine is the beginning of any thread. + * + * Params: + * SystemRoutine - Pointer to the System Startup Routine. Either + * PspUserThreadStartup or PspSystemThreadStartup + * + * StartRoutine - For Kernel Threads only, specifies the starting execution + * point of the new thread. + * + * StartContext - For Kernel Threads only, specifies a pointer to variable + * context data to be sent to the StartRoutine above. + * + * UserThread - Indicates whether or not this is a user thread. This tells + * us if the thread has a context or not. + * + * TrapFrame - Pointer to the KTHREAD to which the caller wishes to + * switch from. + * + * Returns: + * Should never return for a system thread. Returns through the System Call + * Exit Dispatcher for a user thread. + * + * Remarks: + * If a return from a system thread is detected, a bug check will occur. + * + *--*/ + +VOID +STDCALL +KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + BOOLEAN UserThread, + KTRAP_FRAME TrapFrame) +{ + KeLowerIrql(APC_LEVEL); + __asm__("mr 8,%0\n\t" + "mr 3,%1\n\t" + "mr 4,%2\n\t" + "mr 5,%3\n\t" + "mr 6,%4\n\t" + "sc" : : + "r" (0xf0000), /* Thread start function */ + "r" (SystemRoutine), + "r" (StartRoutine), + "r" (StartContext), + "r" (UserThread)); + PspTerminateThreadByPointer(PsGetCurrentThread(), STATUS_THREAD_IS_TERMINATING, TRUE); +} + +/* Take a decrementer trap, and prepare the given trap frame, swapping + * process and thread context as appropriate. */ +VOID +STDCALL +KiDecrementerTrap(PKTRAP_FRAME TrapFrame) +{ + DbgPrint("Decrementer Trap!\n"); + __asm__("mtdec %0" : : "r" (0x10000)); // Reset the trap +} Propchange: trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/kiinit… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c Sun Nov 4 15:09:37 2007 @@ -52,7 +52,8 @@ "syscall_end:\n\t" ".space 4"); -extern int syscall_start[], syscall_end; +extern int syscall_start[], syscall_end, KiDecrementerTrapHandler[], + KiDecrementerTrapHandlerEnd; VOID NTAPI @@ -64,6 +65,28 @@ source < &syscall_end; source++, handler_target += sizeof(int)) SetPhys(handler_target, *source); +} + +VOID +NTAPI +KiSetupDecrementerTrap() +{ + paddr_t handler_target; + int *source; + + /* Turn off EE bit while redefining dec trap */ + _disable(); + + for(source = KiDecrementerTrapHandler, handler_target = 0x900; + source != &KiDecrementerTrapHandlerEnd; + source++, handler_target += sizeof(int)) + SetPhys(handler_target, *source); + + /* Enable interrupts! */ + _enable(); + + /* Kick decmrenter! */ + __asm__("mtdec %0" : : "r" (0)); } VOID @@ -106,6 +129,12 @@ ULONG FeatureBits; LARGE_INTEGER PageDirectory; PVOID DpcStack; + boot_infos_t *BootInfo = ((boot_infos_t *)LoaderBlock->ArchExtra); + +#ifdef _M_PPC + /* Set the machine type in LoaderBlock for HAL */ + KeLoaderBlock->u.PowerPC.MachineType = BootInfo->machineType; +#endif /* Detect and set the CPU Type */ KiSetProcessorType(); @@ -209,16 +238,15 @@ /* Free Initial Memory */ // MiFreeInitMemory(); + /* Setup decrementer exception */ + KiSetupDecrementerTrap(); + while (1) { LARGE_INTEGER Timeout; Timeout.QuadPart = 0x7fffffffffffffffLL; KeDelayExecutionThread(KernelMode, FALSE, &Timeout); } - - /* Bug Check and loop forever if anything failed */ - KEBUGCHECK(0); - for(;;); } extern int KiPageFaultHandler(int trap, ppc_trap_frame_t *frame); Modified: trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ppc_ir… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c Sun Nov 4 15:09:37 2007 @@ -754,76 +754,13 @@ NTAPI KdpServiceDispatcher(ULONG Service, PCHAR Buffer, ULONG Length); -__asm__(".globl KiSystemService\n\t" - ".globl KiSystemService1\n\t" - ".globl kiss_proceed\n\t" - ".globl kiss_end\n" - "KiSystemService1:\n\t" - "stw 2,4(1)\n\t" // r1 - "stw 3,12(1)\n\t" - "stw 4,16(1)\n\t" - "stw 5,20(1)\n\t" - "stw 6,24(1)\n\t" - "stw 7,28(1)\n\t" - "stw 8,32(1)\n\t" - "stw 9,36(1)\n\t" - "stw 10,40(1)\n\t" - "stw 11,44(1)\n\t" - "stw 12,48(1)\n\t" - "stw 13,52(1)\n\t" - "stw 14,56(1)\n\t" - "stw 15,60(1)\n\t" - "stw 16,64(1)\n\t" - "stw 17,68(1)\n\t" - "stw 18,72(1)\n\t" - "stw 19,76(1)\n\t" - "stw 20,80(1)\n\t" - "stw 21,84(1)\n\t" - "stw 22,88(1)\n\t" - "stw 23,92(1)\n\t" - "stw 24,96(1)\n\t" - "stw 25,100(1)\n\t" - "stw 26,104(1)\n\t" - "stw 27,108(1)\n\t" - "stw 28,112(1)\n\t" - "stw 29,116(1)\n\t" - "stw 30,120(1)\n\t" - "stw 31,124(1)\n\t" - /* This save is important */ - "stw 0,140(1)\n\t" // srr0 - "mflr 0\n\t" - "stw 0,128(1)\n\t" - "mfctr 0\n\t" - "stw 0,136(1)\n\t" - "mfsrr1 0\n\t" - "stw 0,144(1)\n\t" - "mfdsisr 0\n\t" - "stw 0,148(1)\n\t" - "mfdar 0\n\t" - "stw 0,152(1)\n\t" - "lis 3,KiSystemService@ha\n\t" - "addi 3,3,KiSystemService@l\n\t" - "mtctr 3\n\t" - "mr 3,1\n\t" - "subi 1,1,0x100\n\t" - "bctrl\n\t" - "addi 1,1,0x100\n\t" - /* Return from kernel */ - "lwz 3,12(1)\n\t" /* Result */ - "lwz 0,128(1)\n\t" - "mtlr 0\n\t" - "lwz 0,140(1)\n\t" - "mtsrr0 0\n\t" - "lwz 0,144(1)\n\t" - "mtsrr1 0\n\t" - "lwz 1,4(1)\n" /* Stack */ - "rfi\n"); - VOID NTAPI KiSystemService(ppc_trap_frame_t *trap_frame) { int i; + PKSYSTEM_ROUTINE SystemRoutine; + switch(trap_frame->gpr[8]) { case 0x10000: /* DebugService */ @@ -835,6 +772,12 @@ (PCHAR)trap_frame->gpr[4], trap_frame->gpr[5]); break; + case 0xf0000: /* Thread startup */ + /* XXX how to use UserThread (gpr[6]) */ + SystemRoutine = (PKSYSTEM_ROUTINE)trap_frame->gpr[3]; + SystemRoutine((PKSTART_ROUTINE)trap_frame->gpr[4], + (PVOID)trap_frame->gpr[5]); + break; } } Modified: trunk/reactos/ntoskrnl/ke/powerpc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/stubs.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/stubs.c (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/stubs.c Sun Nov 4 15:09:37 2007 @@ -199,16 +199,6 @@ return STATUS_UNSUCCESSFUL; } -VOID -STDCALL -KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext, - BOOLEAN UserThread, - KTRAP_FRAME TrapFrame) -{ -} - void _alldiv() { } void _alldvrm() { } Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Sun Nov 4 15:09:37 2007 @@ -816,17 +816,16 @@ KERNEL_STACK_SIZE); MiSyncThreadProcessViews(Process, Thread, sizeof(ETHREAD)); -#if defined(_M_IX86) /* Enter SEH to avoid crashes due to user mode */ Status = STATUS_SUCCESS; _SEH_TRY { /* Initalize the Thread Context */ - Ke386InitThreadWithContext(Thread, - SystemRoutine, - StartRoutine, - StartContext, - Context); + KeArchInitThreadWithContext(Thread, + SystemRoutine, + StartRoutine, + StartContext, + Context); } _SEH_HANDLE { @@ -842,9 +841,6 @@ } } _SEH_END; -#else - Status = STATUS_SUCCESS; -#endif /* Set the Thread to initalized */ Thread->State = Initialized; Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Nov 4 15:09:37 2007 @@ -64,6 +64,9 @@ <file>ppc_irq.c</file> <file>stubs.c</file> <file>systimer.c</file> + <file>thrdini.c</file> + <file>ctxswitch.c</file> + <file>ctxhelp.S</file> </directory> </if> <file>apc.c</file>

1 0

[janderwald] 30107: - should_notify should check if the changed pidl is really a child of the containing folder. - fixes bug 2789
by janderwald＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: janderwald Date: Sun Nov 4 15:00:16 2007 New Revision: 30107 URL: http://svn.reactos.org/svn/reactos?rev=30107&view=rev Log: - should_notify should check if the changed pidl is really a child of the containing folder. - fixes bug 2789 Modified: trunk/reactos/dll/win32/shell32/changenotify.c Modified: trunk/reactos/dll/win32/shell32/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/changeno… ============================================================================== --- trunk/reactos/dll/win32/shell32/changenotify.c (original) +++ trunk/reactos/dll/win32/shell32/changenotify.c Sun Nov 4 15:00:16 2007 @@ -267,7 +267,7 @@ return FALSE; if (ILIsEqual( watched, changed ) ) return TRUE; - if( sub && ILIsParent( watched, changed, FALSE ) ) + if( sub && ILIsParent( watched, changed, TRUE ) ) return TRUE; return FALSE; }

1 0

[arty] 30106: Add machineType to arch specific info. Fixup module locations that are not PE coff.
by arty＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: arty Date: Sun Nov 4 14:59:52 2007 New Revision: 30106 URL: http://svn.reactos.org/svn/reactos?rev=30106&view=rev Log: Add machineType to arch specific info. Fixup module locations that are not PE coff. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c trunk/reactos/include/reactos/arc/arc.h trunk/reactos/include/reactos/ppcboot.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Sun Nov 4 14:59:52 2007 @@ -476,6 +476,8 @@ VOID PpcHwDetect() { printf("PpcHwDetect\n"); + /* Almost all PowerPC boxen use PCI */ + BootInfo.machineType = PCIBus; } BOOLEAN PpcDiskNormalizeSystemPath(char *SystemPath, unsigned Size) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Sun Nov 4 14:59:52 2007 @@ -184,6 +184,11 @@ LdrPEFixupImports ((PVOID)reactos_modules[i].ModStart, (PCHAR)reactos_modules[i].String); + else /* Make RVA */ + { + reactos_modules[i].ModStart -= (ULONG_PTR)KernelMemory; + reactos_modules[i].ModEnd -= (ULONG_PTR)KernelMemory; + } } /* We don't use long longs, but longs for the addresses in the @@ -680,6 +685,7 @@ } while(TempName); NameBuffer = reactos_module_strings[LoaderBlock.ModsCount]; + /* Get Module Size */ LocalModuleSize = FsGetFileSize(ModuleImage); @@ -723,8 +729,9 @@ else { PVOID ModuleBase = (PVOID)NextModuleBase; + if(FrLdrMapModule(Image, ShortName, 0, 0)) - Result = ModuleBase; + Result = ModuleBase; } return Result; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Sun Nov 4 14:59:52 2007 @@ -1,8 +1,10 @@ #include "freeldr.h" #include "machine.h" +#include "ppcboot.h" #include "ppcmmu/mmu.h" #include "prep.h" +extern boot_infos_t BootInfo; int prep_serial = 0x800003f8; void sync() { __asm__("eieio\n\tsync"); } @@ -63,6 +65,8 @@ void PpcPrepVideoPrepareForReactOS(BOOLEAN setup) { + /* Prep boxen are PCI */ + BootInfo.machineType = PCIBus; pci_setup(&pci1_desc); } Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Sun Nov 4 14:59:52 2007 @@ -342,6 +342,7 @@ typedef struct _PPC_LOADER_BLOCK { PVOID BootInfo; + ULONG MachineType; } PPC_LOADER_BLOCK, *PPPC_LOADER_BLOCK; // Modified: trunk/reactos/include/reactos/ppcboot.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ppcboot.h?… ============================================================================== --- trunk/reactos/include/reactos/ppcboot.h (original) +++ trunk/reactos/include/reactos/ppcboot.h Sun Nov 4 14:59:52 2007 @@ -4,6 +4,7 @@ typedef char font_char[57]; typedef struct _boot_infos_t { void *loaderBlock; + int machineType; int dispDeviceRect[4]; int dispDeviceRowBytes; int dispDeviceDepth;

1 0

[arty] 30105: Do this properly now that I understand exception chaining a bit better. The exception chain on x86 is at fs:0. We use r13 to simulate the same, so we chain exceptions at 0(13)
by arty＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: arty Date: Sun Nov 4 14:57:37 2007 New Revision: 30105 URL: http://svn.reactos.org/svn/reactos?rev=30105&view=rev Log: Do this properly now that I understand exception chaining a bit better. The exception chain on x86 is at fs:0. We use r13 to simulate the same, so we chain exceptions at 0(13) Modified: trunk/reactos/lib/pseh/powerpc/framebased.S Modified: trunk/reactos/lib/pseh/powerpc/framebased.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/powerpc/framebase… ============================================================================== --- trunk/reactos/lib/pseh/powerpc/framebased.S (original) +++ trunk/reactos/lib/pseh/powerpc/framebased.S Sun Nov 4 14:57:37 2007 @@ -20,41 +20,28 @@ .text -__readfsdword: - add 7,13,3 - lwz 3,0(7) - blr - -__writefsdword: - add 7,13,3 - stw 3,0(7) - blr - .globl _SEHCleanHandlerEnvironment _SEHCleanHandlerEnvironment: blr .globl _SEHCurrentRegistration _SEHCurrentRegistration: - xor 3,0,0 - bl __readfsdword + lwz 3,0(13) blr + // R3: Frame to store in .globl _SEHRegisterFrame _SEHRegisterFrame: - xor 3,0,0 - bl __readfsdword # Get [fs:0] - lwz 4,0(1) # Get next stack frame into r4 - stw 3,0(1) # put [fs:0] into old stack pos - xor 3,0,0 - bl __writefsdword # put old stack frame into [fs:0] completing - blr # the chain and return + lwz 4,0(13) + stw 3,0(13) + stw 4,0(3) + blr .globl _SEHUnregisterFrame _SEHUnregisterFrame: - xor 3,0,0 - bl __readfsdword # Get old next frame ptr - stw 3,0(1) # Reset old stack frame + lwz 3,0(13) + lwz 3,0(3) + stw 3,0(13) blr .globl _SEHGlobalUnwind

1 0

[arty] 30104: Fix key parsing by copying the unicode string struct we get from CmFindObject for us to modify, and free the original. We needn't make any assumptions about the string being null terminated. Parse names with duplicated \ characters. Since we assert downstream for a null key, bail early here with an error if we really get a degenerate key name. With the work that others have done on the registry code, this is the last piece needed for the firefox installer.
by arty＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: arty Date: Sun Nov 4 14:49:57 2007 New Revision: 30104 URL: http://svn.reactos.org/svn/reactos?rev=30104&view=rev Log: Fix key parsing by copying the unicode string struct we get from CmFindObject for us to modify, and free the original. We needn't make any assumptions about the string being null terminated. Parse names with duplicated \ characters. Since we assert downstream for a null key, bail early here with an error if we really get a degenerate key name. With the work that others have done on the registry code, this is the last piece needed for the firefox installer. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Sun Nov 4 14:49:57 2007 @@ -135,12 +135,11 @@ IN ULONG CreateOptions, OUT PULONG Disposition) { - UNICODE_STRING RemainingPath = {0}; + UNICODE_STRING RemainingPath = {0}, ReturnedPath = {0}; ULONG LocalDisposition; PKEY_OBJECT KeyObject; NTSTATUS Status = STATUS_SUCCESS; PVOID Object = NULL; - PWSTR Start; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; unsigned int i; @@ -219,7 +218,7 @@ Status = CmFindObject(&ObjectCreateInfo, &ObjectName, (PVOID*)&Object, - &RemainingPath, + &ReturnedPath, CmpKeyObjectType, NULL, NULL); @@ -232,8 +231,9 @@ DPRINT1("CmpFindObject failed, Status: 0x%x\n", Status); goto Cleanup; } - - DPRINT("RemainingPath %wZ\n", &RemainingPath); + + RemainingPath = ReturnedPath; + DPRINT("RemainingPath (preparse) %wZ\n", &RemainingPath); if (RemainingPath.Length == 0) { @@ -267,24 +267,21 @@ /* If RemainingPath contains \ we must return error because NtCreateKey doesn't create trees */ - Start = RemainingPath.Buffer; - if (*Start == L'\\') - { - Start++; - //RemainingPath.Length -= sizeof(WCHAR); - //RemainingPath.MaximumLength -= sizeof(WCHAR); - //RemainingPath.Buffer++; - //DPRINT1("String: %wZ\n", &RemainingPath); - } - - if (RemainingPath.Buffer[(RemainingPath.Length / sizeof(WCHAR)) - 1] == '\\') - { - RemainingPath.Buffer[(RemainingPath.Length / sizeof(WCHAR)) - 1] = UNICODE_NULL; + while (RemainingPath.Length && *RemainingPath.Buffer == L'\\') + { RemainingPath.Length -= sizeof(WCHAR); RemainingPath.MaximumLength -= sizeof(WCHAR); - } - - for (i = 1; i < RemainingPath.Length / sizeof(WCHAR); i++) + RemainingPath.Buffer++; + } + + while (RemainingPath.Length && + RemainingPath.Buffer[(RemainingPath.Length / sizeof(WCHAR)) - 1] == '\\') + { + RemainingPath.Length -= sizeof(WCHAR); + RemainingPath.MaximumLength -= sizeof(WCHAR); + } + + for (i = 0; i < RemainingPath.Length / sizeof(WCHAR); i++) { if (L'\\' == RemainingPath.Buffer[i]) { @@ -299,7 +296,15 @@ } } - DPRINT("RemainingPath %S ParentObject 0x%p\n", RemainingPath.Buffer, Object); + DPRINT("RemainingPath %wZ ParentObject 0x%p\n", &RemainingPath, Object); + + // + if (RemainingPath.Length == 0 || RemainingPath.Buffer[0] == UNICODE_NULL) + { + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Cleanup; + } + /* Acquire hive lock */ KeEnterCriticalRegion(); @@ -331,7 +336,10 @@ goto Cleanup; } - RtlCreateUnicodeString(&KeyObject->Name, Start); + RtlDuplicateUnicodeString + (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &RemainingPath, &KeyObject->Name); + DPRINT("Key Name: %wZ\n", &KeyObject->Name); ParentNode = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->ParentKcb->KeyHive, KeyObject->KeyControlBlock->ParentKcb->KeyCell); @@ -408,7 +416,7 @@ PreviousMode); } if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - RtlFreeUnicodeString(&RemainingPath); + RtlFreeUnicodeString(&ReturnedPath); if (Object != NULL) ObDereferenceObject(Object); return Status;

1 0

[ekohl] 30103: - Made some local functions static. - Pressing the "Del" key removes the currently selected environment variable.
by ekohl＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: ekohl Date: Sun Nov 4 13:45:06 2007 New Revision: 30103 URL: http://svn.reactos.org/svn/reactos?rev=30103&view=rev Log: - Made some local functions static. - Pressing the "Del" key removes the currently selected environment variable. Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Sun Nov 4 13:45:06 2007 @@ -47,7 +47,7 @@ } -INT_PTR CALLBACK +static INT_PTR CALLBACK EditVariableDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -340,7 +340,7 @@ } -VOID +static VOID OnNewVariable(HWND hwndDlg, INT iDlgItem) { @@ -387,7 +387,7 @@ } -VOID +static VOID OnEditVariable(HWND hwndDlg, INT iDlgItem) { @@ -423,7 +423,7 @@ } -VOID +static VOID OnDeleteVariable(HWND hwndDlg, INT iDlgItem) { @@ -473,7 +473,7 @@ } -VOID +static VOID ReleaseListViewItems(HWND hwndDlg, INT iDlgItem) { @@ -515,7 +515,7 @@ } -VOID +static VOID SetAllVars(HWND hwndDlg, INT iDlgItem) { @@ -651,6 +651,35 @@ } +static BOOL +OnNotify(HWND hwndDlg, NMHDR *phdr) +{ + switch(phdr->code) + { + case NM_DBLCLK: + if (phdr->idFrom == IDC_USER_VARIABLE_LIST || + phdr->idFrom == IDC_SYSTEM_VARIABLE_LIST) + { + OnEditVariable(hwndDlg, (INT)phdr->idFrom); + return TRUE; + } + break; + + case LVN_KEYDOWN: + if (((LPNMLVKEYDOWN)phdr)->wVKey == VK_DELETE && + (phdr->idFrom == IDC_USER_VARIABLE_LIST || + phdr->idFrom == IDC_SYSTEM_VARIABLE_LIST)) + { + OnDeleteVariable(hwndDlg, (INT)phdr->idFrom); + return TRUE; + } + break; + } + + return FALSE; +} + + /* Environment dialog procedure */ INT_PTR CALLBACK EnvironmentDlgProc(HWND hwndDlg, @@ -709,24 +738,7 @@ break; case WM_NOTIFY: - { - NMHDR *phdr; - - phdr = (NMHDR*)lParam; - switch(phdr->code) - { - case NM_DBLCLK: - { - if (phdr->idFrom == IDC_USER_VARIABLE_LIST || - phdr->idFrom == IDC_SYSTEM_VARIABLE_LIST) - { - OnEditVariable(hwndDlg, (INT)phdr->idFrom); - return TRUE; - } - } - } - } - break; + return OnNotify(hwndDlg, (NMHDR*)lParam); } return FALSE;

1 0

[fireball] 30102: Dmitry Chapyshev <lentind@yandex.ru> - Fix tapiui's resources.
by fireball＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: fireball Date: Sun Nov 4 12:55:29 2007 New Revision: 30102 URL: http://svn.reactos.org/svn/reactos?rev=30102&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Fix tapiui's resources. Modified: trunk/reactos/dll/win32/tapiui/lang/de-DE.rc trunk/reactos/dll/win32/tapiui/lang/en-US.rc trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/tapiui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/tapiui/lang/de-DE.rc Sun Nov 4 12:55:29 2007 @@ -4,7 +4,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Wählregeln" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 201, 2000, 7, 7, 21, 20 LTEXT "&Standorte:", -1, 7, 35, 210, 8 LTEXT "In der folgenden Liste sind alle Standorte aufgelistet. Wählen Sie den Standort aus, von dem aus gewählt wird.", -1, 35, 12, 210, 16 @@ -14,13 +14,13 @@ PUSHBUTTON "&Löschen", 1032, 195, 155, 50, 14 LTEXT "Rufnummer wird gewählt als:", 1052, 7, 181, 100, 8 LTEXT "", 1053, 14, 195, 224, 16 -} +END 102 DIALOG 0, 0, 252, 255 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Allgemein" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 202, 2000, 7, 7, 20, 20 LTEXT "Standort&name:", -1, 35, 12, 56, 8, SS_CENTERIMAGE EDITTEXT 1038, 96, 9, 149, 14, ES_AUTOHSCROLL @@ -46,13 +46,13 @@ AUTORADIOBUTTON "&Impuls", 1037, 122, 192, 50, 10, NOT WS_TABSTOP LTEXT "Telefonnummer wird gewählt als:", 1052, 7, 219, 105, 8 LTEXT "", 1053, 14, 232, 224, 16 -} +END 103 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Vorwahlregeln" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Eine Vorwahlregel bestimmt, wie Rufnummern eines anderen Vorwahl- bereichs vom aktuellen Vorwahlbereich aus und innerhalb des eigenen Vorwahlbereichs gewählt werden.", 2000, 7, 7, 238, 24 LTEXT "&Vorwahlregeln:", -1, 7, 31, 238, 8 CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE @@ -61,13 +61,13 @@ PUSHBUTTON "&Löschen", 1032, 195, 145, 50, 14 GROUPBOX "Bezeichnung", 2006, 7, 166, 238, 45 LTEXT "", 1039, 14, 180, 224, 24 -} +END 104 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Callingcard" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Wählen Sie die Callingcard, die Sie verwenden möchten, oder klicken Sie auf Neu, um eine andere Karte hinzuzufügen.", 2000, 7, 7, 238, 16 LTEXT "Karten&typen:", -1, 7, 23, 238, 8 CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 34, 238, 63, WS_EX_CLIENTEDGE @@ -85,13 +85,13 @@ LTEXT "", 1043, 102, 184, 136, 8 LTEXT "Ortsgespräche:", -1, 14, 196, 84, 8 LTEXT "", 1051, 102, 196, 136, 8 -} +END 105 DIALOG 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Allgemein" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 203, 2000, 7, 7, 20, 20 LTEXT "&Callingcardname:", -1, 35, 12, 64, 8, SS_CENTERIMAGE EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL @@ -104,13 +104,13 @@ LTEXT "", 1000, 22, 131, 216, 8 LTEXT "", 1001, 22, 143, 216, 8 LTEXT "", 1002, 22, 155, 216, 8 -} +END 106 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Ferngespräche" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Zugriffsnummer &für Ferngespräche:", -1, 7, 7, 238, 8 EDITTEXT 1044, 7, 18, 116, 14, ES_AUTOHSCROLL LTEXT "Klicken Sie auf die Schaltflächen unten, um Wählschritte für Ferngespräche einzugeben. Geben Sie diese Schritte in der für die Callingcard gültigen Reihenfolge ein.", 2000, 7, 40, 238, 24 @@ -125,13 +125,13 @@ PUSHBUTTON "Z&ielnummer...", 1020, 101, 179, 90, 14 PUSHBUTTON "&Auf Aufforderung warten...", 1017, 7, 197, 90, 14 PUSHBUTTON "Ziffern a&ngeben...", 1021, 101, 197, 90, 14 -} +END 107 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Auslandsgespräche" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Zugriffsnummer &für Auslandsgespräche:", -1, 7, 7, 238, 8 EDITTEXT 1045, 7, 18, 116, 14, ES_AUTOHSCROLL LTEXT "Klicken Sie auf die Schaltflächen unten, um Wählschritte für Auslands- gespräche einzugeben. Geben Sie diese Schritte in der für die Callingcard gültigen Reihenfolge ein.", 2000, 7, 40, 244, 24 @@ -146,13 +146,13 @@ PUSHBUTTON "Z&ielnummer...", 1020, 101, 179, 90, 14 PUSHBUTTON "&Auf Aufforderung warten...", 1017, 7, 197, 90, 14 PUSHBUTTON "Ziffern a&ngeben...", 1021, 101, 197, 90, 14 -} +END 108 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Ortsgespräche" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Zugriffsnummer &für Ortsgespräche:", -1, 7, 7, 238, 8 EDITTEXT 1008, 7, 18, 116, 14, ES_AUTOHSCROLL LTEXT "Klicken Sie auf die Schaltflächen unten, um Wählschritte für Ortsgespräche einzugeben. Geben Sie diese Schritte in der für die Callingcard gültigen Reihenfolge ein.", 2000, 7, 40, 238, 24 @@ -167,14 +167,14 @@ PUSHBUTTON "Z&ielnummer...", 1020, 101, 179, 90, 14 PUSHBUTTON "&Auf Aufforderung warten...", 1017, 7, 197, 90, 14 PUSHBUTTON "Ziffern a&ngeben...", 1021, 101, 197, 90, 14 -} +END 109 DIALOGEX 0, 0, 252, 257 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Neue Vorwahlregel" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Diese Vorwahlregel wird nur für Anrufe der Vorwahl- und Präfixkombination verwendet, die unten angegeben ist.", 2000, 7, 7, 238, 16 LTEXT "Zu wählende Vorwahl:", -1, 7, 31, 110, 8 LTEXT "&Vorwahl:", -1, 7, 45, 36, 8 @@ -199,26 +199,26 @@ RTEXT "X - X X X - X X X - X X X X", 2005, 133, 48, 112, 8 GROUPBOX "Präfixe", -1, 7, 64, 238, 102 GROUPBOX "Regeln", -1, 7, 170, 238, 60 -} +END 110 DIALOGEX 0, 0, 227, 82 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "", 1003, 7, 7, 213, 8 LTEXT "", 1039, 7, 23, 213, 8 EDITTEXT 1031, 7, 34, 213, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 116, 61, 50, 14 PUSHBUTTON "Abbrechen", 2, 170, 61, 50, 14 -} +END 111 DIALOGEX 0, 0, 252, 124 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Warten auf" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Wählen Sie den Typ der Eingabeaufforderung, auf den gewartet werden soll, bevor die Wählsequenz fortgesetzt wird.", 2000, 7, 7, 238, 16 AUTORADIOBUTTON "Auf &Freizeichen warten", 1009, 7, 31, 238, 10, WS_GROUP AUTORADIOBUTTON "&Auf das Ende einer Sprachnachricht warten", 1016, 7, 47, 238, 10, NOT WS_TABSTOP @@ -228,27 +228,27 @@ CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 77, 11, 14 DEFPUSHBUTTON "OK", 1, 141, 103, 50, 14 PUSHBUTTON "Abbrechen", 2, 195, 103, 50, 14 -} +END 112 DIALOGEX 0, 0, 252, 111 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Zielnummer" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Dieser Schritt wird die Zielrufummer in die Callingcard-Wählfolge einfügen. Welche Teile der Zielrufnummer sollen gewählt werden, wenn sie die Zielnummer anwählen?", 2000, 7, 7, 238, 24 AUTOCHECKBOX "&Landes-/Regionalkennzahl wählen", 1027, 7, 39, 238, 10 AUTOCHECKBOX "&Vorwahl wählen", 1034, 7, 55, 238, 10 AUTOCHECKBOX "&Rufnummer wählen", 1008, 7, 71, 238, 10, WS_DISABLED DEFPUSHBUTTON "OK", 1, 141, 91, 50, 14 PUSHBUTTON "Abbrechen", 2, 195, 91, 50, 14 -} +END 113 DIALOG 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Erweitert" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 201, 2000, 7, 7, 20, 20 LTEXT "Die folgenden Telefonieanbieter sind auf diesem Computer installiert:", -1, 40, 12, 205, 16 LTEXT "&Anbieter:", -1, 7, 35, 238, 8 @@ -256,26 +256,26 @@ PUSHBUTTON "&Hinzufügen...", 1005, 87, 197, 50, 14 PUSHBUTTON "&Entfernen", 1024, 141, 197, 50, 14 PUSHBUTTON "&Konfigurieren...", 1031, 195, 197, 50, 14 -} +END 114 DIALOG 20, 15, 252, 127 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Anbieter hinzufügen" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Wählen Sie die zu installierenden Anbieter aus der Liste aus und klicken Sie dann auf Hinzufügen.", 2000, 7, 7, 241, 16 LTEXT "&Telefonieanbieter:", -1, 7, 23, 144, 10 LISTBOX 1055, 7, 34, 238, 74, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "&Hinzufügen", 1005, 141, 106, 50, 14 DEFPUSHBUTTON "Abbrechen", 2, 195, 106, 50, 14 -} +END 115 DIALOGEX 10, 10, 303, 228 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Standortinformationen" FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155 LTEXT "Bevor Sie Telefon- oder Modemverbindungen herstellen können, müssen Sie folgende Informationen bezüglich Ihres Standorts angeben.", 2000, 107, 15, 188, 25 LTEXT "In welchem &Land/Region sind Sie?", -1, 107, 43, 189, 10 @@ -291,12 +291,12 @@ AUTORADIOBUTTON "&Impulswahl", 1037, 175, 178, 57, 14, NOT WS_TABSTOP DEFPUSHBUTTON "OK", 1, 192, 204, 50, 14 PUSHBUTTON "Abbrechen", 2, 246, 204, 50, 14 -} +END 400 DIALOG 0, 0, 290, 151 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL 302, 302, "STATIC", SS_BITMAP, 0, 0, 88, 155 LTEXT "Bevor Sie Telefon- oder Modemverbindungen herstellen können, müssen Sie folgende Informationen bezüglich Ihres Standorts angeben.", 2000, 95, 0, 188, 25 LTEXT "In welchem &Land/Region sind Sie?", -1, 95, 30, 188, 10 @@ -308,22 +308,22 @@ LTEXT "An diesem Standort angewandtes Wählverfahren:", -1, 95, 129, 159, 10 AUTORADIOBUTTON "&Tonwahl", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "&Impulswahl", 1037, 155, 139, 55, 12, NOT WS_TABSTOP -} +END 500 DIALOG 0, 0, 235, 88 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS Explorer" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 504, 501, 13, 14, 21, 20 LTEXT "", 502, 47, 15, 180, 32 AUTOCHECKBOX "&Dieser Seite in Zukunft immer vertrauen", 503, 47, 47, 147, 12 DEFPUSHBUTTON "&OK", 505, 110, 65, 50, 14 PUSHBUTTON "&Abbrechen", 506, 164, 65, 50, 14 -} +END STRINGTABLE -{ +BEGIN 1 "Telefon- und Modemoptionen" 2 "Konfiguriert Wählregeln und Modemeigenschaften." 3 "Standort" @@ -442,4 +442,4 @@ 15821 "20,\"Telstra (Australia) via 1818 (Fax)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" 15822 "21,\"Optus (Australia) via 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" 15823 "22,\"Optus (Australia) via 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -} +END Modified: trunk/reactos/dll/win32/tapiui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/tapiui/lang/en-US.rc Sun Nov 4 12:55:29 2007 @@ -4,27 +4,27 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Dialing Rules" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 201, 2000, 7, 7, 21, 20 + LTEXT "The list below displays the locations you have specified. Select the location from which you are dialing.", -1, 35, 7, 210, 16 LTEXT "&Locations:", -1, 7, 35, 210, 8 - LTEXT "The list below displays the locations you have specified. Select the location from which you are dialing.", -1, 35, 12, 210, 16 CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000011D, 7, 46, 238, 105, WS_EX_CLIENTEDGE PUSHBUTTON "&New...", 1030, 87, 155, 50, 14 PUSHBUTTON "&Edit...", 1031, 141, 155, 50, 14 PUSHBUTTON "&Delete", 1032, 195, 155, 50, 14 LTEXT "Phone number will be dialed as:", 1052, 7, 181, 100, 8 LTEXT "", 1053, 14, 195, 224, 16 -} +END 102 DIALOG 0, 0, 252, 255 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 202, 2000, 7, 7, 20, 20 - LTEXT "Location &name:", -1, 35, 12, 56, 8, SS_CENTERIMAGE - EDITTEXT 1038, 96, 9, 149, 14, ES_AUTOHSCROLL - LTEXT "Specify the location from which you will be dialing.", 2001, 7, 35, 238, 8 + LTEXT "Location &name:", -1, 35, 11, 56, 8, SS_CENTERIMAGE + EDITTEXT 1038, 96, 8, 149, 14, ES_AUTOHSCROLL + LTEXT "Specify the location from which you will be dialing.", 2001, 7, 33, 238, 8 LTEXT "Country/&region:", -1, 7, 49, 161, 8 COMBOBOX 1006, 7, 60, 175, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "Area &code:", -1, 190, 49, 48, 8 @@ -39,41 +39,41 @@ EDITTEXT 1059, 190, 136, 48, 12, ES_AUTOHSCROLL LTEXT "Use this carrier code to make &international calls:", -1, 14, 154, 170, 8 EDITTEXT 1060, 190, 152, 48, 12, ES_AUTOHSCROLL - AUTOCHECKBOX "To disable call &waiting, dial:", 1035, 14, 175, 170, 10 - COMBOBOX 1013, 190, 174, 48, 73, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL - LTEXT "Dial using:", -1, 14, 193, 40, 8 - AUTORADIOBUTTON "&Tone", 1036, 58, 192, 50, 10, NOT WS_TABSTOP - AUTORADIOBUTTON "&Pulse", 1037, 112, 192, 50, 10, NOT WS_TABSTOP + AUTOCHECKBOX "To disable call &waiting, dial:", 1035, 14, 177, 170, 10 + COMBOBOX 1013, 190, 176, 48, 73, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL + LTEXT "Dial using:", -1, 14, 195, 40, 8 + AUTORADIOBUTTON "&Tone", 1036, 58, 194, 50, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "&Pulse", 1037, 112, 194, 50, 10, NOT WS_TABSTOP LTEXT "Phone number will be dialed as:", 1052, 7, 219, 100, 8 LTEXT "", 1053, 14, 232, 224, 16 -} +END 103 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Area Code Rules" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "An area code rule determines how phone numbers are dialed from your current area code to other area codes and within your area code.", 2000, 7, 7, 238, 16 LTEXT "Area &code rules:", -1, 7, 31, 238, 8 CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE - PUSHBUTTON "&New...", 1030, 87, 145, 50, 14 - PUSHBUTTON "&Edit...", 1031, 141, 145, 50, 14 - PUSHBUTTON "&Delete", 1032, 195, 145, 50, 14 + PUSHBUTTON "&New...", 1030, 87, 147, 50, 14 + PUSHBUTTON "&Edit...", 1031, 141, 147, 50, 14 + PUSHBUTTON "&Delete", 1032, 195, 147, 50, 14 GROUPBOX "Description", 2006, 7, 166, 238, 45 LTEXT "", 1039, 14, 180, 224, 24 -} +END 104 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Calling Card" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Select the calling card you will use, or click New to add a different card.", 2000, 7, 7, 238, 8 LTEXT "Card &Types:", -1, 7, 23, 238, 8 CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 34, 238, 63, WS_EX_CLIENTEDGE - PUSHBUTTON "&New...", 1030, 87, 101, 50, 14 - PUSHBUTTON "&Edit...", 1031, 141, 101, 50, 14 - PUSHBUTTON "&Delete", 1032, 195, 101, 50, 14 + PUSHBUTTON "&New...", 1030, 87, 103, 50, 14 + PUSHBUTTON "&Edit...", 1031, 141, 103, 50, 14 + PUSHBUTTON "&Delete", 1032, 195, 103, 50, 14 LTEXT "A&ccount number:", -1, 7, 127, 91, 8 EDITTEXT 1018, 102, 125, 143, 12, ES_AUTOHSCROLL LTEXT "&Personal ID Number (PIN):", -1, 7, 145, 91, 8 @@ -85,34 +85,34 @@ LTEXT "", 1043, 102, 184, 136, 8 LTEXT "Local calls:", -1, 14, 196, 84, 8 LTEXT "", 1051, 102, 196, 136, 8 -} +END 105 DIALOG 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 203, 2000, 7, 7, 20, 20 LTEXT "&Calling card name:", -1, 35, 12, 64, 8, SS_CENTERIMAGE EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL LTEXT "Account &number:", -1, 7, 35, 238, 8 EDITTEXT 1018, 7, 46, 116, 14, ES_AUTOHSCROLL LTEXT "&Personal Identification Number (PIN):", -1, 7, 68, 238, 8 - EDITTEXT 1019, 7, 79, 116, 14, ES_AUTOHSCROLL + EDITTEXT 1019, 7, 80, 116, 14, ES_AUTOHSCROLL LTEXT "This calling card will be used when:", 1056, 14, 117, 224, 8 GROUPBOX "Calling card details", 2001, 7, 105, 238, 66 LTEXT "", 1000, 22, 131, 216, 8 LTEXT "", 1001, 22, 143, 216, 8 LTEXT "", 1002, 22, 155, 216, 8 -} +END 106 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Long Distance" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Access number for &long distance calls:", -1, 7, 7, 238, 8 - EDITTEXT 1044, 7, 18, 116, 14, ES_AUTOHSCROLL + EDITTEXT 1044, 7, 18, 140, 14, ES_AUTOHSCROLL LTEXT "Use the buttons below to enter the dialing steps for making long-distance calls. Enter these steps in the exact order as they appear on your calling card.", 2000, 7, 40, 238, 24 LTEXT "Calling ca&rd dialing steps:", -1, 7, 72, 80, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE @@ -125,15 +125,15 @@ PUSHBUTTON "D&estination Number...", 1020, 101, 179, 90, 14 PUSHBUTTON "&Wait for Prompt...", 1017, 7, 197, 90, 14 PUSHBUTTON "&Specify Digits...", 1021, 101, 197, 90, 14 -} +END 107 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "International" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Access number for &international calls:", -1, 7, 7, 238, 8 - EDITTEXT 1045, 7, 18, 116, 14, ES_AUTOHSCROLL + EDITTEXT 1045, 7, 18, 140, 14, ES_AUTOHSCROLL LTEXT "Use the buttons below to enter the dialing steps for making international calls. Enter these steps in the exact order as they appear on your calling card.", 2000, 7, 40, 244, 24 LTEXT "Calling ca&rd dialing steps:", -1, 7, 72, 80, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE @@ -146,15 +146,15 @@ PUSHBUTTON "D&estination Number...", 1020, 101, 179, 90, 14 PUSHBUTTON "&Wait for Prompt...", 1017, 7, 197, 90, 14 PUSHBUTTON "&Specify Digits...", 1021, 101, 197, 90, 14 -} +END 108 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Local Calls" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Access number for &local calls:", -1, 7, 7, 238, 8 - EDITTEXT 1008, 7, 18, 116, 14, ES_AUTOHSCROLL + EDITTEXT 1008, 7, 18, 140, 14, ES_AUTOHSCROLL LTEXT "Use the buttons below to enter the dialing steps for making local calls. Enter these steps in the exact order as they appear on your calling card. To make local calls without using your calling card, leave this section blank.", 2000, 7, 40, 238, 24 LTEXT "Calling ca&rd dialing steps:", -1, 7, 72, 238, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE @@ -167,18 +167,18 @@ PUSHBUTTON "D&estination Number...", 1020, 101, 179, 90, 14 PUSHBUTTON "&Wait for Prompt...", 1017, 7, 197, 90, 14 PUSHBUTTON "&Specify Digits...", 1021, 101, 197, 90, 14 -} +END 109 DIALOGEX 0, 0, 252, 257 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "New Area Code Rule" FONT 8, "MS Shell Dlg" -{ - LTEXT "This area code rule will only apply to calls made to the area code and prefix combination you specify below.", 2000, 7, 7, 238, 16 +BEGIN + LTEXT "This area code rule will only apply to calls made to the area code and prefix combination you specify below.", 2000, 7, 6, 238, 16 LTEXT "Area code you are calling:", -1, 7, 31, 110, 8 - LTEXT "A&rea code:", -1, 7, 45, 36, 8 - EDITTEXT 1034, 46, 42, 50, 14, ES_AUTOHSCROLL + LTEXT "A&rea code:", -1, 7, 47, 36, 8 + EDITTEXT 1034, 46, 44, 50, 14, ES_AUTOHSCROLL LTEXT "Specify the prefixes to be used for this area code rule.", -1, 14, 78, 224, 8 AUTORADIOBUTTON "&Include all the prefixes within this area code", 1014, 14, 90, 224, 12, NOT WS_TABSTOP AUTORADIOBUTTON "Include &only the prefixes in the list below:", 1015, 14, 104, 224, 12, NOT WS_TABSTOP @@ -199,131 +199,131 @@ RTEXT "X - X X X - X X X - X X X X", 2005, 133, 48, 112, 8 GROUPBOX "Prefixes", -1, 7, 64, 238, 102 GROUPBOX "Rules", -1, 7, 170, 238, 60 -} +END 110 DIALOGEX 0, 0, 227, 82 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "", 1003, 7, 7, 213, 8 LTEXT "", 1039, 7, 23, 213, 8 EDITTEXT 1031, 7, 34, 213, 14, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", 1, 116, 61, 50, 14 - PUSHBUTTON "Cancel", 2, 170, 61, 50, 14 -} + DEFPUSHBUTTON "OK", 1, 116, 62, 50, 14 + PUSHBUTTON "Cancel", 2, 170, 62, 50, 14 +END 111 DIALOGEX 0, 0, 252, 124 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Wait for" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Select the type of prompt to wait for before continuing with the dialing sequence.", 2000, 7, 7, 238, 16 AUTORADIOBUTTON "Wait for a &dial tone", 1009, 7, 31, 238, 10, WS_GROUP AUTORADIOBUTTON "Wait for a &voice message to complete", 1016, 7, 47, 238, 10, NOT WS_TABSTOP AUTORADIOBUTTON "Wait for a specific length of &time:", 1048, 7, 63, 238, 10, NOT WS_TABSTOP - LTEXT "&seconds", -1, 58, 80, 187, 8 EDITTEXT 1050, 18, 77, 36, 14, ES_AUTOHSCROLL | WS_GROUP - CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 77, 11, 14 + CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 78, 11, 14 + LTEXT "&seconds", -1, 58, 81, 187, 8 DEFPUSHBUTTON "OK", 1, 141, 103, 50, 14 PUSHBUTTON "Cancel", 2, 195, 103, 50, 14 -} +END 112 DIALOGEX 0, 0, 252, 111 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Destination number" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "This step will place the destination number that you will be dialing into the calling card sequence. When dialing the destination number, which parts of the number do you want to dial?", 2000, 7, 7, 238, 24 AUTOCHECKBOX "Dial the &country/region code", 1027, 7, 39, 238, 10 AUTOCHECKBOX "Dial the &area code", 1034, 7, 55, 238, 10 AUTOCHECKBOX "Dial the &number", 1008, 7, 71, 238, 10, WS_DISABLED - DEFPUSHBUTTON "OK", 1, 141, 91, 50, 14 - PUSHBUTTON "Cancel", 2, 195, 91, 50, 14 -} + DEFPUSHBUTTON "OK", 1, 141, 92, 50, 14 + PUSHBUTTON "Cancel", 2, 195, 92, 50, 14 +END 113 DIALOG 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 201, 2000, 7, 7, 20, 20 - LTEXT "The following telephony providers are installed on this computer:", -1, 40, 12, 205, 8 + LTEXT "The following telephony providers are installed on this computer:", -1, 40, 7, 205, 8 LTEXT "&Providers:", -1, 7, 35, 238, 8 LISTBOX 1033, 7, 46, 238, 147, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | WS_TABSTOP PUSHBUTTON "A&dd...", 1005, 87, 197, 50, 14 PUSHBUTTON "&Remove", 1024, 141, 197, 50, 14 PUSHBUTTON "&Configure...", 1031, 195, 197, 50, 14 -} +END 114 DIALOG 20, 15, 252, 127 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Add Provider" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Select the provider you wish to install from the list below, and click Add.", 2000, 7, 7, 241, 8 LTEXT "&Telephony providers:", -1, 7, 23, 144, 10 LISTBOX 1055, 7, 34, 238, 74, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "&Add", 1005, 141, 106, 50, 14 DEFPUSHBUTTON "Cancel", 2, 195, 106, 50, 14 -} +END 115 DIALOGEX 10, 10, 303, 228 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Location Information" FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155 LTEXT "Before you can make any phone or modem connections, Windows needs the following information about your current location.", 2000, 107, 15, 188, 25 LTEXT "&What country/region are you in now?", -1, 107, 43, 189, 10 COMBOBOX 1006, 107, 55, 180, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - LTEXT "What area &code (or city code) are you in now?", -1, 107, 73, 189, 10 - EDITTEXT 1034, 107, 87, 40, 12, ES_AUTOHSCROLL - LTEXT "If you need to specify a ca&rrier code, what is it?", -1, 107, 104, 189, 10 - EDITTEXT 1058, 106, 118, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL - LTEXT "If you dial a number to access an &outside line, what is it?", -1, 107, 136, 189, 10 - EDITTEXT 1010, 107, 149, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL - LTEXT "The phone system at this location uses:", -1, 107, 167, 189, 10 + LTEXT "What area &code (or city code) are you in now?", -1, 107, 74, 189, 10 + EDITTEXT 1034, 107, 87, 45, 12, ES_AUTOHSCROLL + LTEXT "If you need to specify a ca&rrier code, what is it?", -1, 107, 105, 189, 10 + EDITTEXT 1058, 106, 118, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "If you dial a number to access an &outside line, what is it?", -1, 107, 137, 189, 10 + EDITTEXT 1010, 107, 149, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "The phone system at this location uses:", -1, 107, 168, 189, 10 AUTORADIOBUTTON "&Tone dialing", 1036, 107, 178, 57, 14, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "&Pulse dialing", 1037, 175, 178, 57, 14, NOT WS_TABSTOP DEFPUSHBUTTON "OK", 1, 192, 204, 50, 14 PUSHBUTTON "Cancel", 2, 246, 204, 50, 14 -} +END 400 DIALOG 0, 0, 290, 151 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL 302, 302, "STATIC", SS_BITMAP, 0, 0, 88, 155 - LTEXT "Before you can make any phone or modem connections, Windows needs the following information about your current location.", 2000, 95, 0, 188, 25 + LTEXT "Before you can make any phone or modem connections, Windows needs the following information about your current location.", 2000, 95, 2, 188, 25 LTEXT "&What country/region are you in now?", -1, 95, 30, 188, 10 COMBOBOX 1006, 95, 41, 177, 68, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - LTEXT "What area &code (or city code) are you in now?", -1, 95, 60, 188, 10 + LTEXT "What area &code (or city code) are you in now?", -1, 95, 61, 188, 10 EDITTEXT 1034, 95, 73, 40, 14, ES_AUTOHSCROLL LTEXT "If you dial a number to access an &outside line, what is it?", -1, 95, 96, 188, 10 EDITTEXT 1010, 95, 107, 40, 14, ES_UPPERCASE | ES_AUTOHSCROLL LTEXT "The phone system at this location uses:", -1, 95, 129, 159, 10 AUTORADIOBUTTON "&Tone dialing", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "&Pulse dialing", 1037, 155, 139, 55, 12, NOT WS_TABSTOP -} +END 500 DIALOG 0, 0, 235, 88 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS Explorer" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 504, 501, 13, 14, 21, 20 LTEXT "", 502, 47, 15, 180, 32 - AUTOCHECKBOX "&In the future, always trust this page", 503, 47, 47, 147, 12 + AUTOCHECKBOX "&In the future, always trust this page", 503, 50, 47, 147, 12 DEFPUSHBUTTON "&OK", 505, 110, 65, 50, 14 PUSHBUTTON "&Cancel", 506, 164, 65, 50, 14 -} +END STRINGTABLE -{ +BEGIN 1 "Phone and Modem Options" 2 "Configure dialing rules and properties for using your modem." 3 "Location" @@ -443,4 +443,4 @@ 15821 "20,\"Telstra (Australia) via 1818 (fax)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" 15822 "21,\"Optus (Australia) via 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" 15823 "22,\"Optus (Australia) via 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -} +END Modified: trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc Sun Nov 4 12:55:29 2007 @@ -4,7 +4,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Íàáîð íîìåðà" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 201, 2000, 7, 7, 21, 20 LTEXT "&Ðàçìåùåíèå:", -1, 7, 43, 210, 8 LTEXT "Â ñïèñêå ñîäåðæàòñÿ óêàçàííûå ìåñòîïîëîæåíèÿ. Âûáåðèòå ìåñòî, èç êîòîðîãî ïðîèçâîäèòñÿ íàáîð íîìåðà.", -1, 35, 12, 210, 24 @@ -14,13 +14,13 @@ PUSHBUTTON "&Óäàëèòü", 1032, 195, 163, 50, 14 LTEXT "Íîìåð òåëåôîíà áóäåò íàáðàí êàê:", 1052, 7, 189, 121, 8 LTEXT "", 1053, 14, 203, 224, 16 -} +END 102 DIALOG 0, 0, 252, 255 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Îáùèå" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 202, 2000, 7, 7, 21, 20 LTEXT "&Èìÿ ìåñòîïîëîæåíèÿ:", -1, 35, 12, 79, 8, SS_CENTERIMAGE EDITTEXT 1038, 118, 9, 127, 14, ES_AUTOHSCROLL @@ -46,13 +46,13 @@ AUTORADIOBUTTON "èì&ïóëüñíûé", 1037, 177, 192, 54, 10, NOT WS_TABSTOP LTEXT "Íîìåð òåëåôîíà áóäåò íàáðàí êàê:", 1052, 7, 219, 126, 8 LTEXT "", 1053, 14, 232, 224, 16 -} +END 103 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Êîä ãîðîäà" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Ïðàâèëî íàáîðà íîìåðà îïðåäåëÿåò ñïîñîá íàáîðà íîìåðîâ ñ òàêèì æå èëè äðóãèì êîäîì ãîðîäà.", 2000, 7, 7, 238, 16 LTEXT "&Ïðàâèëà íàáîðà íîìåðà:", -1, 7, 31, 238, 8 CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE @@ -61,13 +61,13 @@ PUSHBUTTON "&Óäàëèòü", 1032, 195, 145, 50, 14 GROUPBOX "Îïèñàíèå", 2006, 7, 166, 238, 45 LTEXT "", 1039, 14, 180, 224, 24 -} +END 104 DIALOGEX 0, 0, 252, 234 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Òåëåôîííàÿ êàðòî÷êà" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Âûáåðèòå èñïîëüçóåìóþ òåëåôîííóþ êàðòî÷êó èëè íàæìèòå êíîïêó ""Ñîçäàòü"" äëÿ äîáàâëåíèÿ äðóãîé êàðòî÷êè.", 2000, 7, 7, 238, 8 LTEXT "&Òèïû êàðòî÷åê:", -1, 7, 31, 238, 8 CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 42, 238, 63, WS_EX_CLIENTEDGE @@ -85,13 +85,13 @@ LTEXT "", 1043, 106, 192, 132, 8 LTEXT "ìåñòíûõ çâîíêîâ:", -1, 14, 204, 84, 8 LTEXT "", 1051, 106, 204, 132, 8 -} +END 105 DIALOG 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Îáùèå" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 203, 2000, 7, 7, 21, 20 LTEXT "&Èìÿ êàðòî÷êè:", -1, 35, 12, 64, 8, SS_CENTERIMAGE EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL @@ -104,13 +104,13 @@ LTEXT "", 1000, 22, 131, 216, 8 LTEXT "", 1001, 22, 143, 216, 8 LTEXT "", 1002, 22, 155, 216, 8 -} +END 106 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Ìåæäóãîðîäíûå çâîíêè" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "&Íîìåð äëÿ âûõîäà íà ìåæäóãîðîäíóþ ëèíèþ:", -1, 7, 7, 238, 8 EDITTEXT 1044, 7, 18, 116, 14, ES_AUTOHSCROLL LTEXT "Óêàæèòå ïîñëåäîâàòåëüíîñòü âûõîäà íà ìåæäóãîðîäíóþ ëèíèþ. Ïîñëåäîâàòåëüíîñòü øàãîâ äîëæíà ñîâïàäàòü ñ ïðèâåäåííîé íà êàðòî÷êå.", 2000, 7, 40, 238, 24 @@ -125,13 +125,13 @@ PUSHBUTTON "Â&ûçûâàåìûé íîìåð...", 1020, 101, 179, 90, 14 PUSHBUTTON "Î&æèäàíèå...", 1017, 7, 197, 90, 14 PUSHBUTTON "Ââ&åäèòå öèôðû...", 1021, 101, 197, 90, 14 -} +END 107 DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Ìåæäóíàðîäíàÿ ñâÿçü" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "&Íîìåð äëÿ âûõîäà íà ìåæäóíàðîäíóþ ëèíèþ:", -1, 7, 7, 238, 8 EDITTEXT 1045, 7, 18, 116, 14, ES_AUTOHSCROLL LTEXT "Óêàæèòå ïîñëåäîâàòåëüíîñòü âûõîäà íà ìåæäóíàðîäíóþ ëèíèþ. Ïîñëåäîâàòåëüíîñòü øàãîâ äîëæíà ñîâïàäàòü ñ ïðèâåäåííîé íà êàðòî÷êå.", 2000, 7, 40, 244, 24 @@ -146,13 +146,13 @@ PUSHBUTTON "Â&ûçûâàåìûé íîìåð...", 1020, 101, 179, 90, 14 PUSHBUTTON "Î&æèäàíèå...", 1017, 7, 197, 90, 14 PUSHBUTTON "Ââ&åäèòå öèôðû...", 1021, 101, 197, 90, 14 -} +END 108 DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Ìåñòíûå çâîíêè" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "&Íîìåð äëÿ âûõîäà íà âíåøíþþ ëèíèþ:", -1, 7, 7, 238, 8 EDITTEXT 1008, 7, 18, 132, 14, ES_AUTOHSCROLL LTEXT "Óêàæèòå ïîñëåäîâàòåëüíîñòü âûõîäà íà ìåñòíóþ ëèíèþ. Ïîñëåäîâàòåëüíîñòü øàãîâ äîëæíà ñîâïàäàòü ñ ïðèâåäåííîé íà êàðòî÷êå. Äëÿ âûïîëíåíèÿ çâîíêîâ áåç èñïîëüçîâàíèÿ òåëåôîííîé êàðòî÷êè îñòàâüòå ïîëÿ ïóñòûìè.", 2000, 7, 40, 238, 32 @@ -167,14 +167,14 @@ PUSHBUTTON "Â&ûçûâàåìûé íîìåð...", 1020, 101, 187, 90, 14 PUSHBUTTON "Î&æèäàíèå...", 1017, 7, 205, 90, 14 PUSHBUTTON "Ââ&åäèòå öèôðû...", 1021, 101, 205, 90, 14 -} +END 109 DIALOGEX 0, 0, 252, 257 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Íîâîå ïðàâèëî íàáîðà íîìåðà" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Ýòî ïðàâèëî áóäåò ïðèìåíÿòüñÿ òîëüêî ê çâîíêàì ñ óêàçàííûìè êîäîì ãîðîäà è ïðåôèêñîì.", 2000, 7, 7, 238, 16 LTEXT "Èñïîëüçóåìûé êîä ãîðîäà:", -1, 7, 31, 122, 8 LTEXT "Êîä &ãîðîäà:", -1, 7, 45, 41, 8 @@ -199,26 +199,26 @@ RTEXT "X - X X X - X X X - X X X X", 2005, 133, 48, 112, 8 GROUPBOX "Ïðåôèêñû", -1, 7, 64, 238, 102 GROUPBOX "Ïðàâèëà", -1, 7, 170, 238, 60 -} +END 110 DIALOGEX 0, 0, 227, 82 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "", 1003, 7, 7, 213, 8 LTEXT "", 1039, 7, 23, 213, 8 EDITTEXT 1031, 7, 34, 213, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 116, 61, 50, 14 PUSHBUTTON "Îòìåíà", 2, 170, 61, 50, 14 -} +END 111 DIALOGEX 0, 0, 252, 124 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Îæèäàíèå" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Âûáåðèòå òèï îæèäàåìîãî ñèãíàëà ïåðåä ïðîäîëæåíèåì íàáîðà íîìåðà.", 2000, 7, 7, 238, 16 AUTORADIOBUTTON "Æäàòü &ãóäêà", 1009, 7, 31, 238, 10, WS_GROUP AUTORADIOBUTTON "Æäàòü &çàâåðøåíèÿ ãîëîñîâîãî ñîîáùåíèÿ", 1016, 7, 47, 238, 10, NOT WS_TABSTOP @@ -228,27 +228,27 @@ CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 77, 11, 14 DEFPUSHBUTTON "OK", 1, 141, 103, 50, 14 PUSHBUTTON "Îòìåíà", 2, 195, 103, 50, 14 -} +END 112 DIALOGEX 0, 0, 252, 111 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Âûçûâàåìûé íîìåð" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Íà ýòîì øàãå òðåáóåòñÿ óêàçàòü ñïîñîá íàáîðà íîìåðà ïðè èñïîëüçîâàíèè òåëåôîííîé êàðòî÷êè. Íàáîð êàêèõ ÷àñòåé íîìåðà òðåáóåòñÿ ïðîèçâîäèòü?", 2000, 7, 7, 238, 24 AUTOCHECKBOX "Íàáðàòü êîä &ñòðàíû/ðåãèîíà", 1027, 7, 39, 238, 10 AUTOCHECKBOX "Íàáðàòü êîä &ãîðîäà", 1034, 7, 55, 238, 10 AUTOCHECKBOX "Íàáðàòü &íîìåð", 1008, 7, 71, 238, 10, WS_DISABLED DEFPUSHBUTTON "OK", 1, 141, 91, 50, 14 PUSHBUTTON "Îòìåíà", 2, 195, 91, 50, 14 -} +END 113 DIALOG 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Äîïîëíèòåëüíî" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 201, 2000, 7, 7, 20, 20 LTEXT "Íà êîìïüþòåðå óñòàíîâëåíû ñëåäóþùèå ñëóæáû äîñòóïà ê òåëåôîíèè:", -1, 40, 12, 205, 16 LTEXT "Ñ&ëóæáû äîñòóïà:", -1, 7, 35, 238, 8 @@ -256,26 +256,26 @@ PUSHBUTTON "Äî&áàâèòü...", 1005, 87, 197, 50, 14 PUSHBUTTON "&Óäàëèòü", 1024, 141, 197, 50, 14 PUSHBUTTON "&Íàñòðîèòü...", 1031, 195, 197, 50, 14 -} +END 114 DIALOG 20, 15, 252, 135 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Óñòàíîâêà ñëóæáû äîñòóïà" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Âûáåðèòå óñòàíàâëèâàåìóþ ñëóæáó äîñòóïà èç ñïèñêà è íàæìèòå êíîïêó ""Äîáàâèòü"".", 2000, 7, 7, 241, 16 LTEXT "Ñ&ëóæáû äîñòóïà ê òåëåôîíèè:", -1, 7, 31, 155, 10 LISTBOX 1055, 7, 42, 238, 74, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "&Äîáàâèòü", 1005, 141, 114, 50, 14 DEFPUSHBUTTON "Îòìåíà", 2, 195, 114, 50, 14 -} +END 115 DIALOGEX 10, 10, 303, 228 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Ñâåäåíèÿ î ìåñòîíàõîæäåíèè" FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155 LTEXT "Ïåðåä ñîçäàíèåì òåëåôîííîãî èëè ìîäåìíîãî ïîäêëþ÷åíèÿ òðåáóåòñÿ ââåñòè ñâåäåíèÿ î âàøåì òåêóùåì íàõîæäåíèè.", 2000, 107, 15, 188, 25 LTEXT "&Ñòðàíà, ãäå âû ñåé÷àñ íàõîäèòåñü:", -1, 107, 43, 189, 10 @@ -291,12 +291,12 @@ AUTORADIOBUTTON "&èìïóëüñíûé íàáîð", 1037, 192, 178, 80, 14, NOT WS_TABSTOP DEFPUSHBUTTON "OK", 1, 192, 204, 50, 14 PUSHBUTTON "Îòìåíà", 2, 246, 204, 50, 14 -} +END 400 DIALOG 0, 0, 290, 151 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL 302, 302, "STATIC", SS_BITMAP, 0, 0, 88, 155 LTEXT "Ïåðåä ñîçäàíèåì òåëåôîííîãî èëè ìîäåìíîãî ïîäêëþ÷åíèÿ òðåáóåòñÿ ââåñòè ñâåäåíèÿ â âàøåì òåêóùåì íàõîæäåíèè.", 2000, 95, 0, 188, 25 LTEXT "&Ñòðàíà, ãäå âû ñåé÷àñ íàõîäèòåñü:", -1, 95, 30, 188, 10 @@ -308,22 +308,22 @@ LTEXT "Òèï íàáîðà íîìåðà:", -1, 95, 129, 159, 10 AUTORADIOBUTTON "&òîíîâûé íàáîð", 1036, 95, 139, 67, 12, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "&èìïóëüñíûé íàáîð", 1037, 167, 139, 79, 12, NOT WS_TABSTOP -} +END 500 DIALOG 0, 0, 235, 88 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Îáîçðåâàòåëü ReactOS" FONT 8, "MS Shell Dlg" -{ +BEGIN ICON 504, 501, 13, 14, 21, 20 LTEXT "", 502, 47, 15, 180, 32 AUTOCHECKBOX "&Âñåãäà äîâåðÿòü ñîäåðæèìîìó ýòîé ñòðàíèöû", 503, 47, 47, 180, 12 DEFPUSHBUTTON "&OK", 505, 110, 65, 50, 14 PUSHBUTTON "&Îòìåíà", 506, 164, 65, 50, 14 -} +END STRINGTABLE -{ +BEGIN 1 "Òåëåôîí è ìîäåì" 2 "Íàñòðîéêà ïðàâèë íàáîðà íîìåðà è èíûõ ïàðàìåòðîâ ïðè ðàáîòå ñ ìîäåìîì." 3 "Ðàçìåùåíèå" @@ -443,4 +443,4 @@ 15821 "20,\"Telstra (Àâñòðàëèÿ) ÷åðåç 1818 (ôàêñ)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" 15822 "21,\"Optus (Àâñòðàëèÿ) ÷åðåç 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" 15823 "22,\"Optus (Àâñòðàëèÿ) ÷åðåç 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -} +END

1 0

[fireball] 30101: Dmitry Chapyshev <lentind@yandex.ru> - Translate MSTSC to Russian language.
by fireball＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: fireball Date: Sun Nov 4 12:08:46 2007 New Revision: 30101 URL: http://svn.reactos.org/svn/reactos?rev=30101&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Translate MSTSC to Russian language. Added: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/mstsc/rsrc.rc Added: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc Sun Nov 4 12:08:46 2007 @@ -1,0 +1,53 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "????????? ?????",IDC_STATIC,7,7,228,89 + GROUPBOX "????????? ???????????",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "??????? ????? ???????",IDC_STATIC,47,24,81,8 + LTEXT "??????:",IDC_STATIC,47,41,25,8 + LTEXT "??? ????????????:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "?????????",IDC_SAVE,67,139,50,14 + PUSHBUTTON "????????? ???...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "???????...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "????????? ??????? ????????? ??????????? ??? ??????? ??????????? ????????????",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "?????? ?????????? ???????? ?????",IDC_STATIC,7,7,228,68 + GROUPBOX "?????",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "?????????? ?????? ?????? ?? ????????? ??????????. ?????????? ???????? ? ??????? ?????? ????????? ??? ???????? ? ????????????? ?????.",IDC_STATIC,53,22,175,21 + CONTROL "",IDC_GEOSLIDER,"msctls_trackbar32",WS_TABSTOP,56,49,124,15 + COMBOBOX IDC_BPPCOMBO,56,102,128,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,13 + LTEXT "??????????: ????????? ?????????? ?????????? ?????????? ??? ?????????.",IDC_STATIC,56,143,165,18 + LTEXT "??????",IDC_STATIC,35,52,15,8 + LTEXT "??????",IDC_STATIC,189,51,17,8 +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 277 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "??????????? ? ?????????? ???????? ?????" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "??????????",IDOK,147,256,50,14 + PUSHBUTTON "??????",IDCANCEL,203,256,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,54,246,198 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "?????" + IDS_TAB_DISPLAY "?????" +END Propchange: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Sun Nov 4 12:08:46 2007 @@ -14,3 +14,4 @@ IDB_SPECT BITMAP "res/spectrum.bmp" #include "lang/en-US.rc" +#include "lang/ru-RU.rc"

1 0

[jimtabor] 30100: Fix types in header.
by jimtabor＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: jimtabor Date: Sun Nov 4 06:52:17 2007 New Revision: 30100 URL: http://svn.reactos.org/svn/reactos?rev=30100&view=rev Log: Fix types in header. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Sun Nov 4 06:52:17 2007 @@ -272,10 +272,10 @@ { GDIBATCHHDR gbHdr; int fnMode; - HANDLE hbrush; - HANDLE hpen; - COLORREF crBackgroundClr; - ULONG ulBackgroundClr; + LONG right; + LONG bottom; + LONG left; + LONG top; } GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; // // Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn.

1 0

← Newer
1
...
79
80
81
82
83
84
85
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007