Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[ion] 26139: - Change FASTCALL_PROLOG to use the stack to update FS, since we run in the DPC stack. - Implement KeDisableInterrupts to disable interrupts and return whether or not they were enabled. - Implement KiCheckTimerTable, in DBG mode, to validate the timer tables. - Implement DPC Timeout detection, in DBG mode. - Fix a bug in KiQuantumEnd which would've affected real-time threads. - Fix some bugs in KiRetireDpcList to avoid issues should the DPC Queue Depth drop below 0, and solve some p

by ion＠svn.reactos.org

Author: ion Date: Mon Mar 19 20:55:38 2007 New Revision: 26139 URL: http://svn.reactos.org/svn/reactos?rev=26139&view=rev Log: - Change FASTCALL_PROLOG to use the stack to update FS, since we run in the DPC stack. - Implement KeDisableInterrupts to disable interrupts and return whether or not they were enabled. - Implement KiCheckTimerTable, in DBG mode, to validate the timer tables. - Implement DPC Timeout detection, in DBG mode. - Fix a bug in KiQuantumEnd which would've affected real-time threads. - Fix some bugs in KiRetireDpcList to avoid issues should the DPC Queue Depth drop below 0, and solve some possible races. - Fix KeRemoveQueueDpc only to enable interrupts if it was called with interrupts enabled. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/systimer.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Mon Mar 19 20:55:38 2007 @@ -700,10 +700,8 @@ // .macro FASTCALL_PROLOG Label EndLabel /* Set FS to PCR */ - mov ecx, KGDT_R0_PCR - mov fs, cx - //push KGDT_R0_PCR - //pop fs + push KGDT_R0_PCR + pop fs /* Set user selector */ mov ecx, KGDT_R3_DATA | RPL_MASK 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 (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Mon Mar 19 20:55:38 2007 @@ -922,6 +922,12 @@ NTAPI KeThawExecution(IN BOOLEAN Enable); +BOOLEAN +NTAPI +KeDisableInterrupts( + VOID +); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2613… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Mon Mar 19 20:55:38 2007 @@ -24,8 +24,55 @@ FAST_MUTEX KiGenericCallDpcMutex; KDPC KiTimerExpireDpc; ULONG KiTimeLimitIsrMicroseconds; +ULONG KiDPCTimeout = 110; /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KiCheckTimerTable(IN ULARGE_INTEGER CurrentTime) +{ +#if DBG + ULONG i = 0; + PLIST_ENTRY ListHead, NextEntry; + KIRQL OldIrql; + PKTIMER Timer; + + /* Raise IRQL to high and loop timers */ + KeRaiseIrql(HIGH_LEVEL, &OldIrql); + do + { + /* Loop the current list */ + ListHead = &KiTimerTableListHead[i].Entry; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the timer and move to the next one */ + Timer = CONTAINING_RECORD(NextEntry, KTIMER, TimerListEntry); + NextEntry = NextEntry->Flink; + + /* Check if it expired */ + if (Timer->DueTime.QuadPart <= CurrentTime.QuadPart) + { + /* Check if the DPC was queued, but didn't run */ + if (!(KeGetCurrentPrcb()->TimerRequest) && + !(*((volatile PULONG*)(&KiTimerExpireDpc.DpcData)))) + { + /* This is bad, breakpoint! */ + DPRINT1("Invalid timer state!\n"); + DbgBreakPoint(); + } + } + } + + /* Move to the next timer */ + i++; + } while(i < TIMER_TABLE_SIZE); + + /* Lower IRQL and return */ + KeLowerIrql(OldIrql); +#endif +} VOID NTAPI @@ -34,7 +81,8 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - LARGE_INTEGER SystemTime, InterruptTime, Interval; + ULARGE_INTEGER SystemTime, InterruptTime; + LARGE_INTEGER Interval; LONG Limit, Index, i; ULONG Timers, ActiveTimers, DpcCalls; PLIST_ENTRY ListHead, NextEntry; @@ -50,7 +98,7 @@ _disable(); /* Query system and interrupt time */ - KeQuerySystemTime(&SystemTime); + KeQuerySystemTime((PLARGE_INTEGER)&SystemTime); InterruptTime.QuadPart = KeQueryInterruptTime(); Limit = KeTickCount.LowPart; @@ -226,6 +274,9 @@ } } while (Index != Limit); + /* Verify the timer table, on debug builds */ + if (KeNumberProcessors == 1) KiCheckTimerTable(InterruptTime); + /* Check if we still have DPC entries */ if (DpcCalls) { @@ -274,9 +325,14 @@ /* Check if Quantum expired */ if (Thread->Quantum <= 0) { - /* Make sure that we're not real-time or without a quantum */ - if ((Thread->Priority < LOW_REALTIME_PRIORITY) && - !(Thread->ApcState.Process->DisableQuantum)) + /* Check if we're real-time and with quantums disabled */ + if ((Thread->Priority >= LOW_REALTIME_PRIORITY) && + (Thread->ApcState.Process->DisableQuantum)) + { + /* Otherwise, set maximum quantum */ + Thread->Quantum = MAX_QUANTUM; + } + else { /* Reset the new Quantum */ Thread->Quantum = Thread->QuantumReset; @@ -287,7 +343,6 @@ /* Check if a new thread is scheduled */ if (!Prcb->NextThread) { -#ifdef NEW_SCHEDULER /* Get a new ready thread */ NextThread = KiSelectReadyThread(Thread->Priority, Prcb); if (NextThread) @@ -296,13 +351,6 @@ NextThread->State = Standby; Prcb->NextThread = NextThread; } -#else - /* Just leave now */ - KiReleasePrcbLock(Prcb); - KeLowerIrql(DISPATCH_LEVEL); - KiDispatchThread(Ready); - return; -#endif } else { @@ -310,11 +358,6 @@ Thread->Preempted = FALSE; } } - else - { - /* Otherwise, set maximum quantum */ - Thread->Quantum = MAX_QUANTUM; - } } /* Release the thread lock */ @@ -360,13 +403,17 @@ FASTCALL KiRetireDpcList(IN PKPRCB Prcb) { - PKDPC_DATA DpcData = Prcb->DpcData; - PLIST_ENTRY DpcEntry; + PKDPC_DATA DpcData; + PLIST_ENTRY ListHead, DpcEntry; PKDPC Dpc; PKDEFERRED_ROUTINE DeferredRoutine; PVOID DeferredContext, SystemArgument1, SystemArgument2; ULONG_PTR TimerHand; + /* Get data and list variables before starting anything else */ + DpcData = &Prcb->DpcData[DPC_NORMAL]; + ListHead = &DpcData->DpcListHead; + /* Main outer loop */ do { @@ -376,24 +423,28 @@ /* Check if this is a timer expiration request */ if (Prcb->TimerRequest) { + /* It is, get the timer hand and disable timer request */ TimerHand = Prcb->TimerHand; Prcb->TimerRequest = 0; + + /* Expire timers with interrups enabled */ _enable(); - KiTimerExpiration(NULL, NULL, (PVOID) TimerHand, NULL); + KiTimerExpiration(NULL, NULL, (PVOID)TimerHand, NULL); _disable(); } /* Loop while we have entries in the queue */ - while (DpcData->DpcQueueDepth) - { - /* Lock the DPC data */ + while (DpcData->DpcQueueDepth != 0) + { + /* Lock the DPC data and get the DPC entry*/ KefAcquireSpinLockAtDpcLevel(&DpcData->DpcLock); + DpcEntry = ListHead->Flink; /* Make sure we have an entry */ - if (!IsListEmpty(&DpcData->DpcListHead)) + if (DpcEntry != ListHead) { /* Remove the DPC from the list */ - DpcEntry = RemoveHeadList(&DpcData->DpcListHead); + RemoveEntryList(DpcEntry); Dpc = CONTAINING_RECORD(DpcEntry, KDPC, DpcListEntry); /* Clear its DPC data and save its parameters */ @@ -432,7 +483,6 @@ /* Release DPC Lock */ KefReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); - break; } } @@ -446,7 +496,7 @@ /* FIXME: 2K3-style scheduling not implemeted */ ASSERT(FALSE); } - } while (DpcData->DpcQueueDepth); + } while (DpcData->DpcQueueDepth != 0); } VOID @@ -458,7 +508,7 @@ { /* Setup the DPC Object */ Dpc->Type = Type; - Dpc->Number= 0; + Dpc->Number = 0; Dpc->Importance= MediumImportance; Dpc->DeferredRoutine = DeferredRoutine; Dpc->DeferredContext = DeferredContext; @@ -503,7 +553,7 @@ IN PVOID SystemArgument2) { KIRQL OldIrql; - PKPRCB Prcb, CurrentPrcb = KeGetCurrentPrcb(); + PKPRCB Prcb, CurrentPrcb; ULONG Cpu; PKDPC_DATA DpcData; BOOLEAN DpcConfigured = FALSE, DpcInserted = FALSE; @@ -511,6 +561,7 @@ /* Check IRQL and Raise it to HIGH_LEVEL */ KeRaiseIrql(HIGH_LEVEL, &OldIrql); + CurrentPrcb = KeGetCurrentPrcb(); /* Check if the DPC has more then the maximum number of CPUs */ if (Dpc->Number >= MAXIMUM_PROCESSORS) @@ -525,6 +576,9 @@ Prcb = CurrentPrcb; Cpu = Prcb->Number; } + + /* ROS Sanity Check */ + ASSERT(Prcb == CurrentPrcb); /* Check if this is a threaded DPC and threaded DPCs are enabled */ if ((Dpc->Type == ThreadedDpcObject) && (Prcb->ThreadDpcEnable)) @@ -564,13 +618,14 @@ } /* Check if this is the DPC on the threaded list */ - if (&Prcb->DpcData[DPC_THREADED].DpcListHead == &DpcData->DpcListHead) + if (&Prcb->DpcData[DPC_THREADED] == DpcData) { /* Make sure a threaded DPC isn't already active */ if (!(Prcb->DpcThreadActive) && !(Prcb->DpcThreadRequested)) { /* FIXME: Setup Threaded DPC */ - ASSERT(FALSE); + DPRINT1("Threaded DPC not supported\n"); + while (TRUE); } } else @@ -650,14 +705,13 @@ KeRemoveQueueDpc(IN PKDPC Dpc) { PKDPC_DATA DpcData; - UCHAR DpcType; + BOOLEAN Enable; ASSERT_DPC(Dpc); /* Disable interrupts */ - _disable(); - - /* Get DPC data and type */ - DpcType = Dpc->Type; + Enable = KeDisableInterrupts(); + + /* Get DPC data */ DpcData = Dpc->DpcData; if (DpcData) { @@ -678,7 +732,7 @@ } /* Re-enable interrupts */ - _enable(); + if (Enable) _enable(); /* Return if the DPC was in the queue or not */ return DpcData ? TRUE : FALSE; @@ -691,14 +745,15 @@ NTAPI KeFlushQueuedDpcs(VOID) { + PKPRCB CurrentPrcb = KeGetCurrentPrcb(); PAGED_CODE(); /* Check if this is an UP machine */ if (KeActiveProcessors == 1) { /* Check if there are DPCs on either queues */ - if ((KeGetCurrentPrcb()->DpcData[DPC_NORMAL].DpcQueueDepth) || - (KeGetCurrentPrcb()->DpcData[DPC_THREADED].DpcQueueDepth)) + if ((CurrentPrcb->DpcData[DPC_NORMAL].DpcQueueDepth > 0) || + (CurrentPrcb->DpcData[DPC_THREADED].DpcQueueDepth > 0)) { /* Request an interrupt */ HalRequestSoftwareInterrupt(DISPATCH_LEVEL); 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c Mon Mar 19 20:55:38 2007 @@ -22,6 +22,22 @@ extern ULONG KiChainedDispatch2ndLvl; /* PRIVATE FUNCTIONS *********************************************************/ + +BOOLEAN +NTAPI +KeDisableInterrupts(VOID) +{ + ULONG Flags = 0; + BOOLEAN Return; + + /* Get EFLAGS and check if the interrupt bit is set */ + Ke386SaveFlags(Flags); + Return = (Flags & EFLAGS_INTERRUPT_MASK) ? TRUE: FALSE; + + /* Disable interrupts */ + _disable(); + return Return; +} VOID NTAPI Modified: trunk/reactos/ntoskrnl/ke/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/systimer.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/systimer.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/systimer.S Mon Mar 19 20:55:38 2007 @@ -10,6 +10,11 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix + +/* GLOBALS *******************************************************************/ + +_DpcTimeoutMsg: + .asciz "\n*** DPC routine > 1 sec --- This is not a break in KeUpdateSystemTime\n" /* FUNCTIONS ******************************************************************/ @@ -93,7 +98,32 @@ /* At dispatch, increase DPC time */ inc dword ptr [eax+KPCR_PRCB_DPC_TIME] +#ifdef DBG + /* Update the DPC time */ inc dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME] + + /* Check if we've timed out */ + mov edx, _KiDPCTimeout + cmp dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME], edx + jc AfterSet + + /* We did, print out a message */ + push offset _DpcTimeoutMsg + call _DbgPrint + add esp, 4 + + /* Check if the debugger is enabled */ + cmp byte ptr __KdDebuggerEnabled, 0 + je ResetDpcTime + + /* Breakpoint */ + call _DbgBreakPoint@0 + +ResetDpcTime: + /* Restore state */ + mov eax, PCR[KPCR_SELF] + mov dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME], 0 +#endif jmp AfterSet AboveDispatch:

17 years, 9 months

[ion] 26138: - Change the way DR_TRAP_FIXUP and V86_TRAP_FIXUP work so that they can be combined into TRAP_FIXUPS, which will also handle ABIOS Fixups later. - Modified the way TRAP_FIXUPS and XXX_PROLOGS work, so that the fixup code doesn't depend on numerical values anymore, but instead on unique labels for each function (kitd thus becomes kitd_a and kitd_t, for entry and exit). - Now we can put the TRAP_FIXUPS for the Interrupt Template as part of the code, and at the end. - Enable Dr Save/Re

by ion＠svn.reactos.org

Author: ion Date: Mon Mar 19 08:56:27 2007 New Revision: 26138 URL: http://svn.reactos.org/svn/reactos?rev=26138&view=rev Log: - Change the way DR_TRAP_FIXUP and V86_TRAP_FIXUP work so that they can be combined into TRAP_FIXUPS, which will also handle ABIOS Fixups later. - Modified the way TRAP_FIXUPS and XXX_PROLOGS work, so that the fixup code doesn't depend on numerical values anymore, but instead on unique labels for each function (kitd thus becomes kitd_a and kitd_t, for entry and exit). - Now we can put the TRAP_FIXUPS for the Interrupt Template as part of the code, and at the end. - Enable Dr Save/Restore in lots of places where it was previously disable. - Implement Dr Save/Restore in V86 traps. Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Mon Mar 19 08:56:27 2007 @@ -104,6 +104,9 @@ .long _HalpApcInterrupt2ndEntry /* APC_LEVEL */ .long _HalpDispatchInterrupt2ndEntry /* DISPATCH_LEVEL */ +_UnhandledMsg: + .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" + /* FUNCTIONS *****************************************************************/ .globl _HalpInitPICs@0 @@ -630,8 +633,7 @@ .globl _HalpApcInterrupt .func HalpApcInterrupt -Dr_hapc: DR_TRAP_FIXUP -V86_hapc: V86_TRAP_FIXUP +TRAP_FIXUPS hapc_a, hapc_t, DoFixupV86, DoFixupAbios _HalpApcInterrupt: /* Create fake interrupt stack */ @@ -641,7 +643,7 @@ push eax /* Enter interrupt */ - INT_PROLOG hapc, DoPushFakeErrorCode + INT_PROLOG hapc_a, hapc_t, DoPushFakeErrorCode .endfunc .globl _HalpApcInterrupt2ndEntry @@ -679,8 +681,7 @@ .globl _HalpDispatchInterrupt .func HalpDispatchInterrupt -Dr_hdpc: DR_TRAP_FIXUP -V86_hdpc: V86_TRAP_FIXUP +TRAP_FIXUPS hdpc_a, hdpc_t, DoFixupV86, DoFixupAbios _HalpDispatchInterrupt: /* Create fake interrupt stack */ @@ -690,7 +691,7 @@ push eax /* Enter interrupt */ - INT_PROLOG hdpc, DoPushFakeErrorCode + INT_PROLOG hdpc_a, hdpc_t, DoPushFakeErrorCode .endfunc .globl _HalpDispatchInterrupt2ndEntry Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Mon Mar 19 08:56:27 2007 @@ -17,6 +17,9 @@ _HalpLastPerfCounterHigh: .long 0 _HalpPerfCounterLow: .long 0 _HalpPerfCounterHigh: .long 0 + +_UnhandledMsg: + .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" /* FUNCTIONS *****************************************************************/ @@ -213,12 +216,11 @@ .globl _HalpClockInterrupt@0 .func HalpClockInterrupt@0 -V86_hci: V86_TRAP_FIXUP -Dr_hci: DR_TRAP_FIXUP +TRAP_FIXUPS hci_a, hci_t, DoFixupV86, DoFixupAbios _HalpClockInterrupt@0: /* Enter trap */ - INT_PROLOG hci, DoPushFakeErrorCode + INT_PROLOG hci_a, hci_t, DoPushFakeErrorCode /* Push vector and make stack for IRQL */ push 0x30 Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Mon Mar 19 08:56:27 2007 @@ -17,12 +17,16 @@ #define DoRestoreSegments 1 #define DoRestoreVolatiles 1 #define DoPushFakeErrorCode 1 +#define DoFixupV86 1 +#define DoFixupAbios 1 #define NotFromSystemCall 0 #define DoNotRestorePreviousMode 0 #define DoNotRestoreEverything 0 #define DoNotRestoreSegments 0 #define DoNotRestoreVolatiles 0 #define DoNotPushFakeErrorCode 0 +#define DoNotFixupV86 0 +#define DoNotFixupAbios 0 // Arguments for idt #define INT_32_DPL0 0x8E00 @@ -210,15 +214,90 @@ .endm // -// @name V86_TRAP_FIXUP -// -// This macro sets up the debug header in the trap frame. +// @name TRAP_FIXUPS +// +// This macro contains out-of-line code for various Trap Frame Fixups, such as: +// +// - DR Fixup: Loads and restores DR registers. +// - V86 Fixup: Loads and restores V86 segments. +// - ABIOS Fixup: Loads and restores the ABIOS state and stack. // // @param None. // // @remark ebp = PKTRAP_FRAME // -.macro V86_TRAP_FIXUP +.macro TRAP_FIXUPS Label, EndLabel, V86Fix, AbiosFix +Dr_&Label: + + /* Check if this was V86 mode */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz 2f + + /* Check if it was user mode */ + test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz Dr_&EndLabel + +2: + /* Get DR0, 1, 2 */ + mov ebx, dr0 + mov ecx, dr1 + mov edi, dr2 + + /* Save them */ + mov [ebp+KTRAP_FRAME_DR0], ebx + mov [ebp+KTRAP_FRAME_DR1], ecx + mov [ebp+KTRAP_FRAME_DR2], edi + + /* Get DR3, 6, 7 */ + mov ebx, dr3 + mov ecx, dr6 + mov edi, dr7 + + /* Save them */ + mov [ebp+KTRAP_FRAME_DR3], ebx + mov [ebp+KTRAP_FRAME_DR6], ecx + mov [ebp+KTRAP_FRAME_DR7], edi + + /* Clear DR7 */ + xor ebx, ebx + mov dr7, ebx + + /* Get the PRCB */ + mov edi, PCR[KPCR_PRCB] + + /* Get DR0, 1 */ + mov ebx, [edi+KPRCB_DR0] + mov ecx, [edi+KPRCB_DR1] + + /* Set them */ + mov dr0, ebx + mov dr1, ecx + + /* Get DR2, 3 */ + mov ebx, [edi+KPRCB_DR2] + mov ecx, [edi+KPRCB_DR3] + + /* Set them */ + mov dr2, ebx + mov dr3, ecx + + /* Get DR6, 7 */ + mov ebx, [edi+KPRCB_DR6] + mov ecx, [edi+KPRCB_DR7] + + /* Set them */ + mov dr6, ebx + mov dr7, ecx + jmp Dr_&EndLabel + +.if \AbiosFix +Abios_&Label: + UNHANDLED_PATH +.endif + +.if \V86Fix +V86_&Label: + /* Get V86 segment registers */ mov eax, [ebp+KTRAP_FRAME_V86_FS] mov ebx, [ebp+KTRAP_FRAME_V86_GS] @@ -232,79 +311,8 @@ mov [ebp+KTRAP_FRAME_DS], dx /* Go back to mainline code */ - jmp 1f -.endm - -// -// @name DR_TRAP_FIXUP -// -// This macro sets up the debug header in the trap frame. -// -// @param None. -// -// @remark ebp = PKTRAP_FRAME -// -.macro DR_TRAP_FIXUP - /* Check if this was V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz 2f - - /* Check if it was user mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz 3f - -2: - /* Get DR0, 1, 2 */ - mov ebx, dr0 - mov ecx, dr1 - mov edi, dr2 - - /* Save them */ - mov [ebp+KTRAP_FRAME_DR0], ebx - mov [ebp+KTRAP_FRAME_DR1], ecx - mov [ebp+KTRAP_FRAME_DR2], edi - - /* Get DR3, 6, 7 */ - mov ebx, dr3 - mov ecx, dr6 - mov edi, dr7 - - /* Save them */ - mov [ebp+KTRAP_FRAME_DR3], ebx - mov [ebp+KTRAP_FRAME_DR6], ecx - mov [ebp+KTRAP_FRAME_DR7], edi - - /* Clear DR7 */ - xor ebx, ebx - mov dr7, ebx - - /* Get the PRCB */ - mov edi, PCR[KPCR_PRCB] - - /* Get DR0, 1 */ - mov ebx, [edi+KPRCB_DR0] - mov ecx, [edi+KPRCB_DR1] - - /* Set them */ - mov dr0, ebx - mov dr1, ecx - - /* Get DR2, 3 */ - mov ebx, [edi+KPRCB_DR2] - mov ecx, [edi+KPRCB_DR3] - - /* Set them */ - mov dr2, ebx - mov dr3, ecx - - /* Get DR6, 7 */ - mov ebx, [edi+KPRCB_DR6] - mov ecx, [edi+KPRCB_DR7] - - /* Set them */ - mov dr6, ebx - mov dr7, ecx - jmp 3f + jmp V86_&EndLabel +.endif .endm // @@ -423,7 +431,7 @@ // /* Handle trap */ // <Your Trap Code Here> // -.macro TRAP_PROLOG Label +.macro TRAP_PROLOG Label EndLabel /* Just to be safe, clear out the HIWORD, since it's reserved */ mov word ptr [esp+2], 0 @@ -474,7 +482,7 @@ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz V86_&Label -1: +V86_&EndLabel: /* Get current thread */ mov ecx, PCR[KPCR_CURRENT_THREAD] cld @@ -487,7 +495,7 @@ jnz Dr_&Label /* Set the Trap Frame Debug Header */ -3: +Dr_&EndLabel: SET_TF_DEBUG_HEADER .endm @@ -503,7 +511,7 @@ // // @remark For software interrupts, make sure that a fake INT stack is created. // -.macro INT_PROLOG Label FakeErrorCode +.macro INT_PROLOG Label EndLabel FakeErrorCode .if \FakeErrorCode /* Save fake error code */ @@ -533,7 +541,7 @@ jnz V86_&Label /* Check if this was kernel mode */ -1: +V86_&EndLabel: cmp word ptr [esp+KTRAP_FRAME_CS], KGDT_R0_CODE jz 1f @@ -597,7 +605,7 @@ jnz Dr_&Label /* Set the trap frame debug header */ -3: +Dr_&EndLabel: SET_TF_DEBUG_HEADER .endm @@ -616,7 +624,7 @@ // // @remark None. // -.macro SYSCALL_PROLOG Label +.macro SYSCALL_PROLOG Label EndLabel /* Create a trap frame */ push 0 push ebp @@ -671,7 +679,7 @@ jnz Dr_&Label /* Set the trap frame debug header */ -3: +Dr_&EndLabel: SET_TF_DEBUG_HEADER /* Enable interrupts */ @@ -690,7 +698,7 @@ // // @remark None. // -.macro FASTCALL_PROLOG Label +.macro FASTCALL_PROLOG Label EndLabel /* Set FS to PCR */ mov ecx, KGDT_R0_PCR mov fs, cx @@ -769,7 +777,7 @@ jnz Dr_&Label /* Set the trap frame debug header */ -3: +Dr_&EndLabel: SET_TF_DEBUG_HEADER /* Enable interrupts */ @@ -791,7 +799,7 @@ // // @remark None. // -.macro V86_TRAP_PROLOG Label +.macro V86_TRAP_PROLOG Label EndLabel /* Skip everything to the error code */ sub esp, KTRAP_FRAME_ERROR_CODE @@ -838,7 +846,9 @@ mov eax, dr7 test eax, ~DR7_RESERVED_MASK mov [esp+KTRAP_FRAME_DR7], eax - // jnz Dr_&Label + jnz Dr_&Label + +Dr_&EndLabel: .endm // @@ -869,9 +879,10 @@ /* Check if DR registers should be restored */ test dword ptr [ebp+KTRAP_FRAME_DR7], ~DR7_RESERVED_MASK - //jnz V86DebugRestore + jnz V86DebugRestore /* Finish popping the rest of the frame, and return to P-mode */ +V86DebugContinue: add esp, 12 pop edi pop esi @@ -879,6 +890,33 @@ pop ebp add esp, 4 iretd + +V86DebugRestore: + + /* Get DR0, 1 */ + xor ebx, ebx + mov esi, [ebp+KTRAP_FRAME_DR0] + mov edi, [ebp+KTRAP_FRAME_DR1] + + /* Clear DR 7 */ + mov dr7, ebx + + /* Get DR2 and load DR0-2 */ + mov ebx, [ebp+KTRAP_FRAME_DR2] + mov dr0, esi + mov dr1, edi + mov dr2, ebx + + /* Get DR3-7 */ + mov esi, [ebp+KTRAP_FRAME_DR0] + mov edi, [ebp+KTRAP_FRAME_DR1] + mov ebx, [ebp+KTRAP_FRAME_DR7] + + /* Load them */ + mov dr3, esi + mov dr6, edi + mov dr7, ebx + jmp V86DebugContinue PendingUserApc: @@ -1006,7 +1044,7 @@ /* Check for debug registers */ test dword ptr [esp+KTRAP_FRAME_DR7], ~DR7_RESERVED_MASK - //jnz 2f + jnz 2f /* Check for V86 */ 4: 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c Mon Mar 19 08:56:27 2007 @@ -19,6 +19,7 @@ ULONG KiISRTimeout = 55; USHORT KiISROverflow = 30000; +extern ULONG KiChainedDispatch2ndLvl; /* PRIVATE FUNCTIONS *********************************************************/ @@ -188,11 +189,7 @@ } /* Sanity check */ - DPRINT1("Template Size: %lx. Code Size: %lx\n", - (ULONG_PTR)&KiInterruptTemplateDispatch - - (ULONG_PTR)KiInterruptTemplate, - KINTERRUPT_DISPATCH_CODES * 4); - ASSERT((ULONG_PTR)&KiInterruptTemplateDispatch - + ASSERT((ULONG_PTR)&KiChainedDispatch2ndLvl - (ULONG_PTR)KiInterruptTemplate <= (KINTERRUPT_DISPATCH_CODES * 4)); /* Jump to the last 4 bytes */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Mon Mar 19 08:56:27 2007 @@ -136,22 +136,22 @@ UNHANDLED_PATH .func KiSystemService -Dr_kss: DR_TRAP_FIXUP +TRAP_FIXUPS kss_a, kss_t, DoNotFixupV86, DoNotFixupAbios _KiSystemService: /* Enter the shared system call prolog */ - SYSCALL_PROLOG kss + SYSCALL_PROLOG kss_a, kss_t /* Jump to the actual handler */ jmp SharedCode .endfunc .func KiFastCallEntry -Dr_FastCallDrSave: DR_TRAP_FIXUP +TRAP_FIXUPS FastCallDrSave, FastCallDrReturn, DoNotFixupV86, DoNotFixupAbios _KiFastCallEntry: /* Enter the fast system call prolog */ - FASTCALL_PROLOG FastCallDrSave + FASTCALL_PROLOG FastCallDrSave, FastCallDrReturn SharedCode: @@ -461,15 +461,14 @@ UNHANDLED_PATH .func KiDebugService -Dr_kids: DR_TRAP_FIXUP -V86_kids: V86_TRAP_FIXUP +TRAP_FIXUPS kids_a, kids_t, DoFixupV86, DoFixupAbios _KiDebugService: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kids + TRAP_PROLOG kids_a, kids_t /* Increase EIP so we skip the INT3 */ inc dword ptr [ebp+KTRAP_FRAME_EIP] @@ -672,14 +671,13 @@ .endfunc .func KiTrap0 -Dr_kit0: DR_TRAP_FIXUP -V86_kit0: V86_TRAP_FIXUP +TRAP_FIXUPS kit0_a, kit0_t, DoFixupV86, DoNotFixupAbios _KiTrap0: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit0 + TRAP_PROLOG kit0_a, kit0_t /* Check for V86 */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -714,14 +712,13 @@ .endfunc .func KiTrap1 -Dr_kit1: DR_TRAP_FIXUP -V86_kit1: V86_TRAP_FIXUP +TRAP_FIXUPS kit1_a, kit1_t, DoFixupV86, DoNotFixupAbios _KiTrap1: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit1 + TRAP_PROLOG kit1_a, kit1_t /* Check for V86 */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -767,14 +764,13 @@ .endfunc .func KiTrap3 -Dr_kit3: DR_TRAP_FIXUP -V86_kit3: V86_TRAP_FIXUP +TRAP_FIXUPS kit3_a, kit3_t, DoFixupV86, DoNotFixupAbios _KiTrap3: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit3 + TRAP_PROLOG kit3_a, kit3_t /* Set status code */ mov eax, 0 //STATUS_SUCCESS @@ -822,14 +818,13 @@ .endfunc .func KiTrap4 -Dr_kit4: DR_TRAP_FIXUP -V86_kit4: V86_TRAP_FIXUP +TRAP_FIXUPS kit4_a, kit4_t, DoFixupV86, DoNotFixupAbios _KiTrap4: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit4 + TRAP_PROLOG kit4_a, kit4_t /* Check for V86 */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -864,14 +859,13 @@ .endfunc .func KiTrap5 -Dr_kit5: DR_TRAP_FIXUP -V86_kit5: V86_TRAP_FIXUP +TRAP_FIXUPS kit5_a, kit5_t, DoFixupV86, DoNotFixupAbios _KiTrap5: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit5 + TRAP_PROLOG kit5_a, kit5_t /* Check for V86 */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -910,8 +904,7 @@ .endfunc .func KiTrap6 -Dr_kit6: DR_TRAP_FIXUP -V86_kit6: V86_TRAP_FIXUP +TRAP_FIXUPS kit6_a, kit6_t, DoFixupV86, DoNotFixupAbios _KiTrap6: /* It this a V86 GPF? */ @@ -919,7 +912,7 @@ jz NotV86UD /* Enter V86 Trap */ - V86_TRAP_PROLOG kit6 + V86_TRAP_PROLOG kit6_a, kit6_v /* Not yet supported (Invalid OPCODE from V86) */ UNHANDLED_PATH @@ -929,7 +922,7 @@ push 0 /* Enter trap */ - TRAP_PROLOG kit6 + TRAP_PROLOG kit6_a, kit6_t /* Check if this happened in kernel mode */ test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK @@ -1025,14 +1018,13 @@ .endfunc .func KiTrap7 -Dr_kit7: DR_TRAP_FIXUP -V86_kit7: V86_TRAP_FIXUP +TRAP_FIXUPS kit7_a, kit7_t, DoFixupV86, DoNotFixupAbios _KiTrap7: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit7 + TRAP_PROLOG kit7_a, kit7_t /* Get the current thread and stack */ StartTrapHandle: @@ -1345,14 +1337,13 @@ .endfunc .func KiTrap9 -Dr_kit9: DR_TRAP_FIXUP -V86_kit9: V86_TRAP_FIXUP +TRAP_FIXUPS kit9_a, kit9_t, DoFixupV86, DoNotFixupAbios _KiTrap9: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit9 + TRAP_PROLOG kit9_a, kit9_t /* Enable interrupts and bugcheck */ sti @@ -1361,11 +1352,10 @@ .endfunc .func KiTrap10 -Dr_kit10: DR_TRAP_FIXUP -V86_kit10: V86_TRAP_FIXUP +TRAP_FIXUPS kita_a, kita_t, DoFixupV86, DoNotFixupAbios _KiTrap10: /* Enter trap */ - TRAP_PROLOG kit10 + TRAP_PROLOG kita_a, kita_t /* Check for V86 */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -1392,11 +1382,10 @@ .endfunc .func KiTrap11 -Dr_kit11: DR_TRAP_FIXUP -V86_kit11: V86_TRAP_FIXUP +TRAP_FIXUPS kitb_a, kitb_t, DoFixupV86, DoNotFixupAbios _KiTrap11: /* Enter trap */ - TRAP_PROLOG kit11 + TRAP_PROLOG kitb_a, kitb_t /* FIXME: ROS Doesn't handle segment faults yet */ mov eax, 11 @@ -1404,11 +1393,10 @@ .endfunc .func KiTrap12 -Dr_kit12: DR_TRAP_FIXUP -V86_kit12: V86_TRAP_FIXUP +TRAP_FIXUPS kitc_a, kitc_t, DoFixupV86, DoNotFixupAbios _KiTrap12: /* Enter trap */ - TRAP_PROLOG kit12 + TRAP_PROLOG kitc_a, kitc_t /* FIXME: ROS Doesn't handle stack faults yet */ mov eax, 12 @@ -1439,8 +1427,7 @@ .endfunc .func KiTrap13 -Dr_kitd: DR_TRAP_FIXUP -V86_kitd: V86_TRAP_FIXUP +TRAP_FIXUPS kitd_a, kitd_t, DoFixupV86, DoNotFixupAbios _KiTrap13: /* It this a V86 GPF? */ @@ -1448,7 +1435,7 @@ jz NotV86 /* Enter V86 Trap */ - V86_TRAP_PROLOG kitd + V86_TRAP_PROLOG kitd_a, kitd_v /* Make sure that this is a V86 process */ mov ecx, PCR[KPCR_CURRENT_THREAD] @@ -1504,7 +1491,7 @@ NotV86: /* Enter trap */ - TRAP_PROLOG kitd + TRAP_PROLOG kitd_a, kitd_t /* Check if this was from kernel-mode */ test dword ptr [ebp+KTRAP_FRAME_CS], MODE_MASK @@ -1822,12 +1809,11 @@ .endfunc .func KiTrap14 -Dr_kit14: DR_TRAP_FIXUP -V86_kit14: V86_TRAP_FIXUP +TRAP_FIXUPS kite_a, kite_t, DoFixupV86, DoNotFixupAbios _KiTrap14: /* Enter trap */ - TRAP_PROLOG kit14 + TRAP_PROLOG kite_a, kite_t /* Check if we have a VDM alert */ cmp dword ptr PCR[KPCR_VDM_ALERT], 0 @@ -1986,14 +1972,13 @@ .endfunc .func KiTrap0F -Dr_kit15: DR_TRAP_FIXUP -V86_kit15: V86_TRAP_FIXUP +TRAP_FIXUPS kitf_a, kitf_t, DoFixupV86, DoNotFixupAbios _KiTrap0F: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit15 + TRAP_PROLOG kitf_a, kitf_t sti /* Raise a fatal exception */ @@ -2002,14 +1987,13 @@ .endfunc .func KiTrap16 -Dr_kit16: DR_TRAP_FIXUP -V86_kit16: V86_TRAP_FIXUP +TRAP_FIXUPS kit10_a, kit10_t, DoFixupV86, DoNotFixupAbios _KiTrap16: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit16 + TRAP_PROLOG kit10_a, kit10_t /* Check if this is the NPX Thread */ mov eax, PCR[KPCR_CURRENT_THREAD] @@ -2029,14 +2013,13 @@ .endfunc .func KiTrap17 -Dr_kit17: DR_TRAP_FIXUP -V86_kit17: V86_TRAP_FIXUP +TRAP_FIXUPS kit11_a, kit11_t, DoFixupV86, DoNotFixupAbios _KiTrap17: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit17 + TRAP_PROLOG kit11_a, kit11_t /* FIXME: ROS Doesn't handle alignment faults yet */ mov eax, 17 @@ -2110,12 +2093,11 @@ jmp _KiUnexpectedInterruptTail .func KiUnexpectedInterruptTail -V86_kui: V86_TRAP_FIXUP -Dr_kui: DR_TRAP_FIXUP +TRAP_FIXUPS kui_a, kui_t, DoFixupV86, DoFixupAbios _KiUnexpectedInterruptTail: /* Enter interrupt trap */ - INT_PROLOG kui, DoNotPushFakeErrorCode + INT_PROLOG kui_a, kui_t, DoNotPushFakeErrorCode /* Increase interrupt count */ inc dword ptr PCR[KPCR_PRCB_INTERRUPT_COUNT] @@ -2257,13 +2239,10 @@ .endfunc .func KiInterruptTemplate -V86_kit: V86_TRAP_FIXUP -Dr_kit: DR_TRAP_FIXUP _KiInterruptTemplate: /* Enter interrupt trap */ - INT_PROLOG kit, DoPushFakeErrorCode -.endfunc + INT_PROLOG kit_a, kit_t, DoPushFakeErrorCode _KiInterruptTemplate2ndDispatch: /* Dummy code, will be replaced by the address of the KINTERRUPT */ @@ -2275,6 +2254,9 @@ _KiInterruptTemplateDispatch: /* Marks the end of the template so that the jump above can be edited */ + +TRAP_FIXUPS kit_a, kit_t, DoFixupV86, DoFixupAbios +.endfunc .func KiChainedDispatch2ndLvl@0 _KiChainedDispatch2ndLvl@0:

17 years, 9 months

[ion] 26137: - New ISR Timeout detection code. - New Interrupt Storm detection code. - Use PCR everywhere instead of fs:[ or [fs:. Significant improvements on UP builds because we use ds:[KPCRADDRESSS] for them. - Ongoing work.

by ion＠svn.reactos.org

Author: ion Date: Mon Mar 19 06:29:29 2007 New Revision: 26137 URL: http://svn.reactos.org/svn/reactos?rev=26137&view=rev Log: - New ISR Timeout detection code. - New Interrupt Storm detection code. - Use PCR everywhere instead of fs:[ or [fs:. Significant improvements on UP builds because we use ds:[KPCRADDRESSS] for them. - Ongoing work. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2613… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Mon Mar 19 06:29:29 2007 @@ -222,10 +222,12 @@ // #define KINTERRUPT_SERVICE_ROUTINE 0x0C #define KINTERRUPT_SERVICE_CONTEXT 0x10 +#define KINTERRUPT_TICK_COUNT 0x18 #define KINTERRUPT_ACTUAL_LOCK 0x1C #define KINTERRUPT_IRQL 0x20 #define KINTERRUPT_VECTOR 0x24 #define KINTERRUPT_SYNCHRONIZE_IRQL 0x29 +#define KINTERRUPT_DISPATCH_COUNT 0x38 // // KGDTENTRY Offsets @@ -546,6 +548,7 @@ #define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A #define UNEXPECTED_KERNEL_MODE_TRAP 0x7F #define ATTEMPTED_SWITCH_FROM_DPC 0xB8 +#define HARDWARE_INTERRUPT_STORM 0xF2 // // IRQL Levels @@ -607,3 +610,4 @@ #define MAXIMUM_IDTVECTOR 0xFF #endif // !_ASM_H + Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Mon Mar 19 06:29:29 2007 @@ -622,14 +622,14 @@ KSPIN_LOCK SpinLock; ULONG TickCount; PKSPIN_LOCK ActualLock; - PVOID DispatchAddress; + PKINTERRUPT_ROUTINE DispatchAddress; ULONG Vector; KIRQL Irql; KIRQL SynchronizeIrql; BOOLEAN FloatingSave; BOOLEAN Connected; - CHAR Number; - UCHAR ShareVector; + CCHAR Number; + BOOLEAN ShareVector; KINTERRUPT_MODE Mode; #if (NTDDI_VERSION >= NTDDI_LONGHORN) KINTERRUPT_POLARITY Polarity; Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Mon Mar 19 06:29:29 2007 @@ -353,7 +353,7 @@ /* Get the current thread */ 1: - mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] /* Make it non-alerted */ mov byte ptr [ebx+KTHREAD_ALERTED], 0 @@ -440,7 +440,7 @@ mov fs, bx /* Save exception list and bogus previous mode */ - push fs:[KPCR_EXCEPTION_LIST] + push PCR[KPCR_EXCEPTION_LIST] push -1 /* Save volatiles and segment registers */ @@ -476,7 +476,7 @@ 1: /* Get current thread */ - mov ecx, [fs:KPCR_CURRENT_THREAD] + mov ecx, PCR[KPCR_CURRENT_THREAD] cld /* Flush DR7 */ @@ -555,10 +555,10 @@ 1: /* Get the previous exception list */ - mov ebx, [fs:KPCR_EXCEPTION_LIST] + mov ebx, PCR[KPCR_EXCEPTION_LIST] /* Set the exception handler chain terminator */ - mov dword ptr [fs:KPCR_EXCEPTION_LIST], -1 + mov dword ptr PCR[KPCR_EXCEPTION_LIST], -1 /* Save the previous exception list */ mov [esp+KTRAP_FRAME_EXCEPTION_LIST], ebx @@ -579,7 +579,7 @@ and dword ptr [esp+KTRAP_FRAME_ERROR_CODE], 0 /* Get the current thread and clear direction flag */ - mov ecx, [fs:KPCR_CURRENT_THREAD] + mov ecx, PCR[KPCR_CURRENT_THREAD] cld /* Flush DR7 */ @@ -631,13 +631,13 @@ mov fs, bx /* Get a pointer to the current thread */ - mov esi, [fs:KPCR_CURRENT_THREAD] + mov esi, PCR[KPCR_CURRENT_THREAD] /* Save the previous exception list */ - push [fs:KPCR_EXCEPTION_LIST] + push PCR[KPCR_EXCEPTION_LIST] /* Set the exception handler chain terminator */ - mov dword ptr [fs:KPCR_EXCEPTION_LIST], -1 + mov dword ptr PCR[KPCR_EXCEPTION_LIST], -1 /* Save the old previous mode */ push [esi+KTHREAD_PREVIOUS_MODE] @@ -705,7 +705,7 @@ mov es, cx /* Set the current stack to Kernel Stack */ - mov ecx, [fs:KPCR_TSS] + mov ecx, PCR[KPCR_TSS] mov esp, [ecx+KTSS_ESP0] /* Set up a fake INT Stack. */ @@ -728,7 +728,7 @@ push KGDT_R3_TEB + RPL_MASK /* Save pointer to our PCR */ - mov ebx, [fs:KPCR_SELF] + mov ebx, PCR[KPCR_SELF] /* Get a pointer to the current thread */ mov esi, [ebx+KPCR_CURRENT_THREAD] @@ -831,7 +831,7 @@ cld /* Save the exception list */ - mov eax, [fs:KPCR_EXCEPTION_LIST] + mov eax, PCR[KPCR_EXCEPTION_LIST] mov [esp+KTRAP_FRAME_EXCEPTION_LIST], eax /* Check if we need debugging */ @@ -854,7 +854,7 @@ /* Get the current thread and make it unalerted */ ExitBegin: - mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] mov byte ptr [ebx+KTHREAD_ALERTED], 0 /* Check if it has User-mode APCs pending */ @@ -954,7 +954,7 @@ jnz 1f /* Assert exception list */ - cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 + cmp dword ptr PCR[KPCR_EXCEPTION_LIST], 0 jnz 2f 1: @@ -975,7 +975,7 @@ #endif /* Restore it */ - mov [fs:KPCR_EXCEPTION_LIST], edx + mov PCR[KPCR_EXCEPTION_LIST], edx .if \RestorePreviousMode /* Get previous mode */ @@ -990,7 +990,7 @@ #endif /* Restore the previous mode */ - mov esi, [fs:KPCR_CURRENT_THREAD] + mov esi, PCR[KPCR_CURRENT_THREAD] mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl .else @@ -1211,3 +1211,117 @@ iret .endm +// +// @name INT_EPILOG +// +// This macro creates an epilogue for leaving any system trap. +// It is used for exiting system calls, exceptions, interrupts and generic +// traps. +// +// @param Spurious - TRUE if the interrupt was unexpected and spurious. +// +// @remark None. +// +.macro INT_EPILOG Spurious + +.if \Spurious + /* Just exit the trap */ + jmp _Kei386EoiHelper@0 +.else + /* Disable interrupts */ + cli + + /* End the interrupt and do EOI */ + call _HalEndSystemInterrupt@8 + jmp _Kei386EoiHelper@0 +.endif +.endm + +#ifdef DBG + +.macro VERIFY_INT Label + /* Get the current time and mask it to 192 ticks */ + mov eax, _KeTickCount + and eax, 0xC0 + + /* Check if we're in the same tick area */ + cmp eax, dword ptr [edi+KINTERRUPT_TICK_COUNT] + jg VfRst_&Label + jl VfWrap_&Label + + /* If we got here, then our count is too large */ + dec word ptr [edi+KINTERRUPT_DISPATCH_COUNT] + jz VfOvr_&Label +Vf_&Label: +.endm + +.macro VERIFY_INT_END Label, Info +VfOvr_&Label: + + /* Decrement the dispatch count and check if we should bug check */ + dec word ptr [edi+KINTERRUPT_DISPATCH_COUNT+2] + jz 1f + + /* Update the tick count */ + add eax, 0x40 + mov [edi+KINTERRUPT_TICK_COUNT], eax + jmp VfRstDef_&Label + +.1: + /* Check if the debugger is enabled */ + cmp byte ptr __KdDebuggerEnabled, 0 + jnz 1f + + /* It isn't, bugcheck */ + push Info + push edi + push [edi+KINTERRUPT_SERVICE_CONTEXT] + push [edi+KINTERRUPT_SERVICE_ROUTINE] + push HARDWARE_INTERRUPT_STORM + call _KeBugCheckEx@20 + +1: + /* Debugger enabled, do a debug print + break instead */ + push [edi+KINTERRUPT_SERVICE_ROUTINE] + push offset _IsrOverflowMsg + call _DbgPrint + add esp, 8 + int 3 + + /* Breakpoint handled, get the new tick count */ + mov eax, _KeTickCount + and eax, 0xC0 + +VfRst_&Label: + /* Reset tick count */ + mov dword ptr [edi+KINTERRUPT_TICK_COUNT], eax + mov word ptr [edi+KINTERRUPT_DISPATCH_COUNT+2], 64 + +VfRstDef_&Label: + /* Put default overflow count and continue */ + mov ax, _KiISROverflow + mov word ptr [edi+KINTERRUPT_DISPATCH_COUNT], ax + jmp Vf_&Label + +VfWrap_&Label: + /* Check if we wrapped */ + add eax, 0x40 + cmp eax, [edi+KINTERRUPT_TICK_COUNT] + je Vf_&Label + + /* We did, start over */ + mov eax, _KeTickCount + jmp VfRst_&Label +.endm + +#else + +/* We don't verify interrupts on retail builds */ +.macro VERIFY_INT Label +.endm +.macro VERIFY_INT_END Label, Info +.endm + +#endif + + 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c Mon Mar 19 06:29:29 2007 @@ -9,11 +9,16 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES ****************************************************************/ +/* INCLUDES *****************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +/* GLOBALS *******************************************************************/ + +ULONG KiISRTimeout = 55; +USHORT KiISROverflow = 30000; /* PRIVATE FUNCTIONS *********************************************************/ @@ -172,6 +177,8 @@ Interrupt->ShareVector = ShareVector; Interrupt->Number = ProcessorNumber; Interrupt->FloatingSave = FloatingSave; + Interrupt->TickCount = (ULONG)-1; + Interrupt->DispatchCount = (ULONG)-1; /* Loop the template in memory */ for (i = 0; i < KINTERRUPT_DISPATCH_CODES; i++) @@ -179,6 +186,14 @@ /* Copy the dispatch code */ *DispatchCode++ = KiInterruptTemplate[i]; } + + /* Sanity check */ + DPRINT1("Template Size: %lx. Code Size: %lx\n", + (ULONG_PTR)&KiInterruptTemplateDispatch - + (ULONG_PTR)KiInterruptTemplate, + KINTERRUPT_DISPATCH_CODES * 4); + ASSERT((ULONG_PTR)&KiInterruptTemplateDispatch - + (ULONG_PTR)KiInterruptTemplate <= (KINTERRUPT_DISPATCH_CODES * 4)); /* Jump to the last 4 bytes */ Patch = (PULONG)((ULONG_PTR)Patch + @@ -216,7 +231,6 @@ (Interrupt->SynchronizeIrql < Irql) || (Interrupt->FloatingSave)) { - DPRINT1("Invalid interrupt object\n"); return FALSE; } @@ -254,7 +268,7 @@ (Dispatch.Interrupt->Mode == Interrupt->Mode)) { /* The vector is shared and the interrupts are compatible */ - ASSERT(FALSE); // FIXME: NOT YET SUPPORTED/TESTED + while (TRUE); // FIXME: NOT YET SUPPORTED/TESTED Interrupt->Connected = Connected = TRUE; ASSERT(Irql <= SYNCH_LEVEL); @@ -274,6 +288,14 @@ /* Unlock the dispatcher and revert affinity */ KiReleaseDispatcherLock(OldIrql); KeRevertToUserAffinityThread(); + + /* Check if we failed while trying to connect */ + if ((Connected) && (Error)) + { + DPRINT1("HalEnableSystemInterrupt failed\n"); + KeDisconnectInterrupt(Interrupt); + Connected = FALSE; + } /* Return to caller */ return Connected; Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Mon Mar 19 06:29:29 2007 @@ -93,6 +93,12 @@ _UnhandledMsg: .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" +_IsrTimeoutMsg: + .asciz "\n*** ISR at %lx took over .5 second\n" + +_IsrOverflowMsg: + .asciz "\n*** ISR at %lx appears to have an interrupt storm\n" + _KiTrapPrefixTable: .byte 0xF2 /* REP */ .byte 0xF3 /* REP INS/OUTS */ @@ -174,7 +180,7 @@ jnz NotWin32K /* Get the TEB */ - mov ecx, [fs:KPCR_TEB] + mov ecx, PCR[KPCR_TEB] /* Check if we should flush the User Batch */ xor ebx, ebx @@ -191,7 +197,7 @@ NotWin32K: /* Increase total syscall count */ - inc dword ptr fs:[KPCR_SYSTEM_CALLS] + inc dword ptr PCR[KPCR_SYSTEM_CALLS] #ifdef DBG /* Increase per-syscall count */ @@ -243,7 +249,7 @@ mov eax, esi /* Restore it */ /* Get our temporary current thread pointer for sanity check */ - mov ecx, fs:[KPCR_CURRENT_THREAD] + mov ecx, PCR[KPCR_CURRENT_THREAD] /* Make sure that we are not attached and that APCs are not disabled */ mov dl, [ecx+KTHREAD_APC_STATE_INDEX] @@ -262,7 +268,7 @@ KeReturnFromSystemCall: /* Get the Current Thread */ - mov ecx, [fs:KPCR_CURRENT_THREAD] + mov ecx, PCR[KPCR_CURRENT_THREAD] /* Restore the old trap frame pointer */ mov edx, [ebp+KTRAP_FRAME_EDX] @@ -353,7 +359,7 @@ BadStack: /* Restore ESP0 stack */ - mov ecx, [fs:KPCR_TSS] + mov ecx, PCR[KPCR_TSS] mov esp, ss:[ecx+KTSS_ESP0] /* Generate V86M Stack for Trap 6 */ @@ -373,10 +379,10 @@ #ifdef DBG InvalidIrql: /* Save current IRQL */ - push fs:[KPCR_IRQL] + push PCR[KPCR_IRQL] /* Set us at passive */ - mov dword ptr fs:[KPCR_IRQL], 0 + mov dword ptr PCR[KPCR_IRQL], 0 cli /* Bugcheck */ @@ -485,7 +491,7 @@ push ebp /* Get the current thread and restore its trap frame */ - mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] mov edx, [ebp+KTRAP_FRAME_EDX] mov [ebx+KTHREAD_TRAP_FRAME], edx @@ -497,7 +503,7 @@ /* Get the exception list and restore */ mov eax, [ebx+KTRAP_FRAME_EXCEPTION_LIST] - mov [fs:KPCR_EXCEPTION_LIST], eax + mov PCR[KPCR_EXCEPTION_LIST], eax /* Get the parameters */ mov edx, [ebp+16] /* Search frames */ @@ -532,7 +538,7 @@ push ebp /* Get the current thread and restore its trap frame */ - mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] mov edx, [ebp+KTRAP_FRAME_EDX] mov [ebx+KTHREAD_TRAP_FRAME], edx @@ -696,7 +702,7 @@ VdmCheck: /* Check if this is a VDM process */ - mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 jz SendException @@ -742,7 +748,7 @@ V86Int1: /* Check if this is a VDM process */ - mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 jz EnableInterrupts @@ -806,7 +812,7 @@ V86Int3: /* Check if this is a VDM process */ - mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 jz EnableInterrupts3 @@ -847,7 +853,7 @@ VdmCheck4: /* Check if this is a VDM process */ - mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 jz SendException4 @@ -893,7 +899,7 @@ VdmCheck5: /* Check if this is a VDM process */ - mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 jz SendException5 @@ -934,7 +940,7 @@ jz UmodeOpcode /* Check if the process is vDM */ - mov ebx, fs:[KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 jnz IsVdmOpcode @@ -950,8 +956,8 @@ /* Setup a SEH frame */ push ebp push OpcodeSEH - push fs:[KPCR_EXCEPTION_LIST] - mov fs:[KPCR_EXCEPTION_LIST], esp + push PCR[KPCR_EXCEPTION_LIST] + mov PCR[KPCR_EXCEPTION_LIST], esp OpcodeLoop: /* Get the instruction and check if it's LOCK */ @@ -964,7 +970,7 @@ loop OpcodeLoop /* Undo SEH frame */ - pop fs:[KPCR_EXCEPTION_LIST] + pop PCR[KPCR_EXCEPTION_LIST] add esp, 8 KmodeOpcode: @@ -980,7 +986,7 @@ LockCrash: /* Undo SEH Frame */ - pop fs:[KPCR_EXCEPTION_LIST] + pop PCR[KPCR_EXCEPTION_LIST] add esp, 8 /* Setup invalid lock exception and dispatch it */ @@ -1000,7 +1006,7 @@ /* Get SEH frame */ mov esp, [esp+8] - pop fs:[KPCR_EXCEPTION_LIST] + pop PCR[KPCR_EXCEPTION_LIST] add esp, 4 pop ebp @@ -1030,7 +1036,7 @@ /* Get the current thread and stack */ StartTrapHandle: - mov eax, [fs:KPCR_CURRENT_THREAD] + mov eax, PCR[KPCR_CURRENT_THREAD] mov ecx, [eax+KTHREAD_INITIAL_STACK] sub ecx, NPX_FRAME_LENGTH @@ -1049,7 +1055,7 @@ mov cr0, ebx /* Check the NPX thread */ - mov edx, [fs:KPCR_NPX_THREAD] + mov edx, PCR[KPCR_NPX_THREAD] or edx, edx jz NoNpxThread @@ -1083,7 +1089,7 @@ AfterRestore: /* Set state loaded */ mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_LOADED - mov [fs:KPCR_NPX_THREAD], eax + mov PCR[KPCR_NPX_THREAD], eax /* Enable interrupts to happen now */ sti @@ -1144,7 +1150,7 @@ UserNpx: /* Get the current thread */ - mov eax, fs:[KPCR_CURRENT_THREAD] + mov eax, PCR[KPCR_CURRENT_THREAD] /* Check NPX state */ cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED @@ -1180,7 +1186,7 @@ /* Update NPX state */ mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - mov dword ptr fs:[KPCR_NPX_THREAD], 0 + mov dword ptr PCR[KPCR_NPX_THREAD], 0 NoSaveRestore: /* Clear the TS bit and re-enable interrupts */ @@ -1293,7 +1299,7 @@ V86Npx: /* Check if this is a VDM */ - mov eax, fs:[KPCR_CURRENT_THREAD] + mov eax, PCR[KPCR_CURRENT_THREAD] mov ebx, [eax+KTHREAD_APCSTATE_PROCESS] cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 jz HandleUserNpx @@ -1414,7 +1420,7 @@ /* Setup SEH handler frame */ mov esp, [esp+8] - pop fs:[KPCR_EXCEPTION_LIST] + pop PCR[KPCR_EXCEPTION_LIST] add esp, 4 pop ebp @@ -1445,7 +1451,7 @@ V86_TRAP_PROLOG kitd /* Make sure that this is a V86 process */ - mov ecx, [fs:KPCR_CURRENT_THREAD] + mov ecx, PCR[KPCR_CURRENT_THREAD] mov ecx, [ecx+KTHREAD_APCSTATE_PROCESS] cmp dword ptr [ecx+EPROCESS_VDM_OBJECTS], 0 jnz RaiseIrql @@ -1505,7 +1511,7 @@ jnz UserModeGpf /* Check if we have a VDM alert */ - cmp dword ptr fs:[KPCR_VDM_ALERT], 0 + cmp dword ptr PCR[KPCR_VDM_ALERT], 0 jnz VdmAlertGpf /* Check for GPF during GPF */ @@ -1565,7 +1571,7 @@ NotBiosGpf: /* Check if the thread was in kernel mode */ - mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] test byte ptr [ebx+KTHREAD_PREVIOUS_MODE], 0xFF jz UserModeGpf @@ -1656,7 +1662,7 @@ jz _KiSystemFatalException /* Get the process and check which CS this came from */ - mov ebx, fs:[KPCR_CURRENT_THREAD] + mov ebx, PCR[KPCR_CURRENT_THREAD] mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK jz CheckVdmGpf @@ -1719,8 +1725,8 @@ /* Setup a SEH handler */ push ebp push offset _KiTrapExceptHandler - push fs:[KPCR_EXCEPTION_LIST] - mov fs:[KPCR_EXCEPTION_LIST], esp + push PCR[KPCR_EXCEPTION_LIST] + mov PCR[KPCR_EXCEPTION_LIST], esp /* Get EIP */ mov esi, [ebp+KTRAP_FRAME_EIP] @@ -1790,7 +1796,7 @@ IsPrivInstruction: /* Cleanup the SEH frame */ - pop fs:[KPCR_EXCEPTION_LIST] + pop PCR[KPCR_EXCEPTION_LIST] add esp, 8 /* Setup the exception */ @@ -1800,7 +1806,7 @@ NotIoViolation: /* Cleanup the SEH frame */ - pop fs:[KPCR_EXCEPTION_LIST] + pop PCR[KPCR_EXCEPTION_LIST] add esp, 8 SetException: @@ -1824,11 +1830,11 @@ TRAP_PROLOG kit14 /* Check if we have a VDM alert */ - cmp dword ptr fs:[KPCR_VDM_ALERT], 0 + cmp dword ptr PCR[KPCR_VDM_ALERT], 0 jnz VdmAlertGpf /* Get the current thread */ - mov edi, fs:[KPCR_CURRENT_THREAD] + mov edi, PCR[KPCR_CURRENT_THREAD] /* Get the stack address of the frame */ lea eax, [esp+KTRAP_FRAME_LENGTH+NPX_FRAME_LENGTH] @@ -1840,7 +1846,7 @@ jb NoFixUp /* Check if we have a TEB */ - mov eax, fs:[KPCR_TEB] + mov eax, PCR[KPCR_TEB] or eax, eax jle NoFixUp @@ -1913,7 +1919,7 @@ jnz VdmPF /* Check if the fault occured in a VDM */ - mov esi, fs:[KPCR_CURRENT_THREAD] + mov esi, PCR[KPCR_CURRENT_THREAD] mov esi, [esi+KTHREAD_APCSTATE_PROCESS] cmp dword ptr [esi+EPROCESS_VDM_OBJECTS], 0 jz CheckStatus @@ -2006,8 +2012,8 @@ TRAP_PROLOG kit16 /* Check if this is the NPX Thread */ - mov eax, fs:[KPCR_CURRENT_THREAD] - cmp eax, fs:[KPCR_NPX_THREAD] + mov eax, PCR[KPCR_CURRENT_THREAD] + cmp eax, PCR[KPCR_NPX_THREAD] /* Get the initial stack and NPX frame */ mov ecx, [eax+KTHREAD_INITIAL_STACK] @@ -2059,7 +2065,7 @@ _KiCoprocessorError@0: /* Get the NPX Thread's Initial stack */ - mov eax, [fs:KPCR_NPX_THREAD] + mov eax, PCR[KPCR_NPX_THREAD] mov eax, [eax+KTHREAD_INITIAL_STACK] /* Make space for the FPU Save area */ @@ -2085,7 +2091,7 @@ push esp /* Go to kernel mode thread stack */ - mov eax, fs:[KPCR_CURRENT_THREAD] + mov eax, PCR[KPCR_CURRENT_THREAD] add esp, [eax+KTHREAD_INITIAL_STACK] /* Switch to good stack segment */ @@ -2112,7 +2118,7 @@ INT_PROLOG kui, DoNotPushFakeErrorCode /* Increase interrupt count */ - inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] + inc dword ptr PCR[KPCR_PRCB_INTERRUPT_COUNT] /* Put vector in EBX and make space for KIRQL */ mov ebx, [esp] @@ -2161,7 +2167,7 @@ _KiDispatchInterrupt@0: /* Get the PCR and disable interrupts */ - mov ebx, [fs:KPCR_SELF] + mov ebx, PCR[KPCR_SELF] cli /* Check if we have to deliver DPCs, timers, or deferred threads */ @@ -2281,7 +2287,7 @@ _KiChainedDispatch@0: /* Increase interrupt count */ - inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] + inc dword ptr PCR[KPCR_PRCB_INTERRUPT_COUNT] /* Save trap frame */ mov ebp, esp @@ -2308,17 +2314,14 @@ call _KiChainedDispatch2ndLvl@0 /* Exit the interrupt */ - mov esi, $ - cli - call _HalEndSystemInterrupt@8 - jmp _Kei386EoiHelper@0 + INT_EPILOG 0 .endfunc .func KiInterruptDispatch@0 _KiInterruptDispatch@0: /* Increase interrupt count */ - inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] + inc dword ptr PCR[KPCR_PRCB_INTERRUPT_COUNT] /* Save trap frame */ mov ebp, esp @@ -2346,27 +2349,51 @@ mov esi, [edi+KINTERRUPT_ACTUAL_LOCK] ACQUIRE_SPINLOCK(esi, IntSpin) + /* Make sure that this interrupt isn't storming */ + VERIFY_INT kid + + /* Save the tick count */ + mov ebx, _KeTickCount + /* Call the ISR */ mov eax, [edi+KINTERRUPT_SERVICE_CONTEXT] push eax push edi call [edi+KINTERRUPT_SERVICE_ROUTINE] + /* Check if the ISR timed out */ + add ebx, _KiISRTimeout + cmp _KeTickCount, ebx + jnc IsrTimeout + +ReleaseLock: /* Release the lock */ RELEASE_SPINLOCK(esi) /* Exit the interrupt */ - cli - call _HalEndSystemInterrupt@8 - jmp _Kei386EoiHelper@0 + INT_EPILOG 0 SpuriousInt: /* Exit the interrupt */ add esp, 8 - jmp _Kei386EoiHelper@0 + INT_EPILOG 1 #ifdef CONFIG_SMP IntSpin: SPIN_ON_LOCK esi, GetIntLock #endif -.endfunc + +IsrTimeout: + /* Print warning message */ + push [edi+KINTERRUPT_SERVICE_ROUTINE] + push offset _IsrTimeoutMsg + call _DbgPrint + add esp,8 + + /* Break into debugger, then continue */ + int 3 + jmp ReleaseLock + + /* Cleanup verification */ + VERIFY_INT_END kid, 0 +.endfunc

17 years, 9 months

[ekohl] 26136: Fix some dialog issues: - Use AUTOCHECKBOXes instead of CHECKBOXes. - Set the height of CHECKBOXes and PUSHBUTTONs to 14. - Get rid of overlapping controls. - Remove DS_FIXEDSYS dialog style. - Move language-independent resources to the main .rc file.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 19 00:56:25 2007 New Revision: 26136 URL: http://svn.reactos.org/svn/reactos?rev=26136&view=rev Log: Fix some dialog issues: - Use AUTOCHECKBOXes instead of CHECKBOXes. - Set the height of CHECKBOXes and PUSHBUTTONs to 14. - Get rid of overlapping controls. - Remove DS_FIXEDSYS dialog style. - Move language-independent resources to the main .rc file. Modified: trunk/reactos/dll/cpl/access/Cz.rc trunk/reactos/dll/cpl/access/De.rc trunk/reactos/dll/cpl/access/En.rc trunk/reactos/dll/cpl/access/Es.rc trunk/reactos/dll/cpl/access/Fr.rc trunk/reactos/dll/cpl/access/Hu.rc trunk/reactos/dll/cpl/access/Id.rc trunk/reactos/dll/cpl/access/It.rc trunk/reactos/dll/cpl/access/Ja.rc trunk/reactos/dll/cpl/access/Nl.rc trunk/reactos/dll/cpl/access/Pl.rc trunk/reactos/dll/cpl/access/Ru.rc trunk/reactos/dll/cpl/access/access.rc trunk/reactos/dll/cpl/access/resource.h Modified: trunk/reactos/dll/cpl/access/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Cz.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/Cz.rc (original) +++ trunk/reactos/dll/cpl/access/Cz.rc Mon Mar 19 00:56:25 2007 @@ -1,10 +1,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -IDI_CPLACCESS ICON "resources/applet.ico" IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Klávesnice" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -25,7 +23,7 @@ IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Zvuk" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -36,12 +34,12 @@ GROUPBOX "Funkce Zobrazení zvuku",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Pouijte Zobrazení zvuku, aby programy zobrazovaly textový popis zároveò se zvukem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Pouívat funkci &Zobrazení zvuku",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Pouívat funkci &Zobrazení zvuku",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Zobrazení" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -54,7 +52,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "My" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -66,44 +64,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Obecné" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Automatické vypnutí",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Vypnout &funkce usnadnìní po neèinnosti delí ne:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 minut", IDC_RESET_5 - // MENUITEM "10 minut", IDC_RESET_10 - // MENUITEM "15 minut", IDC_RESET_15 - // MENUITEM "20 minut", IDC_RESET_20 - // MENUITEM "25 minut", IDC_RESET_25 - // MENUITEM "30 minut", IDC_RESET_30 - //} + CHECKBOX "Vypnout &funkce usnadnìní po neèinnosti delí ne:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Upozornìní",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Pøi zapnutí funkce zobrazit upozornìní.",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Upozornit na zapnutí nebo vypnutí funkce usnadnìní zvukem.",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+20,LABELLINE(1) + CHECKBOX "Pøi zapnutí funkce zobrazit upozornìní.",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Upozornit na zapnutí nebo vypnutí funkce usnadnìní zvukem.",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+20,14 - GROUPBOX "Funkce SerialKey",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "Funkce SerialKey Vám umoní alternativní pøístup k funkcím myi a klávesnice.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Pouít funkci &SerialKey",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Pouít funkci &SerialKey",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "Na&stavení",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "Na&stavení",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) GROUPBOX "Monosti správy",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "Pouít &nastavení pøi pøihláení.",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Po&uít nastavení jako výchozí pro nové uivatele.",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Pouít &nastavení pøi pøihláení.",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Po&uít nastavení jako výchozí pro nové uivatele.",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Monosti usnadnìní" IDS_CPLSYSTEMDESCRIPTION "Upraví monosti usnadnìní pro tento poèítaè." END - Modified: trunk/reactos/dll/cpl/access/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/De.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/De.rc (original) +++ trunk/reactos/dll/cpl/access/De.rc Mon Mar 19 00:56:25 2007 @@ -2,109 +2,98 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -IDI_CPLACCESS ICON "resources/applet.ico" - IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tastatur" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Einrastfunktion",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Benutzen Sie die Feststellfunktion um Kombinationen mit Shift, Strg oder Alt als Tastenfolge eingeben zu können.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Einrastfunktion a&ktivieren",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+4,14 + AUTOCHECKBOX "Einrastfunktion a&ktivieren",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+4,14 PUSHBUTTON "&Einstellungen",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 GROUPBOX "Verzögerung",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Benutzen Sie die Anschlägsverzögerung, wenn ReactOS kurze oder wiederholte Anschläge ignorieren oder die Wiederholungsrate verringern soll.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "&Verzögerung aktivieren",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "&Verzögerung aktivieren",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14 PUSHBUTTON "E&instellungen",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "Signalfunktion",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Benutzen Sie die Signalfunktion, wenn Sie einen Signalton hören wollen, wenn Sie Caps-, Num-, oder Scroll-Lock drücken.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,LABELLINE(3) - CHECKBOX "&Signalfunktion benutzen",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + LTEXT "Benutzen Sie die Signalfunktion, wenn Sie einen Signalton hören wollen, wenn Sie Caps-, Num-, oder Scroll-Lock drücken.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Signalfunktion benutzen",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETPADDING(15),14 PUSHBUTTON "Ei&nstellungen",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// CHECKBOX "Extra Tastaturhilfe in den P&rogrammen anzeigen ",IDC_KEYBOARD_EXTRA +// AUTOCHECKBOX "Extra Tastaturhilfe in den P&rogrammen anzeigen ",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sound" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Darstellungsoption",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Benutzen Sie die Sounddarstellung, wenn ReactOS Sounds visuell darstellen soll.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "&Darstellungsoption aktivieren",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+15,14 + AUTOCHECKBOX "&Darstellungsoption aktivieren",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+15,14 PUSHBUTTON "&Einstellungen",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 GROUPBOX "Sounddarstellung",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Benutzen Sie die Sounddarstellung, damit die Programme Sprachausgaben und Sounds schriftlich darstellen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "&Sounddarstellung aktivieren",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Sounddarstellung aktivieren",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Anzeige" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Hoher Kontrast",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Aktivieren Sie diese Option, damit ReactOS Farben und Schrift besonders leserlich darstellt.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "&Hohen Kontrast aktivieren",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+5,14 + AUTOCHECKBOX "&Hohen Kontrast aktivieren",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+5,14 PUSHBUTTON "&Einstellungen",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Maus" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Tastaturmaus",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Aktivieren Sie diese Option, um den Mauszeiger mit dem Nummernpad der Tastatur zu steuern.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "&Tastaturmaus aktivieren",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "&Tastaturmaus aktivieren",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 PUSHBUTTON "&Einstellungen",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Automatischer Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Ei&ngabehilfen automatisch deaktivieren nach:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 Minuten", IDC_RESET_5 - // MENUITEM "10 Minuten", IDC_RESET_10 - // MENUITEM "15 Minuten", IDC_RESET_15 - // MENUITEM "20 Minuten", IDC_RESET_20 - // MENUITEM "25 Minuten", IDC_RESET_25 - // MENUITEM "30 Minuten", IDC_RESET_30 - //} + AUTOCHECKBOX "Ei&ngabehilfen automatisch deaktivieren nach:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + LTEXT "&Minuten",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Benachrichtigung",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Warnsignal ausgeben, wenn eine Funktion eingeschaltet wird",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+15,LABELLINE(2) - CHECKBOX "Soundsignal beim Ein- und Ausschalten einer Funktion ausgeben",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+25,LABELLINE(1) + AUTOCHECKBOX "Warnsignal ausgeben, wenn eine Funktion eingeschaltet wird",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+15,14 + AUTOCHECKBOX "Soundsignal beim Ein- und Ausschalten einer Funktion ausgeben",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+25,14 - GROUPBOX "Externe Eingabehilfen",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "Externe Eingabehilfen bieten alternativen Zugriff auf Tastatur- und Mausfunktionen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "E&xterne Eingabehilfen aktivieren",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + AUTOCHECKBOX "E&xterne Eingabehilfen aktivieren",IDC_SERIAL_BOX,PROPSHEETPADDING(4),LABELLINE(16)-4,PROPSHEETPADDING(19)+4,14 - PUSHBUTTON "&Einstellungen",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "&Einstellungen",IDC_SERIAL_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(16)-4,PROPSHEETPADDING(15),14 GROUPBOX "Verwaltungsoptionen",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "&Alle Einstellungen auf dem Anmeldebildschrim anwenden",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Alle Einstellungen als &Standart für neue Benutzer anwenden",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+10,LABELLINE(1) + AUTOCHECKBOX "&Alle Einstellungen auf dem Anmeldebildschrim anwenden",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + AUTOCHECKBOX "Alle Einstellungen als &Standard für neue Benutzer anwenden",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+10,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Bedienbarkeit" IDS_CPLSYSTEMDESCRIPTION "Stellen sie die Bedienbarkeitsfunktionen für ihren Computer ein." END - Modified: trunk/reactos/dll/cpl/access/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/En.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/En.rc (original) +++ trunk/reactos/dll/cpl/access/En.rc Mon Mar 19 00:56:25 2007 @@ -1,10 +1,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDI_CPLACCESS ICON "resources/applet.ico" IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Keyboard" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -18,14 +16,14 @@ PUSHBUTTON "S&ettings",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "ToggleKeys",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Use &ToggleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Use &ToggleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Setti&ngs",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 // CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sound" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -36,12 +34,12 @@ GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Display" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -54,7 +52,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Mouse" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -66,44 +64,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 Minutes", IDC_RESET_5 - // MENUITEM "10 Minutes", IDC_RESET_10 - // MENUITEM "15 Minutes", IDC_RESET_15 - // MENUITEM "20 Minutes", IDC_RESET_20 - // MENUITEM "25 Minutes", IDC_RESET_25 - // MENUITEM "30 Minutes", IDC_RESET_30 - //} + CHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Notification",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Give warning message when turning a feature on",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Make a sound when turning a feature on or off",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Give warning message when turning a feature on",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Make a sound when turning a feature on or off",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - GROUPBOX "SerialKey Devices",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "SerialKey devices allow alternative access to keyboard and mouse features.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Support &SerialKey devices",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Support &SerialKey devices",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "S&ettings",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "S&ettings",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) GROUPBOX "Administrative options",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "Apply all settings to l&ogon desktop",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Apply all settings to &defaults for new users",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Apply all settings to l&ogon desktop",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Apply all settings to &defaults for new users",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibility" IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." END - Modified: trunk/reactos/dll/cpl/access/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Es.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/Es.rc (original) +++ trunk/reactos/dll/cpl/access/Es.rc Mon Mar 19 00:56:25 2007 @@ -4,11 +4,8 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDI_CPLACCESS ICON "resources/applet.ico" - - IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Teclado" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -22,14 +19,14 @@ PUSHBUTTON "Opcion&es",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "Teclas Activas",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Use &Teclas Activas si desea escuchar tonos al presionar Caps Lock, Num Lock, y Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Usar Teclas Activas",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Usar Teclas Activas",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Opcio&nes",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 // CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sonidos" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -40,12 +37,12 @@ GROUPBOX "Despliegue Sonidos",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Use el Despliegue de Sonidos para decirle a sus programas que enseñen texto por las voces y sonidos que utilizen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Usar Despliegue de Sonidos",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Usar Despliegue de Sonidos",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Despliegue" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -58,7 +55,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Raton" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -70,44 +67,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Apagar las opciones de accesibilidad despues de estar inactivo por:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 Minutos", IDC_RESET_5 - // MENUITEM "10 Minutos", IDC_RESET_10 - // MENUITEM "15 Minutos", IDC_RESET_15 - // MENUITEM "20 Minutos", IDC_RESET_20 - // MENUITEM "25 Minutos", IDC_RESET_25 - // MENUITEM "30 Minutos", IDC_RESET_30 - //} + CHECKBOX "Apagar las opciones de accesibilidad despues de estar inactivo por:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Notificación",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Dar mensage de aviso al activar unacaracterística",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Hacer un sonido al activar una característica",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Dar mensage de aviso al activar unacaracterística",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Hacer un sonido al activar una característica",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - GROUPBOX "Dispositivos de Teclados Seriales",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "Los Dispositivos de Teclados Seriales te permiten una alternativa de acceso de teclado y raton.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Apoyar Dispositivos de Teclados &Seriales",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Apoyar Dispositivos de Teclados &Seriales",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "Opcion&es",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "Opcion&es",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) GROUPBOX "Opciones Administrativas",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "Applicar todas las opciones al escritorio de inicio",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Applicar todas las opciones al escritorio de nuevos usuarios",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Applicar todas las opciones al escritorio de inicio",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Applicar todas las opciones al escritorio de nuevos usuarios",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibilidad" IDS_CPLSYSTEMDESCRIPTION "Cambia las características de accesibilidad disponibles para su computadora." END - Modified: trunk/reactos/dll/cpl/access/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Fr.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/Fr.rc (original) +++ trunk/reactos/dll/cpl/access/Fr.rc Mon Mar 19 00:56:25 2007 @@ -1,11 +1,9 @@ // French resource file by G. Maton LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDI_CPLACCESS ICON "resources/applet.ico" - IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Clavier" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -19,14 +17,14 @@ PUSHBUTTON "P&aramètres",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "Touches bascules",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Utilisez les touches &bascules si vous voulez entendre un son émis à chaques fois que vous appuyez sur Verr. maj, Verr. num, et Arrêt défil.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Utiliser les touches bascules",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Utiliser les touches bascules",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Para&mètres",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 // CHECKBOX "&Afficher l'aide supplémentaire sur le clavier dans les programmes",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Son" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -37,12 +35,12 @@ GROUPBOX "Sons texte",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Utilisez les sons texte pour que vos programmes affichent le texte des paroles et des sons qu'il génèrent.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Utiliser les sons &texte",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Utiliser les sons &texte",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Display" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -55,7 +53,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Souris" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -67,44 +65,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Réinitialisation automatique",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "&Désactiver les fonctionnalités d'accessibilité après un délai d'inactivité de :",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 Minutes", IDC_RESET_5 - // MENUITEM "10 Minutes", IDC_RESET_10 - // MENUITEM "15 Minutes", IDC_RESET_15 - // MENUITEM "20 Minutes", IDC_RESET_20 - // MENUITEM "25 Minutes", IDC_RESET_25 - // MENUITEM "30 Minutes", IDC_RESET_30 - //} + CHECKBOX "&Désactiver les fonctionnalités d'accessibilité après un délai d'inactivité de :",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Avertissement",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Afficher un message d'avertissement lors de l'activation d'une fonctionnalité",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Émettre un son lors de l'activation/désactivation d'une fonctionnalité",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Afficher un message d'avertissement lors de l'activation d'une fonctionnalité",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Émettre un son lors de l'activation/désactivation d'une fonctionnalité",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - GROUPBOX "Périphériques Touches série",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "Les périphériques Touches série représentent un une alternative pour accéder aux fonctionnalités du clavier et de la souris.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "U&tiliser les touches série",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "U&tiliser les touches série",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "&Paramètres",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "&Paramètres",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,14 GROUPBOX "Options d'administration",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "Appliquer tous les paramètres au Bureau d'ou&verture de session",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Appliq&uer tous les paramètres par défaut aux nouveaux utilisateurs",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Appliquer tous les paramètres au Bureau d'ou&verture de session",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Appliq&uer tous les paramètres par défaut aux nouveaux utilisateurs",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibilité" IDS_CPLSYSTEMDESCRIPTION "Adapte les fonctionnalités d'accessibilité pour votre ordinateur." END - Modified: trunk/reactos/dll/cpl/access/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Hu.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/Hu.rc (original) +++ trunk/reactos/dll/cpl/access/Hu.rc Mon Mar 19 00:56:25 2007 @@ -1,11 +1,9 @@ // Hungarian resource file by Peter Lukacs LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL -IDI_CPLACCESS ICON "resources/applet.ico" - IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Billentyûzet" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -19,14 +17,14 @@ PUSHBUTTON "B&eállítások",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(8),14 GROUPBOX "Állásjelzõ hangok",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Ha a Caps Lock, Num Lock, és Scroll Lock billentyûk lenyomásakor hangot szeretne hallani, használja az Állásjelzõ hangok lehetõséget.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Állásjelzõ hangok használata",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Állásjelzõ hangok használata",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Beállítá&sok",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(8),14 // CHECKBOX "Kibõvített billentyûzet segítség megjelenítése a programokban",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hang" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -37,12 +35,12 @@ GROUPBOX "HangFeliratok",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Ezzel a funkcióval adhatja meg programjainak, hogy a hangokhoz jelenítsenek meg feliratokat is.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Hang&Feliratok használata",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Hang&Feliratok használata",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Képernyõ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -55,7 +53,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Egér" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -67,44 +65,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Általános" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Automatikus visszaállítás",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "&Kapcsolja ki a kisegítõ lehetõségeket egy bizonyos idejû tétlenség után:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 perc", IDC_RESET_5 - // MENUITEM "10 perc", IDC_RESET_10 - // MENUITEM "15 perc", IDC_RESET_15 - // MENUITEM "20 perc", IDC_RESET_20 - // MENUITEM "25 perc", IDC_RESET_25 - // MENUITEM "30 perc", IDC_RESET_30 - //} + CHECKBOX "&Kapcsolja ki a kisegítõ lehetõségeket egy bizonyos idejû tétlenség után:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "&Figyelmeztetés",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Fi&gyelmeztetõ üzenet kiírása egy funkció bekapcsolásakor",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "&Hangjelzés használata egy funkció be- vagy kikapcsolásakor",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Fi&gyelmeztetõ üzenet kiírása egy funkció bekapcsolásakor",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "&Hangjelzés használata egy funkció be- vagy kikapcsolásakor",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - GROUPBOX "Sorosgomb eszközök",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "A Sorosgomb eszközök a billentyûzet és egér funkcióinak eltérõ elérését teszik lehetõvé.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "&Sorosgomb eszközök támogatása",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "&Sorosgomb eszközök támogatása",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "B&eállítások",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "B&eállítások",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) GROUPBOX "Felügyeleti beállítások",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "&Minden beállítás alkalmazása a bejelentkezõ képernyõre is",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "&A beállítások alkalmazása az új felhasználóknál",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "&Minden beállítás alkalmazása a bejelentkezõ képernyõre is",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "&A beállítások alkalmazása az új felhasználóknál",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Kisegítõ lehetõségek" IDS_CPLSYSTEMDESCRIPTION "A kisegítõ lehetõségek testreszabása a számítógépén." END - Modified: trunk/reactos/dll/cpl/access/Id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Id.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/Id.rc (original) +++ trunk/reactos/dll/cpl/access/Id.rc Mon Mar 19 00:56:25 2007 @@ -2,11 +2,9 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -IDI_CPLACCESS ICON "resources/applet.ico" - IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Keyboard" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -20,14 +18,14 @@ PUSHBUTTON "S&etelan",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "ToggleKeys",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Gunakan ToggleKeys jika anda ingin mendengan nada ketika menekan Caps Lock, Num Lock, dan Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Gunakan &ToggleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Gunakan &ToggleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Setelan&n",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 // CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Suara" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -38,12 +36,12 @@ GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Gunakan ShowSounds untuk memberitahu program anda untuk menampilkan judul untuk speech dan suara yang dibuatnya.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Gunakan S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Gunakan S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tampilan" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -56,7 +54,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Mouse" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -68,44 +66,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Umum" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Otomatis Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "&Matikan fitur aksesibilitas setelah diam selama:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 Minutes", IDC_RESET_5 - // MENUITEM "10 Minutes", IDC_RESET_10 - // MENUITEM "15 Minutes", IDC_RESET_15 - // MENUITEM "20 Minutes", IDC_RESET_20 - // MENUITEM "25 Minutes", IDC_RESET_25 - // MENUITEM "30 Minutes", IDC_RESET_30 - //} + CHECKBOX "&Matikan fitur aksesibilitas setelah diam selama:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Pemberitahuan",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Berikan pesan peringatan ketika menghidupkan fitur ini",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Buat suara ketika menghidupkan/mematikan fitur ini",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Berikan pesan peringatan ketika menghidupkan fitur ini",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Buat suara ketika menghidupkan/mematikan fitur ini",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - GROUPBOX "SerialKey Devices",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "SerialKey devices membolehkan akses alternatif pada fitur keyboard dan mouse.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Dukung &SerialKey devices",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Dukung &SerialKey devices",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "S&etelan",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "S&etelan",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,14 GROUPBOX "Opsi Administratif",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "Terapkan semua setelan ke l&ogon desktop",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Terapkan semua setelan ke &standar bagi pengguna baru",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Terapkan semua setelan ke l&ogon desktop",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Terapkan semua setelan ke &standar bagi pengguna baru",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Aksesibilitas" IDS_CPLSYSTEMDESCRIPTION "Mengkustomisasi fitur aksesibilitas untuk komputer anda." END - Modified: trunk/reactos/dll/cpl/access/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/It.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/It.rc (original) +++ trunk/reactos/dll/cpl/access/It.rc Mon Mar 19 00:56:25 2007 @@ -1,10 +1,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN - -IDI_CPLACCESS ICON "resources/applet.ico" IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tastiera" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -18,14 +16,14 @@ PUSHBUTTON "I&mpostazioni",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "Bistabili",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Se vuoi un segnale acustico quando viene premuto Blocco Maiuscole, Num o Scr.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Use &Bistabili",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Use &Bistabili",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Im&postazioni",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 // CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Suoni" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -36,12 +34,12 @@ GROUPBOX "Titoli",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Usa Titoli per informare i programmi che devono mostrare del testo corrispondente a suoni e parlato.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Usa &Titoli",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Usa &Titoli",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Video" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -54,7 +52,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Mouse" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -66,44 +64,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Reset Automatico",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "&Disattiva le funzioni di accessibilità se fermo per:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 Minutes", IDC_RESET_5 - // MENUITEM "10 Minutes", IDC_RESET_10 - // MENUITEM "15 Minutes", IDC_RESET_15 - // MENUITEM "20 Minutes", IDC_RESET_20 - // MENUITEM "25 Minutes", IDC_RESET_25 - // MENUITEM "30 Minutes", IDC_RESET_30 - //} + CHECKBOX "&Disattiva le funzioni di accessibilità se fermo per:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Notifiche",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Avvisa con un messaggio quando si attiva una funzione",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Fai una segnalazione acustica quando una funzione viene attivata o ddisattivata",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Avvisa con un messaggio quando si attiva una funzione",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Fai una segnalazione acustica quando una funzione viene attivata o ddisattivata",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - GROUPBOX "Dispositivi seriali",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "I dispositivi seriali permettono una modalità alternativa per gestire le funzioni di mouse e tastiera.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) CHECKBOX "Supporta i Dispositivi &Seriali",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) - - PUSHBUTTON "&Impostazioni",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + + PUSHBUTTON "&Impostazioni",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) GROUPBOX "Opzioni di amministrazione",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "Applica tutte le impostazioni al desktop di &login ",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Applica tutte le impostazioni a quelle predefinite per i nuovi utenti",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Applica tutte le impostazioni al desktop di &login ",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Applica tutte le impostazioni a quelle predefinite per i nuovi utenti",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibility" IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." END - Modified: trunk/reactos/dll/cpl/access/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Ja.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/Ja.rc (original) +++ trunk/reactos/dll/cpl/access/Ja.rc Mon Mar 19 00:56:25 2007 @@ -1,10 +1,8 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -IDI_CPLACCESS ICON "resources/applet.ico" IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "L[{[h" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN @@ -18,14 +16,14 @@ PUSHBUTTON "Ýè(&E)",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "ØèÖ¦L[@\\",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "ØèÖ¦L[@\\ðg¤ÆACapsLockANumLockAScrollLock L[ðµ½Æ«É¹ðÂçµÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "ØèÖ¦L[@\\ðg¤(&T)",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "ØèÖ¦L[@\\ðg¤(&T)",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Ýè(&N)",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 // CHECKBOX "vOÅÇÁÌL[{[h wvð\\¦·é(&W)",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "TEh" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN @@ -36,12 +34,12 @@ GROUPBOX "TEhðà",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "vOª¹ðÂç·Æ«AÂç·¹ÉÂ¢Äðàð\\¦µÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "TEhðà(&H)",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "TEhðà(&H)",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "æÊ" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN @@ -54,7 +52,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "}EX" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN @@ -66,44 +64,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "SÊ" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN GROUPBOX "©®Zbg",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "[U[âð³øÉ·éÜÅÌÒ¿Ô(&T):",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 Minutes", IDC_RESET_5 - // MENUITEM "10 Minutes", IDC_RESET_10 - // MENUITEM "15 Minutes", IDC_RESET_15 - // MENUITEM "20 Minutes", IDC_RESET_20 - // MENUITEM "25 Minutes", IDC_RESET_25 - // MENUITEM "30 Minutes", IDC_RESET_30 - //} + CHECKBOX "[U[âð³øÉ·éÜÅÌÒ¿Ô(&T):",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Êm",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "[U[âðLøÉµ½Æ«AbZ[Wðo·",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "[U[âðLøÜ½Í³øÉµ½Æ«A¹ðÂç·",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "[U[âðLøÉµ½Æ«AbZ[Wðo·",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "[U[âðLøÜ½Í³øÉµ½Æ«A¹ðÂç·",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - GROUPBOX "VAL[ foCX",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "VAL[ foCXðL[{[hâ}EXÌãíèÉg¤±ÆªÅ«Ü·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "VAL[ foCXðg¤(&S)",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "VAL[ foCXðg¤(&S)",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "Ýè(&E)",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "Ýè(&E)",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) GROUPBOX "ÇIvV",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "Ýè·×ÄðOIÉKp·é(&O)",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Ýè·×ÄðVµ¢[U[ÌKèlÆ·é(&D)",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Ýè·×ÄðOIÉKp·é(&O)",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Ýè·×ÄðVµ¢[U[ÌKèlÆ·é(&D)",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "[U[â" IDS_CPLSYSTEMDESCRIPTION "oA®oAlÌóÔÉí¹ÄA[U[ðâ·é@\\ð²®µÜ·B" END - Modified: trunk/reactos/dll/cpl/access/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Nl.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/Nl.rc (original) +++ trunk/reactos/dll/cpl/access/Nl.rc Mon Mar 19 00:56:25 2007 @@ -1,10 +1,10 @@ -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie +//vertaald door Lionel Lowie -IDI_CPLACCESS ICON "resources/applet.ico" +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Toetsenbord" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -18,14 +18,14 @@ PUSHBUTTON "I&nstellingen...",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "Schakeltoetsen",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "U kunt schakeltoetsen gebruiken als u wilt dat er een geluid wordt weergegeven als u CapsLock, NumLock of ScrollLock indrukt.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Schakeltoetsen gebruiken",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Schakeltoetsen gebruiken",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Inst&ellingen...",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 // CHECKBOX "Extra hulp voor toetsenborden weergeven in programma's",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geluid" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -36,12 +36,12 @@ GROUPBOX "Geluidsbeschrijving",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "U kunt geluidsbeschrijving gebruiken als u uw programma's bijschriften wilt laten weergeven voor spraak en andere geluiden.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Geluids&beschrijving gebruiken",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Geluids&beschrijving gebruiken",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Weergave" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -54,7 +54,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Muis" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -66,44 +66,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Algemeen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Beginwaarden automatisch instellen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "T&oegankelijkheidsfuncties uitschakelen wanneer deze niet gebruikte worden gedurende:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 Minuten", IDC_RESET_5 - // MENUITEM "10 Minuten", IDC_RESET_10 - // MENUITEM "15 Minuten", IDC_RESET_15 - // MENUITEM "20 Minuten", IDC_RESET_20 - // MENUITEM "25 Minuten", IDC_RESET_25 - // MENUITEM "30 Minuten", IDC_RESET_30 - //} + CHECKBOX "T&oegankelijkheidsfuncties uitschakelen wanneer deze niet gebruikte worden gedurende:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Melding",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Waarsc&huwing weergeven als een functie wordt ingeschakeld",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,LABELLINE(2) - CHECKBOX "&Geluid laten horen als een functie wordt in- of uitgeschakeld",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,LABELLINE(1) + CHECKBOX "Waarsc&huwing weergeven als een functie wordt ingeschakeld",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,14 + CHECKBOX "&Geluid laten horen als een functie wordt in- of uitgeschakeld",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,14 - GROUPBOX "Serietoetsenapparaten",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "Serietoetsenapparaten maken het mogelijk toetsenbord- en muisfuncties op alternatieve manieren te gebruiken.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Serietoetsenapparaten on&dersteunen",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Serietoetsenapparaten on&dersteunen",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "Inst&ellingen",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "Inst&ellingen",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) GROUPBOX "Beheeropties",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "&Alle instellingen toepassen op bureaublad bij aanmelden.",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Alle instellingen &standaard toepassen op nieuwe gebruikers.",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "&Alle instellingen toepassen op bureaublad bij aanmelden.",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Alle instellingen &standaard toepassen op nieuwe gebruikers.",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Toegankelijkheidsopties" IDS_CPLSYSTEMDESCRIPTION "Toehangelijkheidsopties voor deze computer aanpassen." END - Modified: trunk/reactos/dll/cpl/access/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Pl.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/Pl.rc (original) +++ trunk/reactos/dll/cpl/access/Pl.rc Mon Mar 19 00:56:25 2007 @@ -2,11 +2,9 @@ LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL -IDI_CPLACCESS ICON "resources/applet.ico" - IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Klawiatura" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -20,14 +18,14 @@ PUSHBUTTON "Us&tawienia",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "Klawisze Prze³¹czaj¹ce",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "U¿yj funkcji &Klawisze Prze³¹czaj¹ce, jeli chcesz s³yszeæ dwiêk przy naciskaniu klawiszy Caps Lock, Num Lock albo Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "U¿yj Klawiszy Prze³¹czaj¹cych",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "U¿yj Klawiszy Prze³¹czaj¹cych",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Ustawie&nia",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 // CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Dwiêk" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -38,12 +36,12 @@ GROUPBOX "Poka¿ Dwiêki",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "U¿yj funkcji Poka¿ Dwiêki, aby nakazaæ swoim programom wywietlanie napisów w chwili generacji dwiêku lub mowy.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "U¿yj funkcji &Poka Dwiêki",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "U¿yj funkcji &Poka Dwiêki",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ekran" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -56,7 +54,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Mysz" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -68,43 +66,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ogólne" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Automatyczny reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "&Wy³¹cz funkcje u³atwiaj¹ce dostêp kiedy komputer nie jest u¿ywany przez:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 minut", IDC_RESET_5 - // MENUITEM "10 minus", IDC_RESET_10 - // MENUITEM "15 minut", IDC_RESET_15 - // MENUITEM "20 minut", IDC_RESET_20 - // MENUITEM "25 minut", IDC_RESET_25 - // MENUITEM "30 minut", IDC_RESET_30 - //} + CHECKBOX "&Wy³¹cz funkcje u³atwiaj¹ce dostêp kiedy komputer nie jest u¿ywany przez:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Powiadomienia",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Ostrzegaj kiedy funkcja jest w³¹czana",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Odgrywaj dwiêk, kiedy funkcja jest w³¹czana albo wy³¹czana",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) - + CHECKBOX "Ostrzegaj kiedy funkcja jest w³¹czana",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Odgrywaj dwiêk, kiedy funkcja jest w³¹czana albo wy³¹czana",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Urz¹dzenia klawiszy szeregowych",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "Urz¹dzenia klawiszy szeregowych zapewniaj¹ alternatywny dostêp do funkcji klawiatury lub myszy.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Wspieraj urz¹dzenia klawi&szy szeregowych",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Wspieraj urz¹dzenia klawi&szy szeregowych",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "&Ustawienia",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "&Ustawienia",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,14 GROUPBOX "Opcje zarz¹dzania",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "Zastosuj wszystkie ustawienia do pu&lpitu logowania",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Zastosuj wszystkie ustawienia do &domylnego profilu dla nowych u¿ytkowników",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Zastosuj wszystkie ustawienia do pu&lpitu logowania",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Zastosuj wszystkie ustawienia do &domylnego profilu dla nowych u¿ytkowników",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "U³atwienia dostêpu" IDS_CPLSYSTEMDESCRIPTION "Personalizuje funkcje u³atwieñ dostêpu na twoim komputerze." END - Modified: trunk/reactos/dll/cpl/access/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Ru.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/Ru.rc (original) +++ trunk/reactos/dll/cpl/access/Ru.rc Mon Mar 19 00:56:25 2007 @@ -1,10 +1,8 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL - -IDI_CPLACCESS ICON "resources/applet.ico" IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Êëàâèàòóðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -18,14 +16,14 @@ PUSHBUTTON "Í&àñòðîéêà",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "Îçâó÷èâàíèå ïåðåêëþ÷åíèÿ ðåæèìîâ",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Îçâó÷èâàíèå íàæàòèÿ êëàâèø ïåðåêëþ÷åíèÿ ðåæèìîâ Caps Lock, Num Lock è Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "&Îçâó÷èâàíèå",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "&Îçâó÷èâàíèå",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Íà&ñòðîéêà",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 // CHECKBOX "&Äîïîëíèòåëüíûå ñâåäåíèÿ î ðàáîòå ñ êëàâèàòóðîé",IDC_KEYBOARD_EXTRA END IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Çâóê" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -36,12 +34,12 @@ GROUPBOX "Ñóáòèòðû",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Ñîïðîâîæäåíèå çâóêîâ è ðå÷è ñóáòèòðàìè.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - CHECKBOX "Ñ&óáòèòðû",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Ñ&óáòèòðû",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ýêðàí" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -54,7 +52,7 @@ IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ìûøü" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -66,44 +64,34 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Îáùèå" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Àâòîìàòè÷åñêèé ñáðîñ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "&Îòêëþ÷àòü ïðè ïðîñòîå â òå÷åíèå:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 Ìèíóò", IDC_RESET_5 - // MENUITEM "10 Ìèíóò", IDC_RESET_10 - // MENUITEM "15 Ìèíóò", IDC_RESET_15 - // MENUITEM "20 Ìèíóò", IDC_RESET_20 - // MENUITEM "25 Ìèíóò", IDC_RESET_25 - // MENUITEM "30 Ìèíóò", IDC_RESET_30 - //} + CHECKBOX "&Îòêëþ÷àòü ïðè ïðîñòîå â òå÷åíèå:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Óâåäîìëåíèå",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - CHECKBOX "Âûäàâàòü ñîîáùåíèå ïðè âêëþ÷åíèè &ðåæèìà",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Âûäàâàòü çâóêîâîé ñèãíàë ïðè èçìåíåíèè ð&åæèìà",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Âûäàâàòü ñîîáùåíèå ïðè âêëþ÷åíèè &ðåæèìà",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Âûäàâàòü çâóêîâîé ñèãíàë ïðè èçìåíåíèè ð&åæèìà",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - GROUPBOX "Àëüòåðíàòèâíûå óñòðîéñòâà ââîäà",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "Èñïîëüçîâàíèå àëüòåðíàòèâíûõ óñòðîéñòâ ââîäà, çàìåíÿþùèõ ìûøü è êëàâèàòóðó.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "&Àëüòåðíàòèâíûå óñòðîéñòâà ââîäà",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "&Àëüòåðíàòèâíûå óñòðîéñòâà ââîäà",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "Íà&ñòðîéêà",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + PUSHBUTTON "Íà&ñòðîéêà",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,14 GROUPBOX "Àäìèíèñòðàòèâíûå ïàðàìåòðû",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - - CHECKBOX "Ïðèìåíèòü &ê ðàáî÷åìó ñòîëó âõîäà â ñèñòåìó",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - CHECKBOX "Èñ&ïîëüçîâàòü äëÿ âñåõ íîâûõ ïîëüçîâàòåëåé",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + CHECKBOX "Ïðèìåíèòü &ê ðàáî÷åìó ñòîëó âõîäà â ñèñòåìó",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + CHECKBOX "Èñ&ïîëüçîâàòü äëÿ âñåõ íîâûõ ïîëüçîâàòåëåé",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Ñïåöèàëüíûå âîçìîæíîñòè" IDS_CPLSYSTEMDESCRIPTION "Íàñòðîéêà ñïåöèàëüíûõ âîçìîæíîñòåé Âàøåãî êîìïüþòåðà." END - Modified: trunk/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rc (original) +++ trunk/reactos/dll/cpl/access/access.rc Mon Mar 19 00:56:25 2007 @@ -1,11 +1,16 @@ #include <windows.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Accessibility Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "access\0" #define REACTOS_STR_ORIGINAL_FILENAME "access.cpl\0" #include <reactos/version.rc> + +IDI_CPLACCESS ICON "resources/applet.ico" + #include "Cz.rc" #include "De.rc" Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Mon Mar 19 00:56:25 2007 @@ -38,7 +38,7 @@ #define IDC_MOUSE_BOX 211 #define IDC_MOUSE_BUTTON 212 #define IDC_RESET_BOX 213 -#define IDC_RESET_POPUP 214 +#define IDC_RESET_COMBO 214 #define IDC_NOTIFICATION_MESSAGE 215 #define IDC_NOTIFICATION_SOUND 216 #define IDC_SERIAL_BOX 217 @@ -47,7 +47,6 @@ #define IDC_ADMIN_USERS_BOX 220 - #endif /* __CPL_RESOURCE_H */ /* EOF */

17 years, 9 months

[fireball] 26135: It's better to zero-initialize these variables before calling RtlQueryRegistryValues().

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 19 00:55:21 2007 New Revision: 26135 URL: http://svn.reactos.org/svn/reactos?rev=26135&view=rev Log: It's better to zero-initialize these variables before calling RtlQueryRegistryValues(). Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Mon Mar 19 00:55:21 2007 @@ -1333,7 +1333,7 @@ DWORD *Count, DWORD Size) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; FONT_FAMILY_INFO_CALLBACK_CONTEXT Context; NTSTATUS Status; @@ -3978,7 +3978,7 @@ SubstituteFontFamilyKey(PUNICODE_STRING FaceName, LPCWSTR Key) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; NTSTATUS Status; UNICODE_STRING Value;

17 years, 9 months

[spetreolle] 26134: add KsInitializeDriver

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Mar 18 20:12:18 2007 New Revision: 26134 URL: http://svn.reactos.org/svn/reactos?rev=26134&view=rev Log: add KsInitializeDriver Modified: trunk/reactos/drivers/multimedia/ks/ks.def trunk/reactos/drivers/multimedia/ks/misc.c trunk/reactos/include/ddk/ks.h Modified: trunk/reactos/drivers/multimedia/ks/ks.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/ks/ks.d… ============================================================================== --- trunk/reactos/drivers/multimedia/ks/ks.def (original) +++ trunk/reactos/drivers/multimedia/ks/ks.def Sun Mar 18 20:12:18 2007 @@ -109,3 +109,4 @@ KsSetTargetDeviceObject@8 KsSetTargetState@8 KsSynchronousIoControlDevice@32 +KsInitializeDriver@12 Modified: trunk/reactos/drivers/multimedia/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/ks/misc… ============================================================================== --- trunk/reactos/drivers/multimedia/ks/misc.c (original) +++ trunk/reactos/drivers/multimedia/ks/misc.c Sun Mar 18 20:12:18 2007 @@ -216,3 +216,17 @@ return STATUS_UNSUCCESSFUL; } +/* + @unimplemented +*/ +KSDDKAPI NTSTATUS NTAPI +KsInitializeDriver( +IN PDRIVER_OBJECT DriverObject, +IN PUNICODE_STRING RegistryPath, +IN const KSDEVICE_DESCRIPTOR *Descriptor OPTIONAL +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + Modified: trunk/reactos/include/ddk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ks.h?rev=26134… ============================================================================== --- trunk/reactos/include/ddk/ks.h (original) +++ trunk/reactos/include/ddk/ks.h Sun Mar 18 20:12:18 2007 @@ -1540,6 +1540,37 @@ PFNKSFILTERVOID Reset; } KSFILTER_DISPATCH, *PKSFILTER_DISPATCH; +typedef struct { + const KSAUTOMATION_TABLE* AutomationTable; + const GUID* Type; + const GUID* Name; +} KSNODE_DESCRIPTOR, *PKSNODE_DESCRIPTOR; + +typedef struct { + const KSFILTER_DISPATCH* Dispatch; + const KSAUTOMATION_TABLE* AutomationTable; + ULONG Version; + ULONG Flags; + const GUID* ReferenceGuid; + ULONG PinDescriptorsCount; + ULONG PinDescriptorSize; + const KSPIN_DESCRIPTOR_EX* PinDescriptors; + ULONG CategoriesCount; + const GUID* Categories; + ULONG NodeDescriptorsCount; + ULONG NodeDescriptorSize; + const KSNODE_DESCRIPTOR* NodeDescriptors; + ULONG ConnectionsCount; + const KSTOPOLOGY_CONNECTION* Connections; + const KSCOMPONENTID* ComponentId; +} KSFILTER_DESCRIPTOR, *PKSFILTER_DESCRIPTOR; + +typedef struct +{ + const KSDEVICE_DISPATCH* Dispatch; + ULONG FilterDescriptorsCount; + const KSFILTER_DESCRIPTOR*const* FilterDescriptors; +} KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR; /* =============================================================== Minidriver Callbacks @@ -2287,6 +2318,13 @@ http://www.osronline.com/ddkx/stream/avstream_5q9f.htm */ +KSDDKAPI NTSTATUS NTAPI +KsInitializeDriver( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath, + IN const KSDEVICE_DESCRIPTOR *Descriptor OPTIONAL + ); + #if 0 typedef void (*PFNKSFILTERFACTORYPOWER)( IN PKSFILTERFACTORY FilterFactory,

17 years, 9 months

[spetreolle] 26133: reenable mpu401_ks, it builds since andrew added the needed includes

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Mar 18 18:51:37 2007 New Revision: 26133 URL: http://svn.reactos.org/svn/reactos?rev=26133&view=rev Log: reenable mpu401_ks, it builds since andrew added the needed includes Modified: trunk/reactos/drivers/multimedia/directory.rbuild Modified: trunk/reactos/drivers/multimedia/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/directo… ============================================================================== --- trunk/reactos/drivers/multimedia/directory.rbuild (original) +++ trunk/reactos/drivers/multimedia/directory.rbuild Sun Mar 18 18:51:37 2007 @@ -29,9 +29,9 @@ Drivers (experimental) --> - +</directory> <directory name="sb16_nt4"> <xi:include href="sb16_nt4/sb16_nt4.rbuild" />

17 years, 9 months

[spetreolle] 26132: various fixes sb16_ks now builds, but cannot be built

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Mar 18 18:38:04 2007 New Revision: 26132 URL: http://svn.reactos.org/svn/reactos?rev=26132&view=rev Log: various fixes sb16_ks now builds, but cannot be built Modified: trunk/reactos/drivers/multimedia/sb16_ks/adapter.cpp trunk/reactos/drivers/multimedia/sb16_ks/main.cpp Modified: trunk/reactos/drivers/multimedia/sb16_ks/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_ks… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_ks/adapter.cpp (original) +++ trunk/reactos/drivers/multimedia/sb16_ks/adapter.cpp Sun Mar 18 18:38:04 2007 @@ -114,6 +114,12 @@ } +STDMETHODIMP_(void) +SetWaveMiniport( + IN PWAVEMINIPORTSB16 Miniport) +{ +} + /* STDMETHODIMP_(void) CAdapterSB16::PowerChangeState( Modified: trunk/reactos/drivers/multimedia/sb16_ks/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_ks… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_ks/main.cpp (original) +++ trunk/reactos/drivers/multimedia/sb16_ks/main.cpp Sun Mar 18 18:38:04 2007 @@ -31,6 +31,7 @@ { /* ASSERT(Port); */ +#if 0 PPORTCLSVERSION portcls_version; PDRMPORT drm_port; PPORTEVENTS port_events; @@ -70,6 +71,9 @@ } return version; +#else + return kVersionWin98; +#endif } @@ -102,6 +106,7 @@ } break; + } case 2 : { @@ -198,26 +203,26 @@ /* Wave I/O resources */ - status = PcNewResourceSublist(Resources->Wave, + status = PcNewResourceSublist(&Resources->Wave, NULL, PagedPool, ResourceList, ResourceList->NumberOfDmas() + - ResourceList->NumberOfInterrupts + 1); + ResourceList->NumberOfInterrupts() + 1); if ( NT_SUCCESS(status) ) { ULONG i; /* Base port address */ - status = (*Resources->Wave)->AddPortFromParent(ResourceList, 0); + status = (*Resources->Wave).AddPortFromParent(ResourceList, 0); /* DMA channels */ if ( NT_SUCCESS(status) ) { for ( i = 0; i < ResourceList->NumberOfDmas(); i ++ ) { - status = (*Resources->Wave)->AddDmaFromParent(ResourceList, i); + status = (*Resources->Wave).AddDmaFromParent(ResourceList, i); if ( ! NT_SUCCESS(status) ) break; @@ -229,7 +234,7 @@ { for ( i = 0; i < ResourceList->NumberOfInterrupts(); i ++ ) { - status = (*Resources->Wave)->AddInterruptFromParent(ResourceList, i); + status = (*Resources->Wave).AddInterruptFromParent(ResourceList, i); if ( ! NT_SUCCESS(status) ) break; @@ -255,7 +260,7 @@ if ( NT_SUCCESS(status) ) { - status = PcNewResourceSublist(Resources->Adapter, + status = PcNewResourceSublist(&Resources->Adapter, NULL, PagedPool, ResourceList, @@ -263,12 +268,12 @@ if ( NT_SUCCESS(status) ) { - status = (*Resources->Adapter)->AddInterruptFromParent(ResourceList, 0); + status = (*Resources->Adapter).AddInterruptFromParent(ResourceList, 0); } if ( NT_SUCCESS(status) ) { - status = (*Resources->Adapter)->AddPortFromParent(ResourceList, 0); + status = (*Resources->Adapter).AddPortFromParent(ResourceList, 0); } if ( NT_SUCCESS(status) && HasUart ) @@ -281,16 +286,16 @@ if ( ! NT_SUCCESS(status) ) { - if ( *Resources->Wave ) - { - (*Resources->Wave)->Release(); - *Resources->Wave = NULL; - } - - if ( *Resources->Adapter ) - { - (*Resources->Adapter)->Release(); - *Resources->Adapter = NULL; + if ( (*Resources).Wave != NULL ) + { + (*Resources->Wave).Release(); + (*Resources).Wave = NULL; + } + + if ( (*Resources).Adapter != NULL ) + { + (*Resources->Adapter).Release(); + (*Resources).Adapter = NULL; } } @@ -310,10 +315,10 @@ PUNKNOWN UnknownTopology = NULL; PUNKNOWN UnknownWave = NULL; - PUNKNOWN UnknownWaveTable = NUL; + PUNKNOWN UnknownWaveTable = NULL; PUNKNOWN UnknownFmSynth = NULL; - PADAPTERCOMMON AdapterCommon = NULL; +// PADAPTERCOMMON AdapterCommon = NULL; PUNKNOWN UnknownCommon = NULL; status = AssignResources(ResourceList, &DeviceResources); @@ -326,7 +331,7 @@ } extern "C" -NSTATUS +NTSTATUS AddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) @@ -348,9 +353,10 @@ status = PcInitializeAdapterDriver(DriverObject, RegistryPathName, - AddDevice); + (PDRIVER_ADD_DEVICE) AddDevice); /* TODO: Add our own IRP handlers here */ return status; -} +} +

17 years, 9 months

[hpoussin] 26131: Add a variable to change the name of the ReactOS directory on bootcd. If a non default name is chosen, the cdrom is created, but it is unusable as freeldr doesn't find txtsetup.inf

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Mar 18 17:33:17 2007 New Revision: 26131 URL: http://svn.reactos.org/svn/reactos?rev=26131&view=rev Log: Add a variable to change the name of the ReactOS directory on bootcd. If a non default name is chosen, the cdrom is created, but it is unusable as freeldr doesn't find txtsetup.inf Modified: trunk/reactos/Makefile trunk/reactos/base/setup/reactos/reactos.rbuild trunk/reactos/boot/bootdata/bootdata.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/drivers/base/blue/blue.rbuild trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/drivers/base/kdcom/kdcom.rbuild trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild trunk/reactos/drivers/storage/atapi/atapi.rbuild trunk/reactos/drivers/storage/buslogic/buslogic.rbuild trunk/reactos/drivers/storage/cdrom/cdrom.rbuild trunk/reactos/drivers/storage/class2/class2.rbuild trunk/reactos/drivers/storage/disk/disk.rbuild trunk/reactos/drivers/storage/diskdump/diskdump.rbuild trunk/reactos/drivers/storage/floppy/floppy.rbuild trunk/reactos/drivers/storage/scsiport/scsiport.rbuild trunk/reactos/drivers/test/csqtest/csqtest.rbuild trunk/reactos/drivers/test/kmtest/kmtest.rbuild trunk/reactos/hal/halx86/generic/reboot.c trunk/reactos/hal/halx86/mp/halmp.rbuild trunk/reactos/hal/halx86/up/halup.rbuild trunk/reactos/media/drivers/etc/etc.rbuild trunk/reactos/media/nls/nls.rbuild trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/cdfile.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=26131&r1=2613… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Sun Mar 18 17:33:17 2007 @@ -68,6 +68,11 @@ # generated files that makes up the result of the build process. # Examples of output files include *.exe, *.dll, and *.sys. N.B. Don't # put a path separator at the end. The variable defaults to .\output-i386. +# +# ROS_CDOUTPUT +# This variable controls the name of the ReactOS directory on cdrom. +# The variable defaults to reactos. +# Warning: setting this value may lead to a not bootable/installable cdrom. # # ROS_TEMPORARY # This variable controls where to put temporary files. Temporary files @@ -321,16 +326,31 @@ ifneq ($(ROS_INTERMEDIATE),) INTERMEDIATE := $(ROS_INTERMEDIATE) else - INTERMEDIATE := obj-i386 + ifneq ($(ROS_CDOUTPUT),) + INTERMEDIATE := obj-$(ROS_CDOUTPUT) + else + INTERMEDIATE := obj-i386 + endif endif INTERMEDIATE_ := $(INTERMEDIATE)$(SEP) ifneq ($(ROS_OUTPUT),) OUTPUT := $(ROS_OUTPUT) else - OUTPUT := output-i386 + ifneq ($(ROS_CDOUTPUT),) + OUTPUT := output-$(ROS_CDOUTPUT) + else + OUTPUT := output-i386 + endif endif OUTPUT_ := $(OUTPUT)$(SEP) + +ifneq ($(ROS_CDOUTPUT),) + CDOUTPUT := $(ROS_CDOUTPUT) +else + CDOUTPUT := reactos +endif +CDOUTPUT_ := $(CDOUTPUT)$(SEP) ifneq ($(ROS_TEMPORARY),) TEMPORARY := $(ROS_TEMPORARY) @@ -342,7 +362,11 @@ ifneq ($(ROS_INSTALL),) INSTALL := $(ROS_INSTALL) else - INSTALL := reactos + ifneq ($(ROS_CDOUTPUT),) + INSTALL := reactos.$(ROS_CDOUTPUT) + else + INSTALL := reactos + endif endif INSTALL_ := $(INSTALL)$(SEP) Modified: trunk/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rbuild (original) +++ trunk/reactos/base/setup/reactos/reactos.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="reactos" type="win32gui"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="reactos">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild Sun Mar 18 17:33:17 2007 @@ -2,12 +2,12 @@ <cdfile>autorun.inf</cdfile> <cdfile>icon.ico</cdfile> <cdfile>readme.txt</cdfile> -<cdfile base="reactos">hivecls.inf</cdfile> -<cdfile base="reactos">hivedef.inf</cdfile> -<cdfile base="reactos">hivesft.inf</cdfile> -<cdfile base="reactos">hivesys.inf</cdfile> -<cdfile base="reactos">txtsetup.sif</cdfile> - +<cdfile base="$(CDOUTPUT)">hivecls.inf</cdfile> +<cdfile base="$(CDOUTPUT)">hivedef.inf</cdfile> +<cdfile base="$(CDOUTPUT)">hivesft.inf</cdfile> +<cdfile base="$(CDOUTPUT)">hivesys.inf</cdfile> +<cdfile base="$(CDOUTPUT)">txtsetup.sif</cdfile> + <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory> Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> - <bootstrap base="reactos/system32" /> + <bootstrap base="$(CDOUTPUT)/system32" /> <importlibrary definition="def/ntdll.def" /> <include base="ntdll">inc</include> <include base="ReactOS">include/reactos/subsys</include> Modified: trunk/reactos/drivers/base/blue/blue.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/blue/blue.rbu… ============================================================================== --- trunk/reactos/drivers/base/blue/blue.rbuild (original) +++ trunk/reactos/drivers/base/blue/blue.rbuild Sun Mar 18 17:33:17 2007 @@ -1,6 +1,6 @@ <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys"> - <bootstrap base="reactos" /> - <define name="__USE_W32API" /> + <bootstrap base="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild Sun Mar 18 17:33:17 2007 @@ -1,8 +1,8 @@ <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll"> <importlibrary definition="bootvid.def"></importlibrary> - <bootstrap base="reactos" nameoncd="bootvid.dll" /> - <include base="bootvid">.</include> - <define name="__USE_W32API" /> + <bootstrap base="$(CDOUTPUT)" nameoncd="bootvid.dll" /> + <include base="bootvid">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>bootvid.c</file> Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild Sun Mar 18 17:33:17 2007 @@ -1,9 +1,9 @@ <module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> <importlibrary definition="kdcom.def"></importlibrary> - <bootstrap base="reactos" nameoncd="kdcom.dll" /> - <include base="kdcom">.</include> - <define name="__USE_W32API" /> + <bootstrap base="$(CDOUTPUT)" nameoncd="kdcom.dll" /> + <include base="kdcom">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> - <file>kdbg.c</file> + <file>kdbg.c</file> </module> Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="cdfs">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild Sun Mar 18 17:33:17 2007 @@ -1,7 +1,7 @@ <module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="ntfs">.</include> - <define name="__USE_W32API" /> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>attrib.c</file> Modified: trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/v… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="vfatfs">.</include> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag> Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="i8042prt">.</include> <define name="__USE_W32API" /> <define name="__REACTOS__" /> Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <define name="NDEBUG" /> <library>pseh</library> Modified: trunk/reactos/drivers/storage/atapi/atapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/atapi/atap… ============================================================================== --- trunk/reactos/drivers/storage/atapi/atapi.rbuild (original) +++ trunk/reactos/drivers/storage/atapi/atapi.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="atapi">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/buslogic/buslogic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/buslogic/b… ============================================================================== --- trunk/reactos/drivers/storage/buslogic/buslogic.rbuild (original) +++ trunk/reactos/drivers/storage/buslogic/buslogic.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="buslogic">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/cdrom/cdrom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/cdrom/cdro… ============================================================================== --- trunk/reactos/drivers/storage/cdrom/cdrom.rbuild (original) +++ trunk/reactos/drivers/storage/cdrom/cdrom.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/storage/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class2/cla… ============================================================================== --- trunk/reactos/drivers/storage/class2/class2.rbuild (original) +++ trunk/reactos/drivers/storage/class2/class2.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="class2" type="exportdriver" installbase="system32/drivers" installname="class2.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <importlibrary definition="class2.def" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/disk/disk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/disk/disk.… ============================================================================== --- trunk/reactos/drivers/storage/disk/disk.rbuild (original) +++ trunk/reactos/drivers/storage/disk/disk.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys" allowwarnings="true"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/diskdump/diskdump.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/diskdump/d… ============================================================================== --- trunk/reactos/drivers/storage/diskdump/diskdump.rbuild (original) +++ trunk/reactos/drivers/storage/diskdump/diskdump.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="diskdump" type="exportdriver" installbase="system32/drivers" installname="diskdump.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library definition="diskdump.def" /> Modified: trunk/reactos/drivers/storage/floppy/floppy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.rbuild (original) +++ trunk/reactos/drivers/storage/floppy/floppy.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="floppy">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="scsiport" type="exportdriver" installbase="system32/drivers" installname="scsiport.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <define name="_SCSIPORT_" /> <importlibrary definition="scsiport.def" /> Modified: trunk/reactos/drivers/test/csqtest/csqtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/test/csqtest/csqte… ============================================================================== --- trunk/reactos/drivers/test/csqtest/csqtest.rbuild (original) +++ trunk/reactos/drivers/test/csqtest/csqtest.rbuild Sun Mar 18 17:33:17 2007 @@ -1,6 +1,6 @@ <module name="csqtest" type="kernelmodedriver" installbase="system32/drivers" installname="csqtest.sys"> - <bootstrap base="reactos" /> - <define name="__USE_W32API" /> + <bootstrap base="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/test/kmtest/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.rbuild (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.rbuild Sun Mar 18 17:33:17 2007 @@ -1,6 +1,6 @@ <module name="kmtest" type="kernelmodedriver" installbase="system32/drivers" installname="kmtest.sys"> - <bootstrap base="reactos" /> - <define name="__USE_W32API" /> + <bootstrap base="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c (original) +++ trunk/reactos/hal/halx86/generic/reboot.c Sun Mar 18 17:33:17 2007 @@ -15,7 +15,7 @@ /* PRIVATE FUNCTIONS *********************************************************/ -VOID +static VOID NTAPI HalpWriteResetCommand(VOID) { @@ -23,7 +23,7 @@ WRITE_PORT_UCHAR((PUCHAR)0x64, 0xFE); }; -VOID +static VOID NTAPI HalpReboot(VOID) { Modified: trunk/reactos/hal/halx86/mp/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halmp.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/mp/halmp.rbuild (original) +++ trunk/reactos/hal/halx86/mp/halmp.rbuild Sun Mar 18 17:33:17 2007 @@ -1,6 +1,6 @@ <module name="halmp" type="kernelmodedll" entrypoint="0"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> @@ -11,7 +11,7 @@ <library>hal_generic_pc</library> <library>ntoskrnl</library> <file>apic.c</file> - <file>halinit.c</file> + <file>halinit.c</file> <file>halinit_mp.c</file> <file>ioapic.c</file> <file>ipi_mp.c</file> Modified: trunk/reactos/hal/halx86/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/up/halup.rbuild (original) +++ trunk/reactos/hal/halx86/up/halup.rbuild Sun Mar 18 17:33:17 2007 @@ -1,12 +1,12 @@ <module name="halup" type="kernelmodedll" entrypoint="0"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap base="reactos" nameoncd="hal.dll" /> + <bootstrap base="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> <define name="_NTHAL_" /> - <linkerflag>-enable-stdcall-fixup</linkerflag> + <linkerflag>-enable-stdcall-fixup</linkerflag> <library>hal_generic</library> <library>hal_generic_up</library> <library>hal_generic_pc</library> Modified: trunk/reactos/media/drivers/etc/etc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/drivers/etc/etc.rbui… ============================================================================== --- trunk/reactos/media/drivers/etc/etc.rbuild (original) +++ trunk/reactos/media/drivers/etc/etc.rbuild Sun Mar 18 17:33:17 2007 @@ -1,6 +1,8 @@ -<cdfile base="reactos">services</cdfile> +<group> +<cdfile base="$(CDOUTPUT)">services</cdfile> <installfile base="system32/drivers/etc">services</installfile> <if property="KDBG" value="1"> - <cdfile base="reactos">KDBinit</cdfile> + <cdfile base="$(CDOUTPUT)">KDBinit</cdfile> <installfile base="system32/drivers/etc">KDBinit</installfile> -</if> +</if> +</group> Modified: trunk/reactos/media/nls/nls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/nls.rbuild?rev=2… ============================================================================== --- trunk/reactos/media/nls/nls.rbuild (original) +++ trunk/reactos/media/nls/nls.rbuild Sun Mar 18 17:33:17 2007 @@ -1,7 +1,7 @@ <group> -<cdfile base="reactos">c_437.nls</cdfile> -<cdfile base="reactos">c_1252.nls</cdfile> -<cdfile base="reactos">l_intl.nls</cdfile> +<cdfile base="$(CDOUTPUT)">c_437.nls</cdfile> +<cdfile base="$(CDOUTPUT)">c_1252.nls</cdfile> +<cdfile base="$(CDOUTPUT)">l_intl.nls</cdfile> <installfile base="system32">c_037.nls</installfile> <installfile base="system32">c_424.nls</installfile> Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c Sun Mar 18 17:33:17 2007 @@ -326,7 +326,15 @@ DBGKD_64BIT_PROTOCOL_VERSION2, KD_SECONDARY_VERSION_DEFAULT, DBGKD_VERS_FLAG_DATA, +#if defined(_M_IX86) IMAGE_FILE_MACHINE_I386, +#elif defined(_M_PPC) + IMAGE_FILE_MACHINE_POWERPC, +#elif defined(_M_MIPS) + IMAGE_FILE_MACHINE_R4000, +#else +#error Unknown platform +#endif PACKET_TYPE_MAX, 0, 0, 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 Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <importlibrary definition="ntoskrnl.def" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Mar 18 17:33:17 2007 @@ -3153,7 +3153,7 @@ NormalizeFilename ( "boot" + sSep + "freeldr" + sSep + "bootsect" + sSep + bootloader.c_str() ), backend->outputDirectory ); - string bootcdReactosNoFixup = bootcdDirectory + sSep + "reactos"; + string bootcdReactosNoFixup = bootcdDirectory + sSep + Environment::GetCdOutputPath (); string bootcdReactos = PassThruCacheDirectory ( NormalizeFilename ( bootcdReactosNoFixup + sSep ), backend->outputDirectory ); Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Sun Mar 18 17:33:17 2007 @@ -73,6 +73,18 @@ __LINE__ ); } +string +Bootstrap::ReplaceVariable ( const string& name, + const string& value, + string path ) +{ + size_t i = path.find ( name ); + if ( i != string::npos ) + return path.replace ( i, name.length (), value ); + else + return path; +} + void Bootstrap::Initialize () { @@ -85,7 +97,7 @@ const XMLAttribute* att = node.GetAttribute ( "base", false ); if ( att != NULL ) - base = att->value; + base = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); else base = ""; Modified: trunk/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/cdfile.cpp (original) +++ trunk/reactos/tools/rbuild/cdfile.cpp Sun Mar 18 17:33:17 2007 @@ -22,6 +22,18 @@ using std::string; +string +CDFile::ReplaceVariable ( const string& name, + const string& value, + string path ) +{ + size_t i = path.find ( name ); + if ( i != string::npos ) + return path.replace ( i, name.length (), value ); + else + return path; +} + CDFile::CDFile ( const Project& project_, const XMLElement& cdfileNode, const string& path ) @@ -30,7 +42,7 @@ { const XMLAttribute* att = node.GetAttribute ( "base", false ); if ( att != NULL ) - base = att->value; + base = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); else base = ""; Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Sun Mar 18 17:33:17 2007 @@ -49,21 +49,34 @@ /* static */ string Environment::GetIntermediatePath () { + string defaultIntermediate = + string( "obj-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" ); return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE", - "obj-i386" ); + defaultIntermediate ); } /* static */ string Environment::GetOutputPath () { + string defaultOutput = + string( "output-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" ); return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT", - "output-i386" ); + defaultOutput ); } /* static */ string Environment::GetInstallPath () { + string defaultInstall = + string( "reactos." ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "" ); return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL", + defaultInstall ); +} + +/* static */ string +Environment::GetCdOutputPath () +{ + return GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "reactos" ); } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Sun Mar 18 17:33:17 2007 @@ -155,6 +155,7 @@ static std::string GetVariable ( const std::string& name ); static std::string GetIntermediatePath (); static std::string GetOutputPath (); + static std::string GetCdOutputPath (); static std::string GetInstallPath (); static std::string GetEnvironmentVariablePathOrDefault ( const std::string& name, const std::string& defaultValue ); @@ -296,7 +297,7 @@ ImportLibrary* importLibrary; bool mangledSymbols; bool isUnicode; - bool isDefaultEntryPoint; + bool isDefaultEntryPoint; Bootstrap* bootstrap; AutoRegister* autoRegister; IfableData non_if_data; @@ -761,6 +762,9 @@ private: bool IsSupportedModuleType ( ModuleType type ); void Initialize(); + static std::string ReplaceVariable ( const std::string& name, + const std::string& value, + std::string path ); }; @@ -780,6 +784,10 @@ ~CDFile (); void ProcessXML(); std::string GetPath () const; +private: + static std::string ReplaceVariable ( const std::string& name, + const std::string& value, + std::string path ); };

17 years, 9 months

[hpoussin] 26130: Fix SeAccessCheck to perform correct checks. When returning STATUS_ACCESS_DENIED when required (currently disabled), ReactOS boots up to login screen on 3rd boot. Now, we just need to fix callers.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Mar 18 15:47:27 2007 New Revision: 26130 URL: http://svn.reactos.org/svn/reactos?rev=26130&view=rev Log: Fix SeAccessCheck to perform correct checks. When returning STATUS_ACCESS_DENIED when required (currently disabled), ReactOS boots up to login screen on 3rd boot. Now, we just need to fix callers. Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=26… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Sun Mar 18 15:47:27 2007 @@ -912,7 +912,7 @@ OUT PNTSTATUS AccessStatus) { LUID_AND_ATTRIBUTES Privilege; - ACCESS_MASK CurrentAccess; + ACCESS_MASK CurrentAccess, AccessMask; PACCESS_TOKEN Token; ULONG i; PACL Dacl; @@ -924,6 +924,11 @@ PAGED_CODE(); + /* Map given accesses */ + RtlMapGenericMask(&DesiredAccess, GenericMapping); + if (PreviouslyGrantedAccess) + RtlMapGenericMask(&PreviouslyGrantedAccess, GenericMapping); + /* Check if we didn't get an SD */ if (!SecurityDescriptor) { @@ -1048,30 +1053,32 @@ { Sid = (PSID)(CurrentAce + 1); if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE) - { - if (SepSidInToken(Token, Sid)) - { - if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } - - *GrantedAccess = 0; - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; - } - } + { + if (SepSidInToken(Token, Sid)) + { + if (SubjectContextLocked == FALSE) + { + SeUnlockSubjectContext(SubjectSecurityContext); + } + + *GrantedAccess = 0; + *AccessStatus = STATUS_ACCESS_DENIED; + return FALSE; + } + } else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) - { - if (SepSidInToken(Token, Sid)) - { - CurrentAccess |= CurrentAce->AccessMask; - } - } - else - DPRINT1("Unknown Ace type 0x%lx\n", CurrentAce->Header.AceType); - CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize); + { + if (SepSidInToken(Token, Sid)) + { + AccessMask = CurrentAce->AccessMask; + RtlMapGenericMask(&AccessMask, GenericMapping); + CurrentAccess |= AccessMask; + } + } + else + DPRINT1("Unknown Ace type 0x%lx\n", CurrentAce->Header.AceType); + CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize); } if (SubjectContextLocked == FALSE) @@ -1084,17 +1091,30 @@ *GrantedAccess = CurrentAccess & DesiredAccess; - if (*GrantedAccess == DesiredAccess) - { + if (DesiredAccess & MAXIMUM_ALLOWED) + { + *GrantedAccess = CurrentAccess; *AccessStatus = STATUS_SUCCESS; return TRUE; } + else if (*GrantedAccess == DesiredAccess) + { + *AccessStatus = STATUS_SUCCESS; + return TRUE; + } else { +#if 1 *AccessStatus = STATUS_SUCCESS; - DPRINT("FIX caller rights (granted 0x%lx, desired 0x%lx)!\n", - *GrantedAccess, DesiredAccess); - return TRUE; /* FIXME: should be FALSE */ + DPRINT1("FIX caller rights (granted 0x%lx, desired 0x%lx, generic mapping %p)!\n", + *GrantedAccess, DesiredAccess, GenericMapping); + return TRUE; +#else + DPRINT1("Denying access for caller: granted 0x%lx, desired 0x%lx (generic mapping %p)\n", + *GrantedAccess, DesiredAccess, GenericMapping); + *AccessStatus = STATUS_ACCESS_DENIED; + return FALSE; +#endif } }

17 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
29
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 March 2007