Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 23633: - Switch 4, 5, 6 to common ASM dispatcher as well.
by ion＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: ion Date: Mon Aug 21 06:32:08 2006 New Revision: 23633 URL: http://svn.reactos.org/svn/reactos?rev=23633&view=rev Log: - Switch 4, 5, 6 to common ASM dispatcher as well. Modified: trunk/reactos/include/ndk/asm.h 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=2363… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Mon Aug 21 06:32:08 2006 @@ -383,6 +383,9 @@ #define STATUS_ACCESS_VIOLATION 0xC0000005 #define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C #define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 +#define STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008C +#define STATUS_ILLEGAL_INSTRUCTION 0xC000001D +#define STATUS_BREAKPOINT 0x80000003 #define STATUS_SINGLE_STEP 0x80000004 #define STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094 #define STATUS_INTEGER_OVERFLOW 0xC0000095 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 Aug 21 06:32:08 2006 @@ -770,7 +770,7 @@ /* Check if the frame was from kernelmode */ test word ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz EnableInterrupts + jz SendException /* Check the old mode */ cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK @@ -849,6 +849,7 @@ call _KeBugCheckEx@20 .endfunc +.func KiTrap3 _KiTrap3: /* Push error code */ push 0 @@ -856,19 +857,47 @@ /* Enter trap */ TRAP_PROLOG(3) - /* Call the C exception handler */ - push 3 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - + /* Check for V86 */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86Int3 + + /* Check if the frame was from kernelmode */ + test word ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz PrepInt3 + + /* Check the old mode */ + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK + jne V86Int3 + +EnableInterrupts3: + /* Enable interrupts for user-mode */ + sti + +PrepInt3: + /* Prepare the exception */ + mov esi, ecx + mov edi, edx + mov edx, eax + + /* Setup EIP, NTSTATUS and parameter count, then dispatch */ + mov ebx, [ebp+KTRAP_FRAME_EIP] + dec ebx + mov eax, STATUS_BREAKPOINT + mov ecx, 3 + call _CommonDispatchException + +V86Int3: + /* Check if this is a VDM process */ + mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] + cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 + jz EnableInterrupts3 + + /* We don't support VDM! */ + int 3 +.endfunc + +.func KiTrap4 _KiTrap4: /* Push error code */ push 0 @@ -876,19 +905,39 @@ /* Enter trap */ TRAP_PROLOG(4) - /* Call the C exception handler */ - push 4 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - + /* Check for V86 */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86Int4 + + /* Check if the frame was from kernelmode */ + test word ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz SendException4 + + /* Check the old mode */ + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK + jne VdmCheck4 + +SendException4: + /* Re-enable interrupts for user-mode and send the exception */ + sti + mov eax, STATUS_INTEGER_OVERFLOW + mov ebx, [ebp+KTRAP_FRAME_EIP] + dec ebx + jmp _DispatchNoParam + +VdmCheck4: + /* Check if this is a VDM process */ + mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] + cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 + jz SendException4 + + /* We don't support this yet! */ +V86Int4: + int 3 +.endfunc + +.func KiTrap5 _KiTrap5: /* Push error code */ push 0 @@ -896,18 +945,45 @@ /* Enter trap */ TRAP_PROLOG(5) - /* Call the C exception handler */ + /* Check for V86 */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86Int5 + + /* Check if the frame was from kernelmode */ + test word ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jnz CheckMode + + /* It did, and this should never happen */ + push 0 + push 0 + push 0 push 5 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete + push UNEXPECTED_KERNEL_MODE_TRAP + call _KeBugCheckEx@20 + + /* Check the old mode */ +CheckMode: + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK + jne VdmCheck5 + + /* Re-enable interrupts for user-mode and send the exception */ +SendException5: + sti + mov eax, STATUS_ARRAY_BOUNDS_EXCEEDED + mov ebx, [ebp+KTRAP_FRAME_EIP] + jmp _DispatchNoParam + +VdmCheck5: + /* Check if this is a VDM process */ + mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] + cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 + jz SendException5 + + /* We don't support this yet! */ +V86Int5: + int 3 +.endfunc _KiTrap6: /* Push error code */

1 0

[ion] 23632: - Implement generic exception dispatcher for traps (kind-of analogous to KiKernelTrapHandler/KiUserTrapHandler but in assembly and more generic/compact). - Switch Traps 0, 1 to it. - Trap 2 is NMI, bugcheck immediately since we can't handle them yet.
by ion＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: ion Date: Mon Aug 21 06:01:07 2006 New Revision: 23632 URL: http://svn.reactos.org/svn/reactos?rev=23632&view=rev Log: - Implement generic exception dispatcher for traps (kind-of analogous to KiKernelTrapHandler/KiUserTrapHandler but in assembly and more generic/compact). - Switch Traps 0, 1 to it. - Trap 2 is NMI, bugcheck immediately since we can't handle them yet. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/ke/i386/exp.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=2363… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Mon Aug 21 06:01:07 2006 @@ -120,6 +120,7 @@ #define KPROCESS_INT21_DESCRIPTOR1 0x2C #define KPROCESS_IOPM_OFFSET 0x30 #define KPROCESS_ACTIVE_PROCESSORS 0x34 +#define EPROCESS_VDM_OBJECTS 0x144 // // KPCR Offsets @@ -272,6 +273,7 @@ #define EXCEPTION_RECORD_EXCEPTION_ADDRESS 0xC #define EXCEPTION_RECORD_NUMBER_PARAMETERS 0x10 #define SIZEOF_EXCEPTION_RECORD 0x14 +#define EXCEPTION_RECORD_LENGTH 0x50 // // TEB Offsets @@ -381,6 +383,9 @@ #define STATUS_ACCESS_VIOLATION 0xC0000005 #define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C #define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 +#define STATUS_SINGLE_STEP 0x80000004 +#define STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094 +#define STATUS_INTEGER_OVERFLOW 0xC0000095 #define APC_INDEX_MISMATCH 0x01 #define TRAP_CAUSE_UNKNOWN 0x12 #define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Mon Aug 21 06:01:07 2006 @@ -499,6 +499,7 @@ /* * Check for stack underflow, this may be obsolete */ + DPRINT1("Exception: %x\n", ExceptionNr); if (PsGetCurrentThread() != NULL && Esp0 < (ULONG)PsGetCurrentThread()->Tcb.StackLimit) { 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 Aug 21 06:01:07 2006 @@ -679,6 +679,84 @@ jmp _KiServiceExit .endfunc +.func CommonDispatchException +_CommonDispatchException: + + /* Make space for an exception record */ + sub esp, EXCEPTION_RECORD_LENGTH + + /* Set it up */ + mov [esp+EXCEPTION_RECORD_EXCEPTION_CODE], eax + xor eax, eax + mov [esp+EXCEPTION_RECORD_EXCEPTION_FLAGS], eax + mov [esp+EXCEPTION_RECORD_EXCEPTION_RECORD], eax + mov [esp+EXCEPTION_RECORD_EXCEPTION_ADDRESS], ebx + mov [esp+EXCEPTION_RECORD_NUMBER_PARAMETERS], ecx + + /* Check parameter count */ + cmp eax, 0 + jz NoParams + + /* Get information */ + lea ebx, [esp+SIZEOF_EXCEPTION_RECORD] + mov [ebx], edx + mov [ebx+4], esi + mov [ebx+8], edi + +NoParams: + + /* Set the record in ECX and check if this was V86 */ + mov ecx, esp + test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jz SetPreviousMode + + /* Set V86 mode */ + mov eax, 0xFFFF + jmp MaskMode + +SetPreviousMode: + + /* Calculate the previous mode */ + mov eax, [ebp+KTRAP_FRAME_CS] +MaskMode: + and eax, MODE_MASK + + /* Dispatch the exception */ + push 1 + push eax + push ebp + push 0 + push ecx + call _KiDispatchException@20 + + /* End the trap */ + jmp _Kei386EoiHelper@0 +.endfunc + +.func DispatchNoParam +_DispatchNoParam: + /* Call the common dispatcher */ + xor ecx, ecx + call _CommonDispatchException +.endfunc + +.func DispatchOneParam +_DispatchOneParam: + /* Call the common dispatcher */ + xor edx, edx + mov ecx, 1 + call _CommonDispatchException +.endfunc + +.func DispatchTwoParam +_DispatchTwoParam: + /* Call the common dispatcher */ + xor edx, edx + mov ecx, 2 + call _CommonDispatchException +.endfunc + +.func KiTrap0 _KiTrap0: /* Push error code */ push 0 @@ -686,19 +764,38 @@ /* Enter trap */ TRAP_PROLOG(0) - /* Call the C exception handler */ - push 0 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - + /* Check for V86 */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86Int0 + + /* Check if the frame was from kernelmode */ + test word ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz EnableInterrupts + + /* Check the old mode */ + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK + jne VdmCheck + +SendException: + /* Re-enable interrupts for user-mode and send the exception */ + sti + mov eax, STATUS_INTEGER_DIVIDE_BY_ZERO + mov ebx, [ebp+KTRAP_FRAME_EIP] + jmp _DispatchNoParam + +VdmCheck: + /* Check if this is a VDM process */ + mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] + cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 + jz SendException + + /* We don't support this yet! */ +V86Int0: + int 3 +.endfunc + +.func KiTrap1 _KiTrap1: /* Push error code */ push 0 @@ -706,38 +803,51 @@ /* Enter trap */ TRAP_PROLOG(1) - /* Call the C exception handler */ - push 1 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - + /* Check for V86 */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86Int1 + + /* Check if the frame was from kernelmode */ + test word ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz PrepInt1 + + /* Check the old mode */ + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK + jne V86Int1 + +EnableInterrupts: + /* Enable interrupts for user-mode */ + sti + +PrepInt1: + /* Prepare the exception */ + and dword ptr [ebp+KTRAP_FRAME_EFLAGS], ~EFLAGS_TF + mov ebx, [ebp+KTRAP_FRAME_EIP] + mov eax, STATUS_SINGLE_STEP + jmp _DispatchNoParam + +V86Int1: + /* Check if this is a VDM process */ + mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] + cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 + jz EnableInterrupts + + /* We don't support VDM! */ + int 3 +.endfunc + +.func KiTrap2 _KiTrap2: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG(2) - - /* Call the C exception handler */ + + /* FIXME: This is an NMI, nothing like a normal exception */ + push 0 + push 0 + push 0 push 2 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete + push UNEXPECTED_KERNEL_MODE_TRAP + call _KeBugCheckEx@20 +.endfunc _KiTrap3: /* Push error code */

1 0

[ion] 23631: - Fixes to CONTEXT<->KTRAP_FRAME conversion.
by ion＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: ion Date: Mon Aug 21 05:07:01 2006 New Revision: 23631 URL: http://svn.reactos.org/svn/reactos?rev=23631&view=rev Log: - Fixes to CONTEXT<->KTRAP_FRAME conversion. Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Mon Aug 21 05:07:01 2006 @@ -551,7 +551,8 @@ KiEspFromTrapFrame(IN PKTRAP_FRAME TrapFrame) { /* Check if this is user-mode or V86 */ - if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & X86_EFLAGS_VM)) + if ((TrapFrame->SegCs & MODE_MASK) || + (TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* Return it directly */ return TrapFrame->HardwareEsp; @@ -580,7 +581,7 @@ ULONG Previous = KiEspFromTrapFrame(TrapFrame); /* Check if this is user-mode or V86 */ - if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & X86_EFLAGS_VM)) + if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* Write it directly */ TrapFrame->HardwareEsp = Esp; @@ -588,10 +589,7 @@ else { /* Don't allow ESP to be lowered, this is illegal */ - if (Esp < Previous) - { - KeBugCheck(SET_OF_INVALID_CONTEXT); - } + if (Esp < Previous) KeBugCheck(SET_OF_INVALID_CONTEXT); /* Create an edit frame, check if it was alrady */ if (!(TrapFrame->SegCs & FRAME_EDITED)) @@ -620,7 +618,7 @@ KiSsFromTrapFrame(IN PKTRAP_FRAME TrapFrame) { /* If this was V86 Mode */ - if (TrapFrame->EFlags & X86_EFLAGS_VM) + if (TrapFrame->EFlags & EFLAGS_V86_MASK) { /* Just return it */ return TrapFrame->HardwareSegSs; @@ -646,7 +644,7 @@ Ss &= 0xFFFF; /* If this was V86 Mode */ - if (TrapFrame->EFlags & X86_EFLAGS_VM) + if (TrapFrame->EFlags & EFLAGS_V86_MASK) { /* Just write it */ TrapFrame->HardwareSegSs = Ss; @@ -686,13 +684,17 @@ PFX_SAVE_AREA FxSaveArea; ULONG i; BOOLEAN V86Switch = FALSE; + KIRQL OldIrql = APC_LEVEL; + + /* Do this at APC_LEVEL */ + if (KeGetCurrentIrql() < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); /* Start with the basic Registers */ if ((ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) { /* Check if we went through a V86 switch */ - if ((Context->EFlags & X86_EFLAGS_VM) != - (TrapFrame->EFlags & X86_EFLAGS_VM)) + if ((Context->EFlags & EFLAGS_V86_MASK) != + (TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* We did, remember this for later */ V86Switch = TRUE; @@ -706,7 +708,7 @@ TrapFrame->Eip = Context->Eip; /* Check if we were in V86 Mode */ - if (TrapFrame->EFlags & X86_EFLAGS_VM) + if (TrapFrame->EFlags & EFLAGS_V86_MASK) { /* Simply copy the CS value */ TrapFrame->SegCs = Context->SegCs; @@ -737,6 +739,7 @@ /* Process the Integer Registers */ if ((ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) { + /* Copy them manually */ TrapFrame->Eax = Context->Eax; TrapFrame->Ebx = Context->Ebx; TrapFrame->Ecx = Context->Ecx; @@ -749,7 +752,7 @@ if ((ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) { /* Check if we were in V86 Mode */ - if (TrapFrame->EFlags & X86_EFLAGS_VM) + if (TrapFrame->EFlags & EFLAGS_V86_MASK) { /* Copy the V86 Segments directlry */ TrapFrame->V86Ds = Context->SegDs; @@ -788,8 +791,7 @@ /* Handle the extended registers */ if (((ContextFlags & CONTEXT_EXTENDED_REGISTERS) == - CONTEXT_EXTENDED_REGISTERS) && - ((TrapFrame->SegCs & MODE_MASK) == UserMode)) + CONTEXT_EXTENDED_REGISTERS) && (TrapFrame->SegCs & MODE_MASK)) { /* Get the FX Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); @@ -817,8 +819,7 @@ /* Handle the floating point state */ if (((ContextFlags & CONTEXT_FLOATING_POINT) == - CONTEXT_FLOATING_POINT) && - ((TrapFrame->SegCs & MODE_MASK) == UserMode)) + CONTEXT_FLOATING_POINT) && (TrapFrame->SegCs & MODE_MASK)) { /* Get the FX Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); @@ -840,7 +841,7 @@ FxSaveArea->U.FxArea.TagWord = KiTagWordFnsaveToFxsave((USHORT)Context->FloatSave.TagWord); FxSaveArea->U.FxArea.ErrorOpcode = - (USHORT)(Context->FloatSave.ErrorSelector >> 16); + (USHORT)((Context->FloatSave.ErrorSelector >> 16) & 0xFFFF); FxSaveArea->U.FxArea.ErrorOffset = Context->FloatSave.ErrorOffset; FxSaveArea->U.FxArea.ErrorSelector = @@ -848,10 +849,11 @@ FxSaveArea->U.FxArea.DataOffset = Context->FloatSave.DataOffset; FxSaveArea->U.FxArea.DataSelector = - Context->FloatSave.DataSelector & 0xFFFF; + Context->FloatSave.DataSelector; /* Clear out the Register Area */ - RtlZeroMemory(&FxSaveArea->U.FxArea.RegisterArea[0], SIZE_OF_FX_REGISTERS); + RtlZeroMemory(&FxSaveArea->U.FxArea.RegisterArea[0], + SIZE_OF_FX_REGISTERS); /* Loop the 8 floating point registers */ for (i = 0; i < 8; i++) @@ -878,6 +880,7 @@ else { /* FIXME: Handle FPU Emulation */ + ASSERT(FALSE); } } @@ -900,6 +903,9 @@ (Context->Dr7 & DR7_ACTIVE); } } + + /* Restore IRQL */ + if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } VOID @@ -915,6 +921,10 @@ FLOATING_SAVE_AREA UnalignedArea; } FloatSaveBuffer; FLOATING_SAVE_AREA *FloatSaveArea; + KIRQL OldIrql = APC_LEVEL; + + /* Do this at APC_LEVEL */ + if (KeGetCurrentIrql() < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); /* Start with the Control flags */ if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) @@ -926,7 +936,7 @@ /* Return the correct CS */ if (!(TrapFrame->SegCs & FRAME_EDITED) && - !(TrapFrame->EFlags & X86_EFLAGS_VM)) + !(TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* Get it from the Temp location */ Context->SegCs = TrapFrame->TempSegCs & 0xFFFF; @@ -946,7 +956,7 @@ if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) { /* Do V86 Mode first */ - if (TrapFrame->EFlags & X86_EFLAGS_VM) + if (TrapFrame->EFlags & EFLAGS_V86_MASK) { /* Return from the V86 location */ Context->SegGs = TrapFrame->V86Gs & 0xFFFF; @@ -988,8 +998,7 @@ /* Handle extended registers */ if (((Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS) == - CONTEXT_EXTENDED_REGISTERS) && - ((TrapFrame->SegCs & MODE_MASK) == UserMode)) + CONTEXT_EXTENDED_REGISTERS) && (TrapFrame->SegCs & MODE_MASK)) { /* Get the FX Save Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); @@ -1009,8 +1018,7 @@ /* Handle Floating Point */ if (((Context->ContextFlags & CONTEXT_FLOATING_POINT) == - CONTEXT_FLOATING_POINT) && - ((TrapFrame->SegCs & MODE_MASK) == UserMode)) + CONTEXT_FLOATING_POINT) && (TrapFrame->SegCs & MODE_MASK)) { /* Get the FX Save Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); @@ -1037,13 +1045,13 @@ /* Copy into the Context */ RtlCopyMemory(&Context->FloatSave, - &FxSaveArea->U.FnArea, + FloatSaveArea, sizeof(FNSAVE_FORMAT)); } else { /* FIXME: Handle Emulation */ - Context->ContextFlags &= (~CONTEXT_FLOATING_POINT) | CONTEXT_i386; + ASSERT(FALSE); } } @@ -1072,6 +1080,9 @@ Context->Dr7 = 0; } } + + /* Restore IRQL */ + if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } VOID

1 0

[turner] 23630: Label NtReadFileScatter as unimplemented.
by turner＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: turner Date: Mon Aug 21 04:02:33 2006 New Revision: 23630 URL: http://svn.reactos.org/svn/reactos?rev=23630&view=rev Log: Label NtReadFileScatter as unimplemented. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Mon Aug 21 04:02:33 2006 @@ -1979,6 +1979,9 @@ IopReadTransfer); } +/* + * @unimplemented + */ NTSTATUS NTAPI NtReadFileScatter(IN HANDLE FileHandle,

1 0

[janderwald] 23629: * colors.c: implement color dialog (reading from registry is not yet supported) * font.c/layout.c/console.c/options.c: add UNREFERENCED_PARAMETER macros, fix sharing of global struct * console.def: fix building with MSVC
by janderwald＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: janderwald Date: Mon Aug 21 03:55:08 2006 New Revision: 23629 URL: http://svn.reactos.org/svn/reactos?rev=23629&view=rev Log: * colors.c: implement color dialog (reading from registry is not yet supported) * font.c/layout.c/console.c/options.c: add UNREFERENCED_PARAMETER macros, fix sharing of global struct * console.def: fix building with MSVC Modified: trunk/reactos/dll/win32/console/colors.c trunk/reactos/dll/win32/console/console.c trunk/reactos/dll/win32/console/console.def trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/en.rc trunk/reactos/dll/win32/console/font.c trunk/reactos/dll/win32/console/layout.c trunk/reactos/dll/win32/console/options.c trunk/reactos/dll/win32/console/resource.h Modified: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (original) +++ trunk/reactos/dll/win32/console/colors.c Mon Aug 21 03:55:08 2006 @@ -8,6 +8,80 @@ */ #include "console.h" + + +static COLORREF s_Colors[] = +{ + RGB(0, 0, 0), + RGB(0, 0, 128), + RGB(0, 128, 0), + RGB(0, 128, 128), + RGB(128, 0, 0), + RGB(128, 0, 128), + RGB(128, 128, 0), + RGB(192, 192, 192), + RGB(128, 128, 128), + RGB(0, 0, 255), + RGB(0, 255, 0), + RGB(0, 255, 255), + RGB(255, 0, 0), + RGB(255, 0, 255), + RGB(255, 255, 0), + RGB(255, 255, 255) +}; + +static TCHAR szText[1024]; + + +static +BOOL +PaintStaticControls(HWND hwndDlg, PConsoleInfo pConInfo, LPDRAWITEMSTRUCT drawItem) +{ + HBRUSH hBrush; + DWORD index; + + if (drawItem->CtlID < IDC_STATIC_COLOR1 || drawItem->CtlID > IDC_STATIC_COLOR16) + { + COLORREF pbkColor, ptColor; + COLORREF nbkColor, ntColor; + /* draw static controls */ + if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR) + { + nbkColor = pConInfo->ScreenBackground; + hBrush = CreateSolidBrush(nbkColor); + ntColor = pConInfo->ScreenText; + } + else + { + nbkColor = pConInfo->PopupBackground; + hBrush = CreateSolidBrush(nbkColor); + ntColor = pConInfo->PopupText; + } + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + DeleteObject((HGDIOBJ)hBrush); + ptColor = SetTextColor(drawItem->hDC, ntColor); + pbkColor = SetBkColor(drawItem->hDC, nbkColor); + if (ntColor != nbkColor) + { + /* hide text when it has same background color as text color */ + DrawText(drawItem->hDC, szText, _tcslen(szText), &drawItem->rcItem, 0); + } + SetTextColor(drawItem->hDC, ptColor); + SetBkColor(drawItem->hDC, pbkColor); + return TRUE; + } + + index = drawItem->CtlID - IDC_STATIC_COLOR1; + hBrush = CreateSolidBrush(s_Colors[index]); + if (!hBrush) + { + return FALSE; + } + + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + DeleteObject((HGDIOBJ)hBrush); + return TRUE; +} INT_PTR CALLBACK @@ -18,14 +92,160 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(lParam) + PConsoleInfo pConInfo; + LPNMUPDOWN lpnmud; + + pConInfo = (PConsoleInfo) GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) { case WM_INITDIALOG: + { + pConInfo = (PConsoleInfo) ((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); + ZeroMemory(szText, sizeof(szText)); + LoadString(hApplet, IDS_SCREEN_TEXT, szText, sizeof(szText) / sizeof(TCHAR)); + SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_SCREEN_BACKGROUND), BM_SETCHECK, BST_CHECKED, 0); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); + InvalidateRect(hwndDlg, NULL, TRUE); return TRUE; + } + case WM_DRAWITEM: + { + return PaintStaticControls(hwndDlg, pConInfo, (LPDRAWITEMSTRUCT) lParam); + } + case WM_NOTIFY: + { + DWORD red = -1; + DWORD green = -1; + DWORD blue = -1; + + lpnmud = (LPNMUPDOWN) lParam; + + if (lpnmud->hdr.idFrom == IDC_UPDOWN_COLOR_RED) + { + red = lpnmud->iPos; + } + else if (lpnmud->hdr.idFrom == IDC_UPDOWN_COLOR_GREEN) + { + green = lpnmud->iPos; + } + else if (lpnmud->hdr.idFrom == IDC_UPDOWN_COLOR_BLUE) + { + blue = lpnmud->iPos; + } + + if (red == -1) + { + red = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_GETPOS, 0, 0); + if (HIWORD(red)) + { + //TODO: handle error + break; + } + red = LOBYTE(red); + } + + if (green == -1) + { + green = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_GETPOS, 0, 0); + if (HIWORD(green)) + { + //TODO: handle error + break; + } + green = LOBYTE(green); + } + + if (blue == -1) + { + blue = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_GETPOS, 0, 0); + if (HIWORD(blue)) + { + //TODO: handle error + break; + } + blue = LOBYTE(blue); + } + s_Colors[pConInfo->ActiveStaticControl] = RGB(red, green, blue); + InvalidateRect(hwndDlg, NULL, TRUE); //FIXME + break; + } + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_RADIO_SCREEN_TEXT: + { + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(pConInfo->ScreenText), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(pConInfo->ScreenText), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(pConInfo->ScreenText), FALSE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + break; + } + case IDC_RADIO_SCREEN_BACKGROUND: + { + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(pConInfo->ScreenBackground), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(pConInfo->ScreenBackground), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(pConInfo->ScreenBackground), FALSE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + break; + } + case IDC_RADIO_POPUP_TEXT: + { + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(pConInfo->PopupText), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(pConInfo->PopupText), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(pConInfo->PopupText), FALSE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + break; + } + case IDC_RADIO_POPUP_BACKGROUND: + { + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(pConInfo->PopupBackground), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(pConInfo->PopupBackground), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(pConInfo->PopupBackground), FALSE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + break; + } + } + if (HIWORD(wParam) == STN_CLICKED && LOWORD(wParam) >= IDC_STATIC_COLOR1 && LOWORD(wParam) <= IDC_STATIC_COLOR16) + { + DWORD index = LOWORD(wParam) - IDC_STATIC_COLOR1; + + pConInfo->ActiveStaticControl = index; + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(s_Colors[index]), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(s_Colors[index]), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(s_Colors[index]), FALSE); + + /* update global struct */ + if (SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_SCREEN_TEXT), BM_GETCHECK, 0, 0) & BST_CHECKED) + { + pConInfo->ScreenText = s_Colors[index]; + } + else if (SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_SCREEN_BACKGROUND), BM_GETCHECK, 0, 0) & BST_CHECKED) + { + pConInfo->ScreenBackground = s_Colors[index]; + } + else if (SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_POPUP_TEXT), BM_GETCHECK, 0, 0) & BST_CHECKED) + { + pConInfo->PopupText = s_Colors[index]; + } + else if (SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_POPUP_BACKGROUND), BM_GETCHECK, 0, 0) & BST_CHECKED) + { + pConInfo->PopupBackground = s_Colors[index]; + } + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + break; + } + } + default: break; Modified: trunk/reactos/dll/win32/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.c (original) +++ trunk/reactos/dll/win32/console/console.c Mon Aug 21 03:55:08 2006 @@ -26,7 +26,7 @@ }; static void -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -34,10 +34,11 @@ psp->hInstance = hApplet; psp->pszTemplate = MAKEINTRESOURCE(idDlg); psp->pfnDlgProc = DlgProc; -} - -BOOL -InitConsoleInfo(HWND hwnd) + psp->lParam = lParam; +} + +PConsoleInfo +InitConsoleInfo() { PConsoleInfo pConInfo; STARTUPINFO StartupInfo; @@ -46,14 +47,26 @@ pConInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ConsoleInfo)); if (!pConInfo) - return FALSE; + { + return NULL; + } /* initialize struct */ pConInfo->InsertMode = TRUE; pConInfo->HistoryBufferSize = 50; pConInfo->NumberOfHistoryBuffers = 5; + pConInfo->ScreenText = RGB(192, 192, 192); + pConInfo->ScreenBackground = RGB(0, 0, 0); + pConInfo->PopupText = RGB(128, 0, 128); + pConInfo->PopupBackground = RGB(255, 255, 255); + + + GetModuleFileName(NULL, pConInfo->szProcessName, MAX_PATH); + //MessageBox(hwnd, pConInfo->szProcessName, _T("GetModuleFileName"), MB_OK); GetStartupInfo(&StartupInfo); + + if ( StartupInfo.lpTitle ) { @@ -89,11 +102,7 @@ { _tcscpy(pConInfo->szProcessName, _T("Console")); } - - SetWindowText(hwnd, pConInfo->szProcessName); - SetWindowLongPtr(hwnd, DWLP_USER , (LONG)pConInfo); - - return TRUE; + return pConInfo; } INT_PTR @@ -107,7 +116,7 @@ { HWND hDlgCtrl; - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(lParam); switch(uMsg) { @@ -168,7 +177,7 @@ LPARAM lParam ) { - PConsoleInfo pConInfo = (PConsoleInfo) GetWindowLongPtr(hwndDlg, DWLP_USER); + PConsoleInfo pConInfo = (PConsoleInfo) GetWindowLongPtr(GetParent(hwndDlg), DWLP_USER); switch(uMsg) { @@ -197,10 +206,7 @@ } break; } - case PSCB_INITIALIZED: - { - break; - } + default: break; } @@ -214,13 +220,14 @@ PROPSHEETPAGE psp[4]; PROPSHEETHEADER psh; INT i=0; - - UNREFERENCED_PARAMETER(hwnd) - UNREFERENCED_PARAMETER(uMsg) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(lParam) - - + PConsoleInfo pConInfo; + + UNREFERENCED_PARAMETER(hwnd); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + + pConInfo = InitConsoleInfo(); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); @@ -234,10 +241,10 @@ psh.ppsp = psp; psh.pfnCallback = PropSheetProc; - InitPropSheetPage(&psp[i++], IDD_PROPPAGEOPTIONS, (DLGPROC) OptionsProc); - InitPropSheetPage(&psp[i++], IDD_PROPPAGEFONT, (DLGPROC) FontProc); - InitPropSheetPage(&psp[i++], IDD_PROPPAGELAYOUT, (DLGPROC) LayoutProc); - InitPropSheetPage(&psp[i++], IDD_PROPPAGECOLORS, (DLGPROC) ColorsProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEOPTIONS, (DLGPROC) OptionsProc, (LPARAM)pConInfo); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEFONT, (DLGPROC) FontProc, (LPARAM)pConInfo); + InitPropSheetPage(&psp[i++], IDD_PROPPAGELAYOUT, (DLGPROC) LayoutProc, (LPARAM)pConInfo); + InitPropSheetPage(&psp[i++], IDD_PROPPAGECOLORS, (DLGPROC) ColorsProc, (LPARAM)pConInfo); return (PropertySheet(&psh) != -1); } @@ -287,7 +294,7 @@ DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved) + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { Modified: trunk/reactos/dll/win32/console/console.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.def (original) +++ trunk/reactos/dll/win32/console/console.def Mon Aug 21 03:55:08 2006 @@ -1,6 +1,6 @@ LIBRARY console.dll EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (original) +++ trunk/reactos/dll/win32/console/console.h Mon Aug 21 03:55:08 2006 @@ -29,9 +29,17 @@ DWORD QuickEdit; DWORD InsertMode; + DWORD ActiveStaticControl; + COLORREF ScreenText; + COLORREF ScreenBackground; + COLORREF PopupText; + COLORREF PopupBackground; + } ConsoleInfo, *PConsoleInfo; BOOL WriteConsoleOptions(PConsoleInfo pConInfo); -BOOL InitConsoleInfo(HWND hwnd); + +//globals +extern HINSTANCE hApplet; #endif /* CONSOLE_H__ */ Modified: trunk/reactos/dll/win32/console/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/en.rc?re… ============================================================================== --- trunk/reactos/dll/win32/console/en.rc (original) +++ trunk/reactos/dll/win32/console/en.rc Mon Aug 21 03:55:08 2006 @@ -6,6 +6,8 @@ * PURPOSE: English resource file * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) */ + +#include <commctrl.h> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -24,10 +26,10 @@ GROUPBOX "Command History:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Buffer Size", -1, 25, 100, 60, 15 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 +CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 LTEXT "&Number of Buffers:", -1, 25, 120, 80, 15 EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 +CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 @@ -101,31 +103,31 @@ EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10 LTEXT "&Green:", -1, 125, 35, 30, 10 -EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 35, 30, 10, ES_RIGHT | WS_GROUP +EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10 LTEXT "&Blue:", -1, 125, 45, 30, 10 EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10 -CONTROL "", IDC_STATIC_COLOR1, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 15, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR2, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 27, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR3, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 39, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR4, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 51, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR5, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 63, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR6, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 75, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR7, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 87, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR8, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 99, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR9, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 111, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR10, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 123, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR11, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 135, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR12, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 147, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR13, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 159, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR14, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 171, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR15, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 183, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR16, "Static", SS_BLACKRECT | SS_NOTIFY | SS_SUNKEN, 195, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 15, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 27, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 39, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 51, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 63, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 99, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 111, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 123, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 135, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 147, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 159, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 GROUPBOX "Selected Screen Colors", -1, 10, 110, 200, 40 -CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_BLACKRECT | SS_SUNKEN, 15, 120, 180, 20 +CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 GROUPBOX "Selected Popup Colors", -1, 10, 155, 200, 40 -CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_BLACKRECT | SS_SUNKEN, 15, 165, 180, 20 +CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 @@ -144,4 +146,5 @@ IDS_CPLNAME "Console" IDS_CPLDESCRIPTION "Configures console properties." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" END Modified: trunk/reactos/dll/win32/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/console/font.c (original) +++ trunk/reactos/dll/win32/console/font.c Mon Aug 21 03:55:08 2006 @@ -19,9 +19,9 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(wParam); + switch(uMsg) { Modified: trunk/reactos/dll/win32/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/layout.c… ============================================================================== --- trunk/reactos/dll/win32/console/layout.c (original) +++ trunk/reactos/dll/win32/console/layout.c Mon Aug 21 03:55:08 2006 @@ -18,15 +18,19 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(lParam) + PConsoleInfo pConInfo = (PConsoleInfo)GetWindowLongPtr(hwndDlg, DWLP_USER); + + UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(wParam); switch(uMsg) { case WM_INITDIALOG: + { + pConInfo = (PConsoleInfo) ((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); return TRUE; - + } default: break; } Modified: trunk/reactos/dll/win32/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/options.… ============================================================================== --- trunk/reactos/dll/win32/console/options.c (original) +++ trunk/reactos/dll/win32/console/options.c Mon Aug 21 03:55:08 2006 @@ -9,7 +9,13 @@ #include "console.h" -BOOLEAN InitializeOptionsDialog(); +static +void +UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo); + +static +BOOL +InitializeOptionsFromReg(TCHAR * Path, PConsoleInfo pConInfo); INT_PTR CALLBACK @@ -25,13 +31,17 @@ HWND hDlgCtrl; LPPSHNOTIFY lppsn; - pConInfo = (PConsoleInfo) GetWindowLongPtr(GetParent(hwndDlg), DWLP_USER); + pConInfo = (PConsoleInfo) GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) { case WM_INITDIALOG: { - return InitializeOptionsDialog(hwndDlg); + pConInfo = (PConsoleInfo) ((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); + InitializeOptionsFromReg(pConInfo->szProcessName, pConInfo); + UpdateDialogElements(hwndDlg, pConInfo); + return TRUE; } case WM_NOTIFY: { @@ -149,6 +159,7 @@ return FALSE; } +static BOOL InitializeOptionsFromReg(TCHAR * Path, PConsoleInfo pConInfo) { HKEY hKey; @@ -157,7 +168,9 @@ DWORD dwIndex; DWORD dwValueName; DWORD dwValue; + DWORD dwType; TCHAR szValueName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; DWORD Value; if ( RegOpenCurrentUser(KEY_READ, &hKey) != ERROR_SUCCESS ) @@ -170,26 +183,39 @@ return FALSE; } - RegQueryInfoKey(hKey, NULL, NULL, NULL, &dwNumSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); + RegQueryInfoKey(hSubKey, NULL, NULL, NULL, &dwNumSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); for (dwIndex = 0; dwIndex < dwNumSubKeys; dwIndex++) { dwValue = sizeof(Value); dwValueName = MAX_PATH; - if ( RegEnumValue(hSubKey, dwIndex, szValueName, &dwValueName, NULL, NULL, (BYTE*)&Value, &dwValue) != ERROR_SUCCESS) - break; - - if ( !_tcscmp(szValueName, _T("CursorSize")) ) - { - if ( Value == 0x32) - pConInfo->CursorSize = Value; - else if ( Value == 0x64 ) - pConInfo->CursorSize = Value; - } - else if ( !_tcscmp(szValueName, _T("NumberOfHistoryBuffers")) ) - { - pConInfo->NumberOfHistoryBuffers = Value; + if ( RegEnumValue(hSubKey, dwIndex, szValueName, &dwValueName, NULL, &dwType, (BYTE*)&Value, &dwValue) != ERROR_SUCCESS) + { + if (dwType == REG_SZ) + { + /* + * retry in case of string value + */ + dwValue = sizeof(szValue); + dwValueName = MAX_PATH; + if (RegEnumValue(hSubKey, dwIndex, szValueName, &dwValueName, NULL, NULL, (BYTE*)szValue, &dwValue) != ERROR_SUCCESS) + break; + } + else + break; + } + + if ( !_tcscmp(szValueName, _T("CursorSize")) ) + { + if ( Value == 0x32) + pConInfo->CursorSize = Value; + else if ( Value == 0x64 ) + pConInfo->CursorSize = Value; + } + else if ( !_tcscmp(szValueName, _T("NumberOfHistoryBuffers")) ) + { + pConInfo->NumberOfHistoryBuffers = Value; } else if ( !_tcscmp(szValueName, _T("HistoryBufferSize")) ) { @@ -218,6 +244,7 @@ return TRUE; } +static void UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo) { @@ -321,8 +348,7 @@ if (!pConInfo) return FALSE; - InitializeOptionsFromReg(pConInfo->szProcessName, pConInfo); - UpdateDialogElements(hwndDlg, pConInfo); + return TRUE; } Modified: trunk/reactos/dll/win32/console/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/resource… ============================================================================== --- trunk/reactos/dll/win32/console/resource.h (original) +++ trunk/reactos/dll/win32/console/resource.h Mon Aug 21 03:55:08 2006 @@ -88,4 +88,8 @@ #define IDC_STATIC_COLOR15 626 #define IDC_STATIC_COLOR16 627 + +//string ids +#define IDS_SCREEN_TEXT 700 + #endif

1 0

[ion] 23628: - Detect NPX/FPU in simple assembly and XMMI/SSE2 by using CPU Feature flags, replacing the old asm+c mess. - Handle FPU/SSE saving in the CONTEXT<->KTRAP_FRAME routines directly, and using KiFlushNPXState assembly function. - Implement a naive Trap 7 (FPU Fault) handler in assembly that properly does most of the work required to handle an FPU fault. Not yet complete however since it almost ignores user-mode faults (just like trunk). FPU isn't done in ctx switching yet. - Remove all
by ion＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: ion Date: Mon Aug 21 03:53:07 2006 New Revision: 23628 URL: http://svn.reactos.org/svn/reactos?rev=23628&view=rev Log: - Detect NPX/FPU in simple assembly and XMMI/SSE2 by using CPU Feature flags, replacing the old asm+c mess. - Handle FPU/SSE saving in the CONTEXT<->KTRAP_FRAME routines directly, and using KiFlushNPXState assembly function. - Implement a naive Trap 7 (FPU Fault) handler in assembly that properly does most of the work required to handle an FPU fault. Not yet complete however since it almost ignores user-mode faults (just like trunk). FPU isn't done in ctx switching yet. - Remove all the other .c code that dealt with FPU stuff and had become incompatible since more then a year ago. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/i386/fpu.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/fpu.c trunk/reactos/ntoskrnl/ke/i386/kernel.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=2362… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Mon Aug 21 03:53:07 2006 @@ -382,9 +382,16 @@ #define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C #define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 #define APC_INDEX_MISMATCH 0x01 +#define TRAP_CAUSE_UNKNOWN 0x12 #define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A #define UNEXPECTED_KERNEL_MODE_TRAP 0x7F #define ATTEMPTED_SWITCH_FROM_DPC 0xB8 + +// +// IRQL Levels +// +#define PASSIVE_LEVEL 0x0 +#define APC_LEVEL 0x1 #endif // Modified: trunk/reactos/ntoskrnl/include/internal/i386/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/fpu.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/fpu.h Mon Aug 21 03:53:07 2006 @@ -1,24 +1,5 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_FPU_H #define __NTOSKRNL_INCLUDE_INTERNAL_I386_FPU_H -#include <internal/i386/ke.h> - -extern ULONG HardwareMathSupport; - -VOID -KiCheckFPU(VOID); - -NTSTATUS -KiHandleFpuFault(PKTRAP_FRAME Tf, ULONG ExceptionNr); - -VOID -KiFxSaveAreaToFloatingSaveArea(FLOATING_SAVE_AREA *FloatingSaveArea, CONST PFX_SAVE_AREA FxSaveArea); - -BOOL -KiContextToFxSaveArea(PFX_SAVE_AREA FxSaveArea, PCONTEXT Context); - -PFX_SAVE_AREA -KiGetFpuState(PKTHREAD Thread); - #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_FPU_H */ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Mon Aug 21 03:53:07 2006 @@ -15,15 +15,190 @@ #include <ndk/asm.h> .intel_syntax noprefix -#define Running 2 -#define SIZEOF_TRAP_FRAME 0x8c -#define APC_LEVEL 1 - -/* GLOBALS ****************************************************************/ - -.extern _DispatcherDatabaseLock +#define Running 2 /* FUNCTIONS ****************************************************************/ + +.globl _KiIsNpxPresent@0 +.func KiIsNpxPresent@0 +_KiIsNpxPresent@0: + + /* Save stack */ + push ebp + + /* Get CR0 and mask out FPU flags */ + mov eax, cr0 + and eax, ~(CR0_MP + CR0_TS + CR0_EM + CR0_ET) + + /* Initialize the FPU and assume FALSE for return */ + xor edx, edx + fninit + + /* Save magic value on stack */ + mov ecx, 0x42424242 + push ecx + + /* Setup stack for FPU store */ + mov ebp ,esp + fnstsw [ebp] + + /* Now check if our magic got cleared */ + cmp byte ptr [ebp], 0 + jnz NoFpu + + /* Enable FPU, set return to TRUE */ + or eax, CR0_ET + mov edx, 1 + + /* If this is a 486 or higher, enable INT 16 as well */ + cmp dword ptr fs:KPCR_PRCB_CPU_TYPE, 3 + jbe NoFpu + or eax, CR0_NE + +NoFpu: + /* Set emulation enabled during the first boot phase and set the CR0 */ + or eax, (CR0_EM + CR0_TS) + mov cr0, eax + + /* Restore stack */ + pop eax + pop ebp + + /* Return true or false */ + mov eax, edx + ret +.endfunc + +.globl _KiFlushNPXState@4 +.func KiFlushNPXState@4 +_KiFlushNPXState@4: + + /* Save volatiles and disable interrupts */ + push esi + push edi + push ebx + pushfd + cli + + /* Save the PCR and get the current thread */ + mov edi, fs:[KPCR_SELF] + mov esi, [edi+KPCR_CURRENT_THREAD] + + /* Check if we're already loaded */ + cmp byte ptr [esi+KTHREAD_NPX_STATE], NPX_STATE_LOADED + je IsValid + + /* Check if we're supposed to get it */ + cmp dword ptr [esp+20], 0 + je Return + +#ifdef DBG + /* Assert Fxsr support */ + test byte ptr _KeI386FxsrPresent, 1 + jnz AssertOk + int 3 +AssertOk: +#endif + + /* Get CR0 and test if it's valid */ + mov ebx, cr0 + test bl, CR0_MP + CR0_TS + CR0_EM + jz Cr0OK + + /* Enable fnsave to work */ + and ebx, ~(CR0_MP + CR0_TS + CR0_EM) + mov cr0, ebx + +Cr0OK: + /* Check if we are the NPX Thread */ + mov eax, [edi+KPCR_NPX_THREAD] + or eax, eax + jz DontSave + + /* Check if it's not loaded */ + cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED + jnz DontSave + +#ifdef DBG + /* We are the NPX Thread with an unloaded NPX State... this isn't normal! */ + int 3 +#endif + + /* Save the NPX State */ + mov ecx, [eax+KTHREAD_INITIAL_STACK] + sub ecx, NPX_FRAME_LENGTH + fxsave [ecx] + mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED + +DontSave: + /* Load the NPX State */ + mov ecx, [esi+KTHREAD_INITIAL_STACK] + sub ecx, NPX_FRAME_LENGTH + fxrstor [ecx] + + /* Get the CR0 state and destination */ + mov edx, [ecx+FN_CR0_NPX_STATE] + mov ecx, [esp+20] + jmp DoneLoad + +IsValid: + /* We already have a valid state, flush it */ + mov ebx, cr0 + test bl, CR0_MP + CR0_TS + CR0_EM + jz Cr0OK2 + + /* Enable fnsave to work */ + and ebx, ~(CR0_MP + CR0_TS + CR0_EM) + mov cr0, ebx + +Cr0OK2: + /* Get the kernel stack */ + mov ecx, [esi+KTHREAD_INITIAL_STACK] + test byte ptr _KeI386FxsrPresent, 1 + lea ecx, [ecx-NPX_FRAME_LENGTH] + + /* Set the NPX State */ + mov byte ptr [esi+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED + + /* Get Cr0 */ + mov edx, [ecx+FN_CR0_NPX_STATE] + jz DoneLoad + + /* Save the FX State */ + fxsave [ecx] + + /* Check if we also have to save it in the parameter */ + mov ecx, [esp+20] + jecxz NoSave + +DoneLoad: + /* Save the Fn state in the parameter we got */ + fnsave [ecx] + fwait + +NoSave: + /* Clear eax */ + xor eax, eax + + /* Add NPX State */ + or ebx, NPX_STATE_NOT_LOADED + + /* Clear the NPX thread */ + mov [edi+KPCR_NPX_THREAD], eax + + /* Add saved CR0 into NPX State, and set it */ + or ebx, edx + mov cr0, ebx + + /* Re-enable interrupts and return */ +Return: + popf + pop ebx + pop edi + pop esi + ret 4 + +.endfunc /*++ * KiThreadStartup Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Mon Aug 21 03:53:07 2006 @@ -28,10 +28,18 @@ #pragma alloc_text(INIT, KeInitExceptions) #endif +#define SIZE_OF_FX_REGISTERS 32 + VOID NTAPI Ki386AdjustEsp0( IN PKTRAP_FRAME TrapFrame +); + +VOID +NTAPI +KiFlushNPXState( + IN FLOATING_SAVE_AREA *SaveArea ); extern KIDTENTRY KiIdt[]; @@ -467,10 +475,10 @@ */ { ULONG_PTR cr2; - NTSTATUS Status; ULONG Esp0; ASSERT(ExceptionNr != 14); + ASSERT((ExceptionNr != 7 && ExceptionNr != 16 && ExceptionNr != 19)); /* Use the address of the trap frame as approximation to the ring0 esp */ Esp0 = (ULONG)&Tf->Eip; @@ -526,18 +534,6 @@ } /* - * Try to handle device-not-present, math-fault and xmm-fault exceptions. - */ - if (ExceptionNr == 7 || ExceptionNr == 16 || ExceptionNr == 19) - { - Status = KiHandleFpuFault(Tf, ExceptionNr); - if (NT_SUCCESS(Status)) - { - return(0); - } - } - - /* * Handle user exceptions differently */ if ((Tf->SegCs & 0xFFFF) == (KGDT_R3_CODE | RPL_MASK)) @@ -660,6 +656,23 @@ /* Usermode, save the User SS */ TrapFrame->HardwareSegSs = Ss | RPL_MASK; } +} + +USHORT +NTAPI +KiTagWordFnsaveToFxsave(USHORT TagWord) +{ + INT FxTagWord = ~TagWord; + + /* + * Empty is now 00, any 2 bits containing 1 mean valid + * Now convert the rest (11->0 and the rest to 1) + */ + FxTagWord = (FxTagWord | (FxTagWord >> 1)) & 0x5555; /* 0V0V0V0V0V0V0V0V */ + FxTagWord = (FxTagWord | (FxTagWord >> 1)) & 0x3333; /* 00VV00VV00VV00VV */ + FxTagWord = (FxTagWord | (FxTagWord >> 2)) & 0x0f0f; /* 0000VVVV0000VVVV */ + FxTagWord = (FxTagWord | (FxTagWord >> 4)) & 0x00ff; /* 00000000VVVVVVVV */ + return FxTagWord; } VOID @@ -671,7 +684,7 @@ IN KPROCESSOR_MODE PreviousMode) { PFX_SAVE_AREA FxSaveArea; - //ULONG i; Future Use + ULONG i; BOOLEAN V86Switch = FALSE; /* Start with the basic Registers */ @@ -784,7 +797,21 @@ /* Check if NPX is present */ if (KeI386NpxPresent) { - /* Future use */ + /* Flush the NPX State */ + KiFlushNPXState(NULL); + + /* Copy the FX State */ + RtlCopyMemory(&FxSaveArea->U.FxArea, + &Context->ExtendedRegisters[0], + MAXIMUM_SUPPORTED_EXTENSION); + + /* Remove reserved bits from MXCSR */ + FxSaveArea->U.FxArea.MXCsr &= ~0xFFBF; + + /* Mask out any invalid flags */ + FxSaveArea->Cr0NpxState &= ~(CR0_EM | CR0_MP | CR0_TS); + + /* FIXME: Check if this is a VDM app */ } } @@ -799,11 +826,58 @@ /* Check if NPX is present */ if (KeI386NpxPresent) { - /* Future use */ + /* Flush the NPX State */ + KiFlushNPXState(NULL); + + /* Check if we have Fxsr support */ + if (KeI386FxsrPresent) + { + /* Convert the Fn Floating Point state to Fx */ + FxSaveArea->U.FxArea.ControlWord = + (USHORT)Context->FloatSave.ControlWord; + FxSaveArea->U.FxArea.StatusWord = + (USHORT)Context->FloatSave.StatusWord; + FxSaveArea->U.FxArea.TagWord = + KiTagWordFnsaveToFxsave((USHORT)Context->FloatSave.TagWord); + FxSaveArea->U.FxArea.ErrorOpcode = + (USHORT)(Context->FloatSave.ErrorSelector >> 16); + FxSaveArea->U.FxArea.ErrorOffset = + Context->FloatSave.ErrorOffset; + FxSaveArea->U.FxArea.ErrorSelector = + Context->FloatSave.ErrorSelector & 0xFFFF; + FxSaveArea->U.FxArea.DataOffset = + Context->FloatSave.DataOffset; + FxSaveArea->U.FxArea.DataSelector = + Context->FloatSave.DataSelector & 0xFFFF; + + /* Clear out the Register Area */ + RtlZeroMemory(&FxSaveArea->U.FxArea.RegisterArea[0], SIZE_OF_FX_REGISTERS); + + /* Loop the 8 floating point registers */ + for (i = 0; i < 8; i++) + { + /* Copy from Fn to Fx */ + RtlCopyMemory(FxSaveArea->U.FxArea.RegisterArea + (i * 16), + Context->FloatSave.RegisterArea + (i * 10), + 10); + } + } + else + { + /* Just dump the Fn state in */ + RtlCopyMemory(&FxSaveArea->U.FnArea, + &Context->FloatSave, + sizeof(FNSAVE_FORMAT)); + } + + /* Mask out any invalid flags */ + FxSaveArea->Cr0NpxState &= ~(CR0_EM | CR0_MP | CR0_TS); + + /* FIXME: Check if this is a VDM app */ } else { - /* Future use */ + /* FIXME: Handle FPU Emulation */ } } @@ -826,9 +900,6 @@ (Context->Dr7 & DR7_ACTIVE); } } - - /* Handle FPU and Extended Registers */ - KiContextToFxSaveArea((PFX_SAVE_AREA)(TrapFrame + 1), Context); } VOID @@ -837,7 +908,13 @@ IN PKEXCEPTION_FRAME ExceptionFrame, IN OUT PCONTEXT Context) { - PFX_SAVE_AREA FxSaveArea = NULL; + PFX_SAVE_AREA FxSaveArea; + struct _AlignHack + { + UCHAR Hack[15]; + FLOATING_SAVE_AREA UnalignedArea; + } FloatSaveBuffer; + FLOATING_SAVE_AREA *FloatSaveArea; /* Start with the Control flags */ if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) @@ -920,19 +997,13 @@ /* Make sure NPX is present */ if (KeI386NpxPresent) { - /* Future use */ - } - - /* Old code */ - FxSaveArea = KiGetFpuState(KeGetCurrentThread()); - if (FxSaveArea != NULL) - { - memcpy(Context->ExtendedRegisters, &FxSaveArea->U.FxArea, - min(sizeof (Context->ExtendedRegisters), sizeof (FxSaveArea->U.FxArea)) ); - } - else - { - Context->ContextFlags &= (~CONTEXT_EXTENDED_REGISTERS) | CONTEXT_i386; + /* Flush the NPX State */ + KiFlushNPXState(NULL); + + /* Copy the registers */ + RtlCopyMemory(&Context->ExtendedRegisters[0], + &FxSaveArea->U.FxArea, + MAXIMUM_SUPPORTED_EXTENSION); } } @@ -946,24 +1017,34 @@ /* Make sure we have an NPX */ if (KeI386NpxPresent) - { - /* Future use */ - } - else - { - /* Future Use */ - } - - /* Old code */ - FxSaveArea = KiGetFpuState(KeGetCurrentThread()); - if (FxSaveArea != NULL) - { - KiFxSaveAreaToFloatingSaveArea(&Context->FloatSave, FxSaveArea); - } - else - { - Context->ContextFlags &= (~CONTEXT_FLOATING_POINT) | CONTEXT_i386; - } + { + /* Check if we have Fxsr support */ + if (KeI386FxsrPresent) + { + /* Align the floating area to 16-bytes */ + FloatSaveArea = (FLOATING_SAVE_AREA*) + ((ULONG_PTR)&FloatSaveBuffer.UnalignedArea &~ 0xF); + + /* Get the State */ + KiFlushNPXState(FloatSaveArea); + } + else + { + /* We don't, use the FN area and flush the NPX State */ + FloatSaveArea = (FLOATING_SAVE_AREA*)&FxSaveArea->U.FnArea; + KiFlushNPXState(NULL); + } + + /* Copy into the Context */ + RtlCopyMemory(&Context->FloatSave, + &FxSaveArea->U.FnArea, + sizeof(FNSAVE_FORMAT)); + } + else + { + /* FIXME: Handle Emulation */ + Context->ContextFlags &= (~CONTEXT_FLOATING_POINT) | CONTEXT_i386; + } } /* Handle debug registers */ Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/fpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/fpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c Mon Aug 21 03:53:07 2006 @@ -14,462 +14,7 @@ #define NDEBUG #include <internal/debug.h> -/* DEFINES *******************************************************************/ - -/* x87 Status Word exception flags */ -#define X87_SW_IE (1<<0) /* Invalid Operation */ -#define X87_SW_DE (1<<1) /* Denormalized Operand */ -#define X87_SW_ZE (1<<2) /* Zero Devide */ -#define X87_SW_OE (1<<3) /* Overflow */ -#define X87_SW_UE (1<<4) /* Underflow */ -#define X87_SW_PE (1<<5) /* Precision */ -#define X87_SW_SE (1<<6) /* Stack Fault */ - -#define X87_SW_ES (1<<7) /* Error Summary */ - -/* MXCSR exception flags */ -#define MXCSR_IE (1<<0) /* Invalid Operation */ -#define MXCSR_DE (1<<1) /* Denormalized Operand */ -#define MXCSR_ZE (1<<2) /* Zero Devide */ -#define MXCSR_OE (1<<3) /* Overflow */ -#define MXCSR_UE (1<<4) /* Underflow */ -#define MXCSR_PE (1<<5) /* Precision */ -#define MXCSR_DAZ (1<<6) /* Denormals Are Zeros (P4 only) */ - -/* GLOBALS *******************************************************************/ - -extern ULONG KeI386NpxPresent; -extern ULONG KeI386XMMIPresent; -extern ULONG KeI386FxsrPresent; - -static ULONG MxcsrFeatureMask = 0; - /* FUNCTIONS *****************************************************************/ - -STATIC USHORT -KiTagWordFnsaveToFxsave(USHORT TagWord) -{ - INT tmp; - - /* - * Converts the tag-word. 11 (Empty) is converted into 0, everything else into 1 - */ - tmp = ~TagWord; /* Empty is now 00, any 2 bits containing 1 mean valid */ - tmp = (tmp | (tmp >> 1)) & 0x5555; /* 0V0V0V0V0V0V0V0V */ - tmp = (tmp | (tmp >> 1)) & 0x3333; /* 00VV00VV00VV00VV */ - tmp = (tmp | (tmp >> 2)) & 0x0f0f; /* 0000VVVV0000VVVV */ - tmp = (tmp | (tmp >> 4)) & 0x00ff; /* 00000000VVVVVVVV */ - - return tmp; -} - - -STATIC USHORT -KiTagWordFxsaveToFnsave(PFXSAVE_FORMAT FxSave) -{ - USHORT TagWord = 0; - UCHAR Tag; - INT i; - struct FPREG { USHORT Significand[4]; USHORT Exponent; } *FpReg; - - for (i = 0; i < 8; i++) - { - if (FxSave->TagWord & (1 << i)) /* valid */ - { - FpReg = (struct FPREG *)(FxSave->RegisterArea + (i * 16)); - switch (FpReg->Exponent & 0x00007fff) - { - case 0x0000: - if (FpReg->Significand[0] == 0 && FpReg->Significand[1] == 0 && - FpReg->Significand[2] == 0 && FpReg->Significand[3] == 0) - Tag = 1; /* Zero */ - else - Tag = 2; /* Special */ - break; - - case 0x7fff: - Tag = 2; /* Special */ - break; - - default: - if (FpReg->Significand[3] & 0x00008000) - Tag = 0; /* Valid */ - else - Tag = 2; /* Special */ - break; - } - } - else /* empty */ - { - Tag = 3; - } - TagWord |= Tag << (i * 2); - } - - return TagWord; -} - - -STATIC VOID -KiFnsaveToFxsaveFormat(PFXSAVE_FORMAT FxSave, PFNSAVE_FORMAT FnSave) -{ - INT i; - - FxSave->ControlWord = (USHORT)FnSave->ControlWord; - FxSave->StatusWord = (USHORT)FnSave->StatusWord; - FxSave->TagWord = KiTagWordFnsaveToFxsave((USHORT)FnSave->TagWord); - FxSave->ErrorOpcode = (USHORT)(FnSave->ErrorSelector >> 16); - FxSave->ErrorOffset = FnSave->ErrorOffset; - FxSave->ErrorSelector = FnSave->ErrorSelector & 0x0000ffff; - FxSave->DataOffset = FnSave->DataOffset; - FxSave->DataSelector = FnSave->DataSelector & 0x0000ffff; - if (KeI386XMMIPresent) - FxSave->MXCsr = 0x00001f80 & MxcsrFeatureMask; - else - FxSave->MXCsr = 0; - FxSave->MXCsrMask = MxcsrFeatureMask; - memset(FxSave->Reserved3, 0, sizeof(FxSave->Reserved3) + - sizeof(FxSave->Reserved4)); /* Don't zero Align16Byte because Context->ExtendedRegisters - is only 512 bytes, not 520 */ - for (i = 0; i < 8; i++) - { - memcpy(FxSave->RegisterArea + (i * 16), FnSave->RegisterArea + (i * 10), 10); - memset(FxSave->RegisterArea + (i * 16) + 10, 0, 6); - } -} - -STATIC VOID -KiFxsaveToFnsaveFormat(PFNSAVE_FORMAT FnSave, PFXSAVE_FORMAT FxSave) -{ - INT i; - - FnSave->ControlWord = 0xffff0000 | FxSave->ControlWord; - FnSave->StatusWord = 0xffff0000 | FxSave->StatusWord; - FnSave->TagWord = 0xffff0000 | KiTagWordFxsaveToFnsave(FxSave); - FnSave->ErrorOffset = FxSave->ErrorOffset; - FnSave->ErrorSelector = FxSave->ErrorSelector & 0x0000ffff; - FnSave->ErrorSelector |= FxSave->ErrorOpcode << 16; - FnSave->DataOffset = FxSave->DataOffset; - FnSave->DataSelector = FxSave->DataSelector | 0xffff0000; - for (i = 0; i < 8; i++) - { - memcpy(FnSave->RegisterArea + (i * 10), FxSave->RegisterArea + (i * 16), 10); - } -} - - -STATIC VOID -KiFloatingSaveAreaToFxSaveArea(PFX_SAVE_AREA FxSaveArea, FLOATING_SAVE_AREA *FloatingSaveArea) -{ - if (KeI386FxsrPresent) - { - KiFnsaveToFxsaveFormat(&FxSaveArea->U.FxArea, (PFNSAVE_FORMAT)FloatingSaveArea); - } - else - { - memcpy(&FxSaveArea->U.FnArea, FloatingSaveArea, sizeof(FxSaveArea->U.FnArea)); - } - FxSaveArea->NpxSavedCpu = 0; - FxSaveArea->Cr0NpxState = FloatingSaveArea->Cr0NpxState; -} - - -VOID -KiFxSaveAreaToFloatingSaveArea(FLOATING_SAVE_AREA *FloatingSaveArea, CONST PFX_SAVE_AREA FxSaveArea) -{ - if (KeI386FxsrPresent) - { - KiFxsaveToFnsaveFormat((PFNSAVE_FORMAT)FloatingSaveArea, &FxSaveArea->U.FxArea); - } - else - { - memcpy(FloatingSaveArea, &FxSaveArea->U.FnArea, sizeof(FxSaveArea->U.FnArea)); - } - FloatingSaveArea->Cr0NpxState = FxSaveArea->Cr0NpxState; -} - - -BOOL -KiContextToFxSaveArea(PFX_SAVE_AREA FxSaveArea, PCONTEXT Context) -{ - BOOL FpuContextChanged = FALSE; - - /* First of all convert the FLOATING_SAVE_AREA into the FX_SAVE_AREA */ - if ((Context->ContextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT) - { - KiFloatingSaveAreaToFxSaveArea(FxSaveArea, &Context->FloatSave); - FpuContextChanged = TRUE; - } - - /* Now merge the FX_SAVE_AREA from the context with the destination area */ - if ((Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS) == CONTEXT_EXTENDED_REGISTERS) - { - if (KeI386FxsrPresent) - { - PFXSAVE_FORMAT src = (PFXSAVE_FORMAT)Context->ExtendedRegisters; - PFXSAVE_FORMAT dst = &FxSaveArea->U.FxArea; - dst->MXCsr = src->MXCsr & MxcsrFeatureMask; - memcpy(dst->Reserved3, src->Reserved3, - sizeof(src->Reserved3) + sizeof(src->Reserved4)); - - if ((Context->ContextFlags & CONTEXT_FLOATING_POINT) != CONTEXT_FLOATING_POINT) - { - dst->ControlWord = src->ControlWord; - dst->StatusWord = src->StatusWord; - dst->TagWord = src->TagWord; - dst->ErrorOpcode = src->ErrorOpcode; - dst->ErrorOffset = src->ErrorOffset; - dst->ErrorSelector = src->ErrorSelector; - dst->DataOffset = src->DataOffset; - dst->DataSelector = src->DataSelector; - memcpy(dst->RegisterArea, src->RegisterArea, sizeof(src->RegisterArea)); - - FxSaveArea->NpxSavedCpu = 0; - FxSaveArea->Cr0NpxState = 0; - } - FpuContextChanged = TRUE; - } - } - - return FpuContextChanged; -} - - -VOID INIT_FUNCTION -KiCheckFPU(VOID) -{ - unsigned short int status; - int cr0; - ULONG Flags; - PKPRCB Prcb = KeGetCurrentPrcb(); - - Ke386SaveFlags(Flags); - Ke386DisableInterrupts(); - - KeI386NpxPresent = 0; - KeI386FxsrPresent = 0; - KeI386XMMIPresent = 0; - - cr0 = Ke386GetCr0(); - cr0 |= X86_CR0_NE | X86_CR0_MP; - cr0 &= ~(X86_CR0_EM | X86_CR0_TS); - Ke386SetCr0(cr0); - -#if defined(__GNUC__) - asm volatile("fninit\n\t"); - asm volatile("fstsw %0\n\t" : "=a" (status)); -#elif defined(_MSC_VER) - __asm - { - fninit; - fstsw status - } -#else -#error Unknown compiler for inline assembler -#endif - - if (status != 0) - { - /* Set the EM flag in CR0 so any FPU instructions cause a trap. */ - Ke386SetCr0(Ke386GetCr0() | X86_CR0_EM); - Ke386RestoreFlags(Flags); - return; - } - - /* fsetpm for i287, ignored by i387 */ -#if defined(__GNUC__) - asm volatile(".byte 0xDB, 0xE4\n\t"); -#elif defined(_MSC_VER) - __asm _emit 0xDB __asm _emit 0xe4 -#else -#error Unknown compiler for inline assembler -#endif - - KeI386NpxPresent = 1; - - /* check for and enable MMX/SSE support if possible */ - if ((Prcb->FeatureBits & X86_FEATURE_FXSR) != 0) - { - BYTE DummyArea[sizeof(FX_SAVE_AREA) + 15]; - PFX_SAVE_AREA FxSaveArea; - - /* enable FXSR */ - KeI386FxsrPresent = 1; - - /* we need a 16 byte aligned FX_SAVE_AREA */ - FxSaveArea = (PFX_SAVE_AREA)(((ULONG_PTR)DummyArea + 0xf) & (~0x0f)); - - Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSFXSR); - memset(&FxSaveArea->U.FxArea, 0, sizeof(FxSaveArea->U.FxArea)); - asm volatile("fxsave %0" : : "m"(FxSaveArea->U.FxArea)); - MxcsrFeatureMask = FxSaveArea->U.FxArea.MXCsrMask; - if (MxcsrFeatureMask == 0) - { - MxcsrFeatureMask = 0x0000ffbf; - } - } - /* FIXME: Check for SSE3 in Ke386CpuidFlags2! */ - if (Prcb->FeatureBits & (X86_FEATURE_SSE | X86_FEATURE_SSE2)) - { - Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); - - /* enable SSE */ - KeI386XMMIPresent = 1; - } - - Ke386SetCr0(Ke386GetCr0() | X86_CR0_TS); - Ke386RestoreFlags(Flags); -} - - -PFX_SAVE_AREA -KiGetFpuState(PKTHREAD Thread) -{ - PFX_SAVE_AREA FxSaveArea = NULL; - KIRQL OldIrql; - ULONG Cr0; - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if (Thread->NpxState & NPX_STATE_LOADED) - { - FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof (FX_SAVE_AREA)); - if (Thread->NpxState & NPX_STATE_NOT_LOADED) - { - ASSERT(KeGetCurrentPrcb()->NpxThread == Thread); - - Cr0 = Ke386GetCr0(); - asm volatile("clts"); - if (KeI386FxsrPresent) - asm volatile("fxsave %0" : : "m"(FxSaveArea->U.FxArea)); - else - { - asm volatile("fnsave %0" : : "m"(FxSaveArea->U.FnArea)); - /* FPU state has to be reloaded because fnsave changes it. */ - Cr0 |= X86_CR0_TS; - KeGetCurrentPrcb()->NpxThread = NULL; - } - Ke386SetCr0(Cr0); - Thread->NpxState = NPX_STATE_LOADED; - } - } - KeLowerIrql(OldIrql); - - return FxSaveArea; -} - - -NTSTATUS -KiHandleFpuFault(PKTRAP_FRAME Tf, ULONG ExceptionNr) -{ - if (ExceptionNr == 7) /* device not present */ - { - //BOOL FpuInitialized = FALSE; - unsigned int cr0 = Ke386GetCr0(); - PKTHREAD CurrentThread; - //PFX_SAVE_AREA FxSaveArea; - KIRQL oldIrql; - - (void) cr0; - ASSERT((cr0 & X86_CR0_TS) == X86_CR0_TS); - ASSERT((Tf->EFlags & X86_EFLAGS_VM) == 0); - ASSERT((cr0 & X86_CR0_EM) == 0); - - /* disable scheduler, clear TS in cr0 */ - ASSERT_IRQL(DISPATCH_LEVEL); - KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); - asm volatile("clts"); - - CurrentThread = KeGetCurrentThread(); - ASSERT(CurrentThread != NULL); - - CurrentThread->NpxState |= NPX_STATE_NOT_LOADED; - KeLowerIrql(oldIrql); - DPRINT("Device not present exception handled!\n"); - - return STATUS_SUCCESS; - } - else /* ExceptionNr == 16 || ExceptionNr == 19 */ - { - EXCEPTION_RECORD Er; - KPROCESSOR_MODE PreviousMode; - PKTHREAD CurrentThread, NpxThread; - KIRQL OldIrql; - ULONG FpuEnvBuffer[7]; - PFNSAVE_FORMAT FpuEnv = (PFNSAVE_FORMAT)FpuEnvBuffer; - - ASSERT(ExceptionNr == 16 || ExceptionNr == 19); /* math fault or XMM fault*/ - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - NpxThread = KeGetCurrentPrcb()->NpxThread; - CurrentThread = KeGetCurrentThread(); - if (NpxThread == NULL) - { - KeLowerIrql(OldIrql); - DPRINT("Math/Xmm fault ignored! (NpxThread == NULL)\n"); - return STATUS_SUCCESS; - } - if (ExceptionNr == 16) - { - asm volatile("fnstenv %0" : : "m"(*FpuEnv)); - asm volatile("fldenv %0" : : "m"(*FpuEnv)); /* Stupid x87... */ - FpuEnv->StatusWord &= 0xffff; - } - KeLowerIrql(OldIrql); - - PreviousMode = ((Tf->SegCs & 0xffff) == (KGDT_R3_CODE | RPL_MASK)) ? (UserMode) : (KernelMode); - DPRINT("Math/Xmm fault happened! (PreviousMode = %s)\n", - (PreviousMode != KernelMode) ? ("UserMode") : ("KernelMode")); - - ASSERT(NpxThread == CurrentThread); /* FIXME: Is not always true I think */ - - /* Get FPU/XMM state */ - KeLowerIrql(OldIrql); - - /* Determine exception code */ - if (ExceptionNr == 16) - { - DPRINT("FpuStatusWord = 0x%04x\n", FpuStatusWord); - - if (FpuEnv->StatusWord & X87_SW_IE) - Er.ExceptionCode = STATUS_FLOAT_INVALID_OPERATION; - else if (FpuEnv->StatusWord & X87_SW_DE) - Er.ExceptionCode = STATUS_FLOAT_DENORMAL_OPERAND; - else if (FpuEnv->StatusWord & X87_SW_ZE) - Er.ExceptionCode = STATUS_FLOAT_DIVIDE_BY_ZERO; - else if (FpuEnv->StatusWord & X87_SW_OE) - Er.ExceptionCode = STATUS_FLOAT_OVERFLOW; - else if (FpuEnv->StatusWord & X87_SW_UE) - Er.ExceptionCode = STATUS_FLOAT_UNDERFLOW; - else if (FpuEnv->StatusWord & X87_SW_PE) - Er.ExceptionCode = STATUS_FLOAT_INEXACT_RESULT; - else if (FpuEnv->StatusWord & X87_SW_SE) - Er.ExceptionCode = STATUS_FLOAT_STACK_CHECK; - else - ASSERT(0); /* not reached */ - Er.ExceptionAddress = (PVOID)FpuEnv->ErrorOffset; - } - else /* ExceptionNr == 19 */ - { - Er.ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; - Er.ExceptionAddress = (PVOID)Tf->Eip; - } - - Er.ExceptionFlags = 0; - Er.ExceptionRecord = NULL; - Er.NumberParameters = 0; - - /* Dispatch exception */ - DPRINT("Dispatching exception (ExceptionCode = 0x%08x)\n", Er.ExceptionCode); - KiDispatchException(&Er, NULL, Tf, PreviousMode, TRUE); - - DPRINT("Math-fault handled!\n"); - return STATUS_SUCCESS; - } - - return STATUS_UNSUCCESSFUL; -} - /* This is a rather naive implementation of Ke(Save/Restore)FloatingPointState which will not work for WDM drivers. Please feel free to improve */ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Mon Aug 21 03:53:07 2006 @@ -31,6 +31,7 @@ BOOLEAN Ke386GlobalPagesEnabled = FALSE; ULONG KiFastSystemCallDisable = 1; ULONG KeI386NpxPresent = 0; +ULONG MxcsrFeatureMask = 0; ULONG KeI386XMMIPresent = 0; ULONG KeI386FxsrPresent = 0; extern PVOID Ki386InitialStackArray[MAXIMUM_PROCESSORS]; @@ -47,7 +48,46 @@ #pragma alloc_text(INIT, Ki386SetProcessorFeatures) #endif +BOOLEAN +NTAPI +KiIsNpxPresent( + VOID +); + /* FUNCTIONS *****************************************************************/ + +VOID +INIT_FUNCTION +NTAPI +KiCheckFPU(VOID) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Check for a math co-processor (NPX) */ + KeI386NpxPresent = KiIsNpxPresent(); + + /* Check for and enable MMX/SSE support if possible */ + KeI386FxsrPresent = Prcb->FeatureBits & X86_FEATURE_FXSR ? TRUE : FALSE; + + /* Check for SSE (2 and 3 should have this set too) */ + KeI386XMMIPresent = Prcb->FeatureBits & X86_FEATURE_SSE ? TRUE : FALSE; + + /* Check if Fxsr was found */ + if (KeI386FxsrPresent) + { + /* Enable it. FIXME: Send an IPI */ + Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSFXSR); + + /* Check if XMM was found too */ + if (KeI386XMMIPresent) + { + /* Enable it: FIXME: Send an IPI. */ + Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); + + /* FIXME: Implement and enable XMM Page Zeroing for Mm */ + } + } +} static VOID INIT_FUNCTION Ki386GetCpuId(VOID) 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 Aug 21 03:53:07 2006 @@ -819,6 +819,7 @@ jne _Kei386EoiHelper@0 jmp _KiV86Complete +.func KiTrap7 _KiTrap7: /* Push error code */ push 0 @@ -826,18 +827,134 @@ /* Enter trap */ TRAP_PROLOG(7) - /* Call the C exception handler */ - push 7 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete + /* Get the current thread and stack */ +StartTrapHandle: + mov eax, [fs:KPCR_CURRENT_THREAD] + mov ecx, [eax+KTHREAD_INITIAL_STACK] + sub ecx, NPX_FRAME_LENGTH + + /* Check if emulation is enabled */ + test dword ptr [ecx+FN_CR0_NPX_STATE], CR0_EM + jnz EmulationEnabled + +CheckState: + /* Check if the NPX state is loaded */ + cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_LOADED + mov ebx, cr0 + jz IsLoaded + + /* Remove flags */ + and ebx, ~(CR0_MP + CR0_TS + CR0_EM) + mov cr0, ebx + + /* Check the NPX thread */ + mov edx, [fs:KPCR_NPX_THREAD] + or edx, edx + jz NoNpxThread + + /* Get the NPX Stack */ + mov esi, [edx+KTHREAD_INITIAL_STACK] + sub esi, NPX_FRAME_LENGTH + + /* Check if we have FXSR and check which operand to use */ + test byte ptr _KeI386FxsrPresent, 1 + jz FnSave + fxsave [esi] + jmp AfterSave + +FnSave: + fnsave [esi] + +AfterSave: + /* Set the thread's state to dirty */ + mov byte ptr [edx+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED + +NoNpxThread: + /* Check if we have FXSR and choose which operand to use */ + test byte ptr _KeI386FxsrPresent, 1 + jz FrRestore + fxrstor [ecx] + jmp AfterRestore + +FrRestore: + frstor [esi] + +AfterRestore: + /* Set state loaded */ + mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_LOADED + mov [fs:KPCR_NPX_THREAD], eax + + /* Enable interrupts to happen now */ + sti + nop + + /* Check if CR0 needs to be reloaded due to a context switch */ + cmp dword ptr [ecx+FN_CR0_NPX_STATE], 0 + jz _Kei386EoiHelper@0 + + /* We have to reload CR0... disable interrupts */ + cli + + /* Get CR0 and update it */ + mov ebx, cr0 + or ebx, [ecx+FN_CR0_NPX_STATE] + mov cr0, ebx + + /* Restore interrupts and check if TS is back on */ + sti + test bl, CR0_TS + jz _Kei386EoiHelper@0 + + /* Clear TS, and loop handling again */ + clts + cli + jmp StartTrapHandle + +IsLoaded: + /* Check if TS is set */ + test bl, CR0_TS + jnz TsSetOnLoadedState + + /* Check if the trap came from user-mode */ + int 3 + +EmulationEnabled: + /* Did this come from kernel-mode? */ + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE + jz CheckState + + /* It came from user-mode, so this would only be valid inside a VDM */ + /* Since we don't actually have VDMs in ROS, bugcheck. */ + jmp BogusTrap2 + +TsSetOnLoadedState: + /* TS shouldn't be set, unless this we don't have a Math Processor */ + test bl, CR0_MP + jnz BogusTrap + + /* Strange that we got a trap at all, but ignore and continue */ + clts + jmp _Kei386EoiHelper@0 + +BogusTrap2: + /* Cause a bugcheck */ + sti + push 0 + push 0 + push eax + push 1 + push TRAP_CAUSE_UNKNOWN + call _KeBugCheckEx@20 + +BogusTrap: + /* Cause a bugcheck */ + push 0 + push 0 + push ebx + push 2 + push TRAP_CAUSE_UNKNOWN + call _KeBugCheckEx@20 +.endfunc .globl _KiTrap8 _KiTrap8: @@ -864,6 +981,7 @@ jne _Kei386EoiHelper@0 jmp _KiV86Complete +#if 1 _KiTrap10: /* Enter trap */ TRAP_PROLOG(10) @@ -880,6 +998,7 @@ /* Return to caller */ jne _Kei386EoiHelper@0 jmp _KiV86Complete +#endif _KiTrap11: /* Enter trap */ @@ -915,6 +1034,7 @@ jne _Kei386EoiHelper@0 jmp _KiV86Complete +#if 1 _KiTrap13: /* Enter trap */ TRAP_PROLOG(13) @@ -931,6 +1051,7 @@ /* Return to caller */ jne _Kei386EoiHelper@0 jmp _KiV86Complete +#endif _KiTrap14: /* Enter trap */

1 0

[mc] 23627: modified porting-tools/rdesktop-core-tester/activex.cpp modified porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp And from the chrysalis out came... the caterpillar. MissTosca stops just short of being demonstrable. I'll keep working on it, but the Google Summer of Code is, for all intent and purposes, over. The matter is in the hands of my judges now. Wish me luck modified rdesktop/iso.c modified rdesktop/proto.h modified rdesktop/rdesktop.h modified rdesktop/rdp.c Very m
by mc＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: mc Date: Mon Aug 21 01:02:10 2006 New Revision: 23627 URL: http://svn.reactos.org/svn/reactos?rev=23627&view=rev Log: modified porting-tools/rdesktop-core-tester/activex.cpp modified porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp And from the chrysalis out came... the caterpillar. MissTosca stops just short of being demonstrable. I'll keep working on it, but the Google Summer of Code is, for all intent and purposes, over. The matter is in the hands of my judges now. Wish me luck modified rdesktop/iso.c modified rdesktop/proto.h modified rdesktop/rdesktop.h modified rdesktop/rdp.c Very minor fixes modified rdesktop/tcp.c Use asynchronous I/O and alertable waits to allow aborting the protocol thread ASAP Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp trunk/reactos/base/applications/tsclient/rdesktop/iso.c trunk/reactos/base/applications/tsclient/rdesktop/proto.h trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h trunk/reactos/base/applications/tsclient/rdesktop/rdp.c trunk/reactos/base/applications/tsclient/rdesktop/tcp.c Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp (original) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp Mon Aug 21 01:02:10 2006 @@ -52,29 +52,53 @@ namespace { -LPSTR BstrToLpsz(BSTR bstr) -{ - int cch = WideCharToMultiByte(CP_ACP, 0, bstr, -1, NULL, 0, NULL, NULL); +void FreeLpsz(LPSTR lpsz) +{ + if(lpsz) + delete[] lpsz; +} + +LPSTR AllocLpsz(const CHAR * lpsz, size_t cb) +{ + LPSTR lpszNew = new CHAR[cb + 1]; + + if(lpszNew == NULL) + return NULL; + + CopyMemory(lpszNew, lpsz, cb); + lpszNew[cb] = 0; + + return lpszNew; +} + +LPSTR AllocLpsz(const WCHAR * lpwsz, int cchIn) +{ + int cch = WideCharToMultiByte(CP_ACP, 0, lpwsz, cchIn, NULL, 0, NULL, NULL); if(cch <= 0) return NULL; - LPSTR lpsz = new char[cch]; + LPSTR lpsz = new CHAR[cch]; if(lpsz == NULL) return NULL; - cch = WideCharToMultiByte(CP_ACP, 0, bstr, -1, lpsz, cch, NULL, NULL); + cch = WideCharToMultiByte(CP_ACP, 0, lpwsz, cchIn, lpsz, cch, NULL, NULL); if(cch <= 0) { - delete[] lpsz; + FreeLpsz(lpsz); return NULL; } return lpsz; } +LPSTR BstrToLpsz(BSTR bstr) +{ + return AllocLpsz(bstr, SysStringLen(bstr)); +} + BSTR LpszToBstr(LPSTR lpsz) { int cch = MultiByteToWideChar(CP_ACP, 0, lpsz, -1, NULL, 0); @@ -99,6 +123,168 @@ } } + +namespace +{ + +template<class T, class U> T aligndown(const T& X, const U& align) +{ + return X & ~(T(align) - 1); +} + +template<class T, class U> T alignup(const T& X, const U& align) +{ + return aligndown(X + (align - 1), align); +} + +/* Convert between bitmap formats */ +uint8 * win32_convert_scanlines(int width, int height, int bitcount, int fromalign, int toalign, const uint8 * data, uint8 ** buffer) +{ + // TBD: profile & optimize the most common cases + assert(width > 0); + assert(height); + assert(bitcount && bitcount <= 32); + assert(fromalign <= toalign); + assert(data); + assert(buffer); + + bool flipped = height < 0; + + if(flipped) + height = - height; + + int bytesperrow = alignup(width * bitcount, 8) / 8; + int fromstride = alignup(bytesperrow, fromalign); + int tostride = alignup(bytesperrow, toalign); + assert(fromstride <= tostride); + + int datasize = tostride * height; + + uint8 * dibits = new uint8[datasize]; + + const uint8 * src = data; + uint8 * dest = dibits; + + const int pad = tostride - fromstride; + + assert(pad < 4); + __assume(pad < 4); + + if(flipped) + { + dest += (height - 1) * tostride; + tostride = - tostride; + } + + for(int i = 0; i < height; ++ i) + { + memcpy(dest, src, fromstride); + memset(dest + fromstride, 0, pad); + src += fromstride; + dest += tostride; + } + + *buffer = dibits; + return dibits; +} + +/* Creates bitmaps */ +HBITMAP win32_create_dib(LONG width, LONG height, WORD bitcount, const BYTE * data) +{ + struct b_ + { + BITMAPINFO bmi; + RGBQUAD colormap[256 - ARRAYSIZE(RTL_FIELD_TYPE(BITMAPINFO, bmiColors))]; + } + b; + + b.bmi.bmiHeader.biSize = sizeof(b.bmi.bmiHeader); + b.bmi.bmiHeader.biWidth = width; + b.bmi.bmiHeader.biHeight = height; + b.bmi.bmiHeader.biPlanes = 1; + b.bmi.bmiHeader.biBitCount = bitcount; + b.bmi.bmiHeader.biCompression = BI_RGB; + b.bmi.bmiHeader.biSizeImage = 0; + b.bmi.bmiHeader.biXPelsPerMeter = 0; + b.bmi.bmiHeader.biYPelsPerMeter = 0; + + if(bitcount > 8) + { + b.bmi.bmiHeader.biClrUsed = 0; + b.bmi.bmiHeader.biClrImportant = 0; + } + else + { + b.bmi.bmiHeader.biClrUsed = 2 << bitcount; + b.bmi.bmiHeader.biClrImportant = 2 << bitcount; + + // TODO: palette + } + + // FIXME: beyond ugly + HDC hdc = CreateCompatibleDC(NULL); + + if(hdc == NULL) + return NULL; + + HBITMAP hbm = CreateDIBitmap(hdc, &b.bmi.bmiHeader, CBM_INIT, data, &b.bmi, DIB_RGB_COLORS); + + if(hbm == NULL) + error("CreateDIBitmap %dx%dx%d failed\n", width, height, bitcount); + + DeleteDC(hdc); + return hbm; +} + +/* Creates brushes */ +HBRUSH win32_create_brush(BRUSH * brush, COLORREF fgcolour) +{ + if(brush == NULL) + return (HBRUSH)GetStockObject(NULL_BRUSH); + + switch(brush->style) + { + case BS_SOLID: + case BS_NULL: + case BS_HATCHED: + case BS_PATTERN: + case BS_PATTERN8X8: + break; + + default: + return NULL; + } + + switch(brush->style) + { + case BS_SOLID: + return CreateSolidBrush(fgcolour); + + case BS_HATCHED: + return CreateHatchBrush(brush->pattern[0], fgcolour); + + case BS_NULL: + return (HBRUSH)GetStockObject(NULL_BRUSH); + + case BS_PATTERN: + case BS_PATTERN8X8: + { + uint16 pattern[8]; + + for(size_t i = 0; i < 8; ++ i) + pattern[i] = brush->pattern[i]; + + HBITMAP hpattern = CreateBitmap(8, 8, 1, 1, pattern); + HBRUSH hbr = CreatePatternBrush(hpattern); + DeleteObject(hpattern); + return hbr; + } + + DEFAULT_UNREACHABLE; + } +} +}; + /* "sealed" can improve optimizations by asserting a class cannot be derived from, optimizing out accesses to the v-table from inside the class @@ -109,9 +295,952 @@ #define SEALED_ #endif + +/* Class that implements the RDP client GUI */ +class RdpClientUI +{ +public: + // TODO: pass the client settings relevant to the GUI here + HRESULT Initialize(HWND hwndParent) + { + // TODO: create the various windows + // TODO: create display window thread + // TODO: create input thread + return E_FAIL; + } + +public: + static BOOL Startup() + { + WNDCLASSEX wcexUI = { sizeof(wcexUI) }; + WNDCLASSEX wcexConsole = { sizeof(wcexConsole) }; + WNDCLASSEX wcexDisplay = { sizeof(wcexDisplay) }; + WNDCLASSEX wcexInput = { sizeof(wcexInput) }; + + HBRUSH nullBrush = (HBRUSH)GetStockObject(HOLLOW_BRUSH); + + wcexUI.lpfnWndProc = NULL; // TODO + wcexUI.hInstance = GetCurrentModule(); + wcexUI.hCursor = LoadCursor(NULL, IDC_ARROW); + wcexUI.hbrBackground = nullBrush; + wcexUI.lpszClassName = TEXT("MissTosca_UI"); + + wcexConsole.style = CS_VREDRAW | CS_HREDRAW; + wcexConsole.lpfnWndProc = NULL; // TODO + wcexConsole.hInstance = GetCurrentModule(); + wcexConsole.hCursor = LoadCursor(NULL, IDC_ARROW); + wcexConsole.hbrBackground = nullBrush; + wcexConsole.lpszClassName = TEXT("MissTosca_Console"); + + wcexDisplay.style = CS_VREDRAW | CS_HREDRAW; + wcexDisplay.lpfnWndProc = NULL; // TODO + wcexDisplay.hInstance = GetCurrentModule(); + wcexDisplay.hCursor = LoadCursor(NULL, IDC_ARROW); + wcexDisplay.hbrBackground = nullBrush; + wcexDisplay.lpszClassName = TEXT("MissTosca_Display"); + + wcexInput.style = CS_VREDRAW | CS_HREDRAW; + wcexInput.lpfnWndProc = NULL; // TODO + wcexInput.hInstance = GetCurrentModule(); + wcexInput.hCursor = NULL; + wcexInput.hbrBackground = nullBrush; + wcexInput.lpszClassName = TEXT("MissTosca_Input"); + + return + RegisterClassEx(&wcexUI) && + RegisterClassEx(&wcexConsole) && + RegisterClassEx(&wcexDisplay) && + RegisterClassEx(&wcexInput); + } + + static void Shutdown() + { + // TODO + } + + /* + This is the main UI window. It's the direct child of the control + window, it fills its whole extent and it contains the scrollbars. + When activated, it will move keyboard focus to the input window + */ +private: + HWND m_uiWindow; + LONG m_scrollHPos; + LONG m_scrollVPos; + + LRESULT UIWindowProc(UINT uMsg, WPARAM wParam, LPARAM lParam) + { + switch(uMsg) + { + // Keep the keyboard focus on the input window + case WM_ACTIVATE: + switch(LOWORD(wParam)) + { + case WA_INACTIVE: + break; + + case WA_ACTIVE: + case WA_CLICKACTIVE: + if(!HIWORD(wParam)) + SetFocus(m_inputWindow); + } + + return 0; + + // Resized: rearrange children windows, adjust scrollbars + case WM_SIZE: + { + if(IsIconic(m_uiWindow)) + break; + + RECT rcClient; + GetWindowRect(m_uiWindow, &rcClient); + + if(m_smartSizing) + { + // we are not supposed to maintain aspect ratio. Container has to do that + m_consoleX = 0; + m_consoleY = 0; + m_consoleWidth = rcClient.right; + m_consoleHeight = rcClient.bottom; + } + else + { + // center horizontally, no horizontal scrollbar + if(rcClient.right >= m_consoleWidth) + m_consoleX = (m_consoleWidth - rcClient.right) / 2; + + // center vertically, no vertical scrollbar + if(rcClient.bottom >= m_consoleHeight) + m_consoleY = (m_consoleHeight - rcClient.right) / 2; + } + + SCROLLINFO scroll = { sizeof(scroll), SIF_ALL, 0 }; + + // update the horizontal scrollbar + scroll.nMax = m_consoleWidth; + scroll.nPage = rcClient.right; + scroll.nPos = 0 - m_consoleX; + SetScrollInfo(m_uiWindow, SB_HORZ, &scroll, TRUE); + + // update the vertical scrollbar + scroll.nMax = m_consoleHeight; + scroll.nPage = rcClient.bottom; + scroll.nPos = 0 - m_consoleY; + SetScrollInfo(m_uiWindow, SB_VERT, &scroll, TRUE); + + // move/resize the console window + MoveWindow(m_consoleWindow, m_consoleX, m_consoleY, m_consoleWidth, m_consoleHeight, TRUE); + } + + return 0; + + case WM_HSCROLL: + { + SCROLLINFO scroll = { sizeof(scroll), SIF_TRACKPOS }; + GetScrollInfo(m_uiWindow, SB_HORZ, &scroll); + m_consoleX = - scroll.nTrackPos; + MoveWindow(m_consoleWindow, m_consoleX, m_consoleY, m_consoleWidth, m_consoleHeight, TRUE); + } + + return 0; + + case WM_VSCROLL: + { + SCROLLINFO scroll = { sizeof(scroll), SIF_TRACKPOS }; + GetScrollInfo(m_uiWindow, SB_VERT, &scroll); + m_consoleY = - scroll.nTrackPos; + MoveWindow(m_consoleWindow, m_consoleX, m_consoleY, m_consoleWidth, m_consoleHeight, TRUE); + } + + return 0; + + default: + break; + } + + return DefWindowProc(m_uiWindow, uMsg, wParam, lParam); + } + + /* + This is the full-screen title bar. It's displayed at the top of the + main UI window while in full-screen mode, and it contains two toolbars + with the pin, minimize, restore and close buttons + */ + HWND m_fullScreenBarWindow; + + /* + This is the console window. It has the same extent as the display on + the remote computer, or it fills the UI window in smart resizing mode, + and it contains the input and display windows + */ +private: + HWND m_consoleWindow; + LONG m_consoleX; + LONG m_consoleY; + LONG m_consoleWidth; + LONG m_consoleHeight; + bool m_smartSizing; + + LRESULT ConsoleWindowProc(UINT uMsg, WPARAM wParam, LPARAM lParam) + { + switch(uMsg) + { + case WM_SIZE: + { + RECT rcClient; + GetClientRect(m_consoleWindow, &rcClient); + + MoveWindow(m_inputWindow, 0, 0, rcClient.right, rcClient.bottom, TRUE); + MoveWindow(m_displayWindow, 0, 0, rcClient.right, rcClient.bottom, TRUE); + } + + return 0; + + default: + break; + } + + return DefWindowProc(m_consoleWindow, uMsg, wParam, lParam); + } + + /* + This is the display window. It represents the virtual display of the + remote computer. It completely fills its parent, the console window, + and it runs in its own thread for performance reasons + */ +private: + HWND m_displayWindow; + LONG m_displayBufferWidth; + LONG m_displayBufferHeight; + HDC m_displayBuffer; + void * m_displayBufferRaw; + int m_displayBufferSave; + int m_displayBufferBitDepth; + int m_displayBufferByteDepth; + int m_displayBufferStride; + RECT m_displayBufferClip; + CRITICAL_SECTION m_displayBufferMutex; + + LRESULT DisplayWindowProc(UINT uMsg, WPARAM wParam, LPARAM lParam) + { + switch(uMsg) + { + case WM_DESTROY: + PostQuitMessage(0); + return 0; + + case WM_PRINTCLIENT: + if(wParam == 0) + break; + + case WM_PAINT: + { + HDC hdc = (HDC)wParam; + + EnterCriticalSection(&m_displayBufferMutex); + + if(hdc) + { + RECT rc; + GetClientRect(m_displayWindow, &rc); + BitBlt(hdc, 0, 0, rc.right, rc.bottom, m_displayBuffer, 0, 0, SRCCOPY); + } + else + { + PAINTSTRUCT ps; + hdc = BeginPaint(m_displayWindow, &ps); + + if(!m_smartSizing) + { + BitBlt + ( + hdc, + ps.rcPaint.left, + ps.rcPaint.top, + ps.rcPaint.right - ps.rcPaint.left, + ps.rcPaint.bottom - ps.rcPaint.top, + m_displayBuffer, + ps.rcPaint.left, + ps.rcPaint.top, + SRCCOPY + ); + } + else + { + // bleh. There has to be a better way + SetStretchBltMode(hdc, HALFTONE); + + StretchBlt + ( + hdc, + 0, + 0, + m_consoleWidth, + m_consoleHeight, + m_displayBuffer, + 0, + 0, + m_displayBufferWidth, + m_displayBufferHeight, + SRCCOPY + ); + } + + EndPaint(m_displayWindow, &ps); + } + + LeaveCriticalSection(&m_displayBufferMutex); + } + + return 0; + + default: + break; + } + + return DefWindowProc(m_displayWindow, uMsg, wParam, lParam); + } + + /* Screen repainting */ + void Display_RepaintRect(const RECT * lprc) + { + if(m_smartSizing) + return Display_RepaintAll(); + + RECT rcDamage; + IntersectRect(&rcDamage, lprc, &m_displayBufferClip); + InvalidateRect(m_displayWindow, &rcDamage, FALSE); + } + + void Display_RepaintArea(int x, int y, int cx, int cy) + { + if(m_smartSizing) + return Display_RepaintAll(); + + RECT rcDamage; + rcDamage.left = x; + rcDamage.top = y; + rcDamage.right = x + cx; + rcDamage.bottom = y + cy; + Display_RepaintRect(&rcDamage); + } + + void Display_RepaintPolygon(POINT * point, int npoints, int linewidth) + { + if(m_smartSizing) + return Display_RepaintAll(); + + RECT rcDamage; + + rcDamage.left = MAXLONG; + rcDamage.top = MAXLONG; + rcDamage.right = 0; + rcDamage.bottom = 0; + + for(int i = 0; i < npoints; ++ i) + { + if(point[i].x < rcDamage.left) + rcDamage.left = point[i].x; + + if(point[i].y < rcDamage.top) + rcDamage.top = point[i].y; + + if(point[i].x > rcDamage.right) + rcDamage.right = point[i].x; + + if(point[i].y > rcDamage.bottom) + rcDamage.bottom = point[i].y; + } + + InflateRect(&rcDamage, linewidth, linewidth); + Display_RepaintRect(&rcDamage); + } + + void Display_RepaintAll() + { + InvalidateRgn(m_displayWindow, NULL, FALSE); + } + +public: + void Display_SetClip(int x, int y, int cx, int cy) + { + m_displayBufferClip.left = x; + m_displayBufferClip.top = y; + m_displayBufferClip.right = x + cx + 1; + m_displayBufferClip.bottom = y + cy + 1; + + HRGN hrgn = CreateRectRgnIndirect(&m_displayBufferClip); + SelectClipRgn(m_displayBuffer, hrgn); + DeleteObject(hrgn); + } + + void Display_ResetClip() + { + m_displayBufferClip.left = 0; + m_displayBufferClip.top = 0; + m_displayBufferClip.right = m_displayBufferWidth; + m_displayBufferClip.bottom = m_displayBufferHeight; + SelectClipRgn(m_displayBuffer, NULL); + } + + void Display_PaintBitmap(int x, int y, int cx, int cy, int width, int height, uint8 * data) + { + GdiFlush(); + + int fromstride = alignup(width * m_displayBufferByteDepth, 4); + int sizex = cx * m_displayBufferByteDepth; + + const uint8 * src = data; + + uint8 * dst = + (uint8 *)m_displayBufferRaw + + (m_displayBufferHeight - y - cy) * m_displayBufferStride + + x * m_displayBufferByteDepth; + + for(int i = 0; i < cy; ++ i) + { + memcpy(dst, src, sizex); + src += fromstride; + dst += m_displayBufferStride; + } + + Display_RepaintArea(x, y, cx, cy); + } + + void Display_DestBlt(uint8 opcode, int x, int y, int cx, int cy) + { + int dcsave = SaveDC(m_displayBuffer); + SelectObject(m_displayBuffer, GetStockObject(BLACK_BRUSH)); + PatBlt(m_displayBuffer, x, y, cx, cy, MAKELONG(0, opcode)); + RestoreDC(m_displayBuffer, dcsave); + Display_RepaintArea(x, y, cx, cy); + } + + void Display_PatBlt(uint8 opcode, int x, int y, int cx, int cy, BRUSH * brush, int bgcolour, int fgcolour) + { + HBRUSH hbr = win32_create_brush(brush, fgcolour); + + int dcsave = SaveDC(m_displayBuffer); + + SetBkColor(m_displayBuffer, bgcolour); + SetTextColor(m_displayBuffer, fgcolour); + SetBrushOrgEx(m_displayBuffer, brush->xorigin, brush->yorigin, NULL); + SelectObject(m_displayBuffer, hbr); + + PatBlt(m_displayBuffer, x, y, cx, cy, MAKELONG(0, opcode)); + + RestoreDC(m_displayBuffer, dcsave); + + DeleteObject(hbr); + + Display_RepaintArea(x, y, cx, cy); + } + + void Display_ScreenBlt(uint8 opcode, int x, int y, int cx, int cy, int srcx, int srcy) + { + BitBlt(m_displayBuffer, x, y, cx, cy, m_displayBuffer, srcx, srcy, MAKELONG(0, opcode)); + Display_RepaintArea(x, y, cx, cy); + } + + void Display_MemBlt(uint8 opcode, int x, int y, int cx, int cy, HBITMAP src, int srcx, int srcy) + { + HDC hdcSrc = CreateCompatibleDC(m_displayBuffer); + HGDIOBJ hOld = SelectObject(hdcSrc, src); + + BitBlt(m_displayBuffer, x, y, cx, cy, hdcSrc, srcx, srcy, MAKELONG(0, opcode)); + + SelectObject(hdcSrc, hOld); + DeleteDC(hdcSrc); + + Display_RepaintArea(x, y, cx, cy); + } + + void Display_TriBlt(uint8 opcode, int x, int y, int cx, int cy, HBITMAP src, int srcx, int srcy, BRUSH * brush, int bgcolour, int fgcolour) + { + // TODO + HDC hdcSrc = CreateCompatibleDC(m_displayBuffer); + HGDIOBJ hOld = SelectObject(hdcSrc, src); + + //SELECT_BRUSH(brush, bgcolour, fgcolour); + + BitBlt(m_displayBuffer, x, y, cx, cy, hdcSrc, srcx, srcy, MAKELONG(0, opcode)); + + //RESET_BRUSH(); + + SelectObject(hdcSrc, hOld); + DeleteDC(hdcSrc); + + Display_RepaintArea(x, y, cx, cy); + } + + void Display_Line(uint8 opcode, int startx, int starty, int endx, int endy, PEN * pen) + { + HPEN hpen = CreatePen(pen->style, pen->width, pen->colour); + + int dcsave = SaveDC(m_displayBuffer); + + SetROP2(m_displayBuffer, opcode); + SelectObject(m_displayBuffer, hpen); + MoveToEx(m_displayBuffer, startx, starty, NULL); + + LineTo(m_displayBuffer, endx, endy); + + RestoreDC(m_displayBuffer, dcsave); + + DeleteObject(hpen); + + RECT rcDamage; + + if(startx < endx) + { + rcDamage.left = startx; + rcDamage.right = endx; + } + else + { + rcDamage.left = endx; + rcDamage.right = startx; + } + + if(starty < endy) + { + rcDamage.top = starty; + rcDamage.bottom = endy; + } + else + { + rcDamage.top = endy; + rcDamage.bottom = starty; + } + + InflateRect(&rcDamage, pen->width, pen->width); + Display_RepaintRect(&rcDamage); + } + + void Display_Rect(int x, int y, int cx, int cy, int colour) + { + HBRUSH hbr = CreateSolidBrush(colour); + + int dcsave = SaveDC(m_displayBuffer); + + SelectObject(m_displayBuffer, hbr); + SelectObject(m_displayBuffer, GetStockObject(NULL_PEN)); + + Rectangle(m_displayBuffer, x, y, x + cx + 1, y + cy + 1); + + RestoreDC(m_displayBuffer, dcsave); + + DeleteObject(hbr); + + Display_RepaintArea(x, y, cx, cy); + } + + void Display_Polygon(uint8 opcode, uint8 fillmode, POINT * point, int npoints, BRUSH * brush, int bgcolour, int fgcolour) + { + HBRUSH hbr = win32_create_brush(brush, fgcolour); + + int dcsave = SaveDC(m_displayBuffer); + + SetBkColor(m_displayBuffer, bgcolour); + SetTextColor(m_displayBuffer, fgcolour); + SetPolyFillMode(m_displayBuffer, fillmode); + SelectObject(m_displayBuffer, hbr); + + Polygon(m_displayBuffer, point, npoints); + + RestoreDC(m_displayBuffer, dcsave); + + Display_RepaintPolygon(point, npoints, 0); + } + + void Display_Polyline(uint8 opcode, POINT * points, int npoints, PEN * pen) + { + POINT last = points[0]; + + for(int i = 1; i < npoints; ++ i) + { + points[i].x += last.x; + points[i].y += last.y; + last = points[i]; + } + + HPEN hpen = CreatePen(pen->style, pen->width, pen->colour); + + int dcsave = SaveDC(m_displayBuffer); + + SetROP2(m_displayBuffer, opcode); + SelectObject(m_displayBuffer, hpen); + + Polyline(m_displayBuffer, points, npoints); + + RestoreDC(m_displayBuffer, dcsave); + + DeleteObject(hpen); + + Display_RepaintPolygon(points, npoints, pen->width); + } + + void Display_Ellypse(uint8 opcode, uint8 fillmode, int x, int y, int cx, int cy, BRUSH * brush, int bgcolour, int fgcolour) + { + // TODO + + Display_RepaintArea(x, y, cx, cy); + } + + // TBD: optimize text drawing + void Display_DrawGlyph(int mixmode, int x, int y, int cx, int cy, HGLYPH glyph, int srcx, int srcy, int bgcolour, int fgcolour) + { + HBITMAP hbmGlyph = (HBITMAP)glyph; + HDC hdcGlyph = CreateCompatibleDC(m_displayBuffer); + HGDIOBJ hOld = SelectObject(hdcGlyph, hbmGlyph); + + int dcsave = SaveDC(m_displayBuffer); + + switch(mixmode) + { + case MIX_TRANSPARENT: + { + /* + ROP is DSPDxax: + - where the glyph (S) is white, D is set to the foreground color (P) + - where the glyph (S) is black, D is left untouched + + This paints a transparent glyph in the specified color + */ + HBRUSH hbr = CreateSolidBrush(fgcolour); + SelectObject(m_displayBuffer, hbr); + BitBlt(m_displayBuffer, x, y, cx, cy, hdcGlyph, srcx, srcy, MAKELONG(0, 0xe2)); + DeleteObject(hbr); + } + + break; + + case MIX_OPAQUE: + { + /* Curiously, glyphs are inverted (white-on-black) */ + SetBkColor(m_displayBuffer, fgcolour); + SetTextColor(m_displayBuffer, bgcolour); + BitBlt(m_displayBuffer, x, y, cx, cy, hdcGlyph, srcx, srcy, SRCCOPY); + } + + break; + } + + RestoreDC(m_displayBuffer, dcsave); + + SelectObject(hdcGlyph, hOld); + DeleteDC(hdcGlyph); + + Display_RepaintArea(x, y, cx, cy); + } + + void Display_DoGlyph(uint8 font, uint8 flags, int mixmode, int& x, int& y, int bgcolour, int fgcolour, const uint8 * ttext, int& idx) + { + FONTGLYPH * glyph; + + glyph = cache_get_font(/*This*/NULL, font, ttext[idx]); + + if(!(flags & TEXT2_IMPLICIT_X)) + { + int xyoffset = ttext[++ idx]; + + if((xyoffset & 0x80)) + { + if (flags & TEXT2_VERTICAL) + y += ttext[idx + 1] | (ttext[idx + 2] << 8); + else + x += ttext[idx + 1] | (ttext[idx + 2] << 8); + + idx += 2; + } + else + { + if (flags & TEXT2_VERTICAL) + y += xyoffset; + else + x += xyoffset; + } + } + + if(glyph) + { + Display_DrawGlyph + ( + mixmode, + x + (short)glyph->offset, + y + (short)glyph->baseline, + glyph->width, + glyph->height, + glyph->pixmap, + 0, + 0, + bgcolour, + fgcolour + ); + + if(flags & TEXT2_IMPLICIT_X) + x += glyph->width; + } + } + + void Display_DrawText + ( + uint8 font, + uint8 flags, + uint8 opcode, + int mixmode, + int x, + int y, + int clipx, + int clipy, + int clipcx, + int clipcy, + int boxx, + int boxy, + int boxcx, + int boxcy, + BRUSH * brush, + int bgcolour, + int fgcolour, + uint8 * text, + uint8 length + ) + { + int i, j; + DATABLOB *entry; + + HBRUSH hbr = CreateSolidBrush(bgcolour); + HGDIOBJ holdbrush = SelectObject(m_displayBuffer, hbr); + HGDIOBJ holdpen = SelectObject(m_displayBuffer, GetStockObject(NULL_PEN)); + + if (boxcx > 1) + Rectangle(m_displayBuffer, boxx, boxy, boxx + boxcx + 1, boxy + boxcy + 1); + else if (mixmode == MIX_OPAQUE) + Rectangle(m_displayBuffer, clipx, clipy, clipx + clipcx + 1, clipy + clipcy + 1); + + SelectObject(m_displayBuffer, holdpen); + SelectObject(m_displayBuffer, holdbrush); + + DeleteObject(hbr); + + if(boxcx > 1) + Display_RepaintArea(boxx, boxy, boxcx, boxcy); + else + Display_RepaintArea(clipx, clipy, clipcx, clipcy); + + /* Paint text, character by character */ + for (i = 0; i < length;) + { + switch (text[i]) + { + case 0xff: + /* At least two bytes needs to follow */ + if (i + 3 > length) + { + warning("Skipping short 0xff command:"); + for (j = 0; j < length; j++) + fprintf(stderr, "%02x ", text[j]); + fprintf(stderr, "\n"); + i = length = 0; + break; + } + cache_put_text(NULL /* TODO */, text[i + 1], text, text[i + 2]); + i += 3; + length -= i; + /* this will move pointer from start to first character after FF command */ + text = &(text[i]); + i = 0; + break; + + case 0xfe: + /* At least one byte needs to follow */ + if (i + 2 > length) + { + warning("Skipping short 0xfe command:"); + for (j = 0; j < length; j++) + fprintf(stderr, "%02x ", text[j]); + fprintf(stderr, "\n"); + i = length = 0; + break; + } + entry = cache_get_text(/*This*/NULL, text[i + 1]); + if (entry->data != NULL) + { + if ((((uint8 *) (entry->data))[1] == 0) + && (!(flags & TEXT2_IMPLICIT_X)) && (i + 2 < length)) + { + if (flags & TEXT2_VERTICAL) + y += text[i + 2]; + else + x += text[i + 2]; + } + for (j = 0; j < entry->size; j++) + Display_DoGlyph(font, flags, mixmode, x, y, bgcolour, fgcolour, ((uint8 *) (entry->data)), j); + } + if (i + 2 < length) + i += 3; + else + i += 2; + length -= i; + /* this will move pointer from start to first character after FE command */ + text = &(text[i]); + i = 0; + break; + + default: + Display_DoGlyph(font, flags, mixmode, x, y, bgcolour, fgcolour, text, i); + i++; + break; + } + } + } + + void Display_SaveDesktop(uint32 offset, int x, int y, int cx, int cy) + { + GdiFlush(); + + uint8 * data = + (uint8 *)m_displayBufferRaw + + x * m_displayBufferByteDepth + + (m_displayBufferHeight - y - cy) * m_displayBufferStride; + + cache_put_desktop + ( + /*This*/NULL, + offset * m_displayBufferByteDepth, + cx, + cy, + m_displayBufferStride, + m_displayBufferByteDepth, + data + ); + } + + void Display_RestoreDesktop(uint32 offset, int x, int y, int cx, int cy) + { + int fromstride = cx * m_displayBufferByteDepth; + + const uint8 * src = cache_get_desktop(/*This*/NULL, offset, cx, cy, m_displayBufferByteDepth); + + uint8 * dst = + (uint8 *)m_displayBufferRaw + + x * m_displayBufferByteDepth + + (m_displayBufferHeight - y - cy) * m_displayBufferStride; + + GdiFlush(); + + for(int i = 0; i < cy; ++ i) + { + memcpy(dst, src, fromstride); + src += fromstride; + dst += m_displayBufferStride; + } + + Display_RepaintArea(x, y, cx, cy); + } + + + void Display_BeginUpdate() + { + EnterCriticalSection(&m_displayBufferMutex); + m_displayBufferSave = SaveDC(m_displayBuffer); + } + + void Display_EndUpdate() + { + RestoreDC(m_displayBuffer, m_displayBufferSave); + LeaveCriticalSection(&m_displayBufferMutex); + } + + /* + This is the input window. It receives the keyboard and mouse input from + the user, and it's the only window that can receive the keyboard focus. + It completely fills its parent, the console window, and it runs in its + own thread for performance reasons and because of technical reasons + involving keyboard hooks in full-screen mode + */ + HWND m_inputWindow; + HCURSOR m_inputCursor; + + LRESULT InputWindowProc(UINT uMsg, WPARAM wParam, LPARAM lParam) + { + switch(uMsg) + { + case WM_DESTROY: + PostQuitMessage(0); + return 0; + + /* Keyboard stuff */ + // TODO: we need a good way to post output cross-thread + case WM_SYSKEYDOWN: + case WM_KEYDOWN: + //rdp_send_input(This, GetMessageTime(), RDP_INPUT_SCANCODE, RDP_KEYPRESS | (lparam & 0x1000000 ? KBD_FLAG_EXT : 0), LOBYTE(HIWORD(lparam)), 0); + break; + + case WM_SYSKEYUP: + case WM_KEYUP: + //rdp_send_input(This, GetMessageTime(), RDP_INPUT_SCANCODE, RDP_KEYRELEASE | (lparam & 0x1000000 ? KBD_FLAG_EXT : 0), LOBYTE(HIWORD(lparam)), 0); + break; + + /* Mouse stuff */ + // Cursor shape + case WM_SETCURSOR: + if(LOWORD(lParam) == HTCLIENT) + { + SetCursor(m_inputCursor); + return TRUE; + } + + break; + + // Movement + case WM_MOUSEMOVE: + //rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_MOVE, LOWORD(lparam), HIWORD(lparam)); + break; + + // Buttons + // TODO: X buttons + case WM_LBUTTONDOWN: + //rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON1 | MOUSE_FLAG_DOWN, LOWORD(lparam), HIWORD(lparam)); + break; + + case WM_RBUTTONDOWN: + //rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON2 | MOUSE_FLAG_DOWN, LOWORD(lparam), HIWORD(lparam)); + break; + + case WM_MBUTTONDOWN: + //rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON3 | MOUSE_FLAG_DOWN, LOWORD(lparam), HIWORD(lparam)); + break; + + case WM_LBUTTONUP: + //rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON1, LOWORD(lparam), HIWORD(lparam)); + break; + + case WM_RBUTTONUP: + //rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON2, LOWORD(lparam), HIWORD(lparam)); + break; + + case WM_MBUTTONUP: + //rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON3, LOWORD(lparam), HIWORD(lparam)); + break; + + // Wheel + case WM_MOUSEWHEEL: + //mstsc_mousewheel(This, (SHORT)HIWORD(wparam), lparam); + break; + } + + return DefWindowProc(m_inputWindow, uMsg, wParam, lParam); + } + +public: +}; + #pragma warning(push) #pragma warning(disable: 4584) +/* The ActiveX control */ class RdpClient SEALED_: /* COM basics */ public IUnknown, @@ -137,7 +1266,7 @@ public IViewObject2, // NOTE: the original has a vestigial, non-functional implementation of this, which we omit - // public ISpecifyPropertyPages, + // ISpecifyPropertyPages // Hidden interfaces, not available through QueryInterface public IConnectionPoint, @@ -145,6 +1274,10 @@ /* RDP client interface */ public MSTSCLib::IMsRdpClient4, public MSTSCLib::IMsRdpClientNonScriptable2 + + // NOTE: implemented by inner classes due to requiring distinct IDispatch implementations + // IMsRdpClientAdvancedSettings4 + // IMsRdpClientSecuredSettings { private: /* An endless amount of COM glue */ @@ -224,8 +1357,13 @@ } /* Glue to interface to rdesktop-core */ + RdpClientUI * m_clientUI; RDPCLIENT m_protocolState; HANDLE m_protocolThread; + HANDLE m_protocolThreadWaitingReconnection; + bool m_reconnectAborted; + bool m_actuallyConnected; + bool m_loggedIn; /* Properties */ // Storage fields @@ -250,8 +1388,6 @@ long m_DesktopWidth; long m_DesktopHeight; long m_StartConnected; - long m_HorizontalScrollBarVisible; - long m_VerticalScrollBarVisible; long m_ColorDepth; long m_KeyboardHookMode; long m_AudioRedirectionMode; @@ -378,6 +1514,16 @@ return S_OK; } + HRESULT ReplaceProperty(BSTR& prop, BSTR newValue) + { + assert(InsideApartment()); + assert((prop == NULL && newValue == NULL) || prop != newValue); + + SysFreeString(prop); + prop = newValue; + return S_OK; + } + HRESULT SetProperty(LPSTR& prop, BSTR newValue) { assert(InsideApartment()); @@ -397,6 +1543,18 @@ else prop = NULL; + return S_OK; + } + + HRESULT ReplaceProperty(LPSTR& prop, LPSTR newValue) + { + assert(InsideApartment()); + assert((prop == NULL && newValue == NULL) || prop != newValue); + + if(prop) + delete[] prop; + + prop = newValue; return S_OK; } @@ -535,19 +1693,46 @@ AsyncEventCallback callback; }; + struct RedirectArguments + { + uint32 flags; + uint32 server_len; + wchar_t * server; + uint32 cookie_len; + char * cookie; + uint32 username_len; + wchar_t * username; + uint32 domain_len; + wchar_t * domain; + uint32 password_len; + wchar_t * password; + }; + enum { RDPC_WM_ = WM_USER, RDPC_WM_SYNC_EVENT, RDPC_WM_ASYNC_EVENT, RDPC_WM_DISCONNECT, + RDPC_WM_REQUEST_CLOSE, + RDPC_WM_REDIRECT, }; + static VOID CALLBACK DisconnectAPC(ULONG_PTR) + { + // no need to do anything. The interruption will be enough + } + bool HandleEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result) { + result = 0; + switch(uMsg) { + /* Regular event to be dispatched to the container's sink */ case RDPC_WM_SYNC_EVENT: + assert(InSendMessage()); + case RDPC_WM_ASYNC_EVENT: { const EventArguments * eventArgs = reinterpret_cast<EventArguments *>(lParam); @@ -568,26 +1753,122 @@ break; + /* The protocol thread is about to die: prepare for disconnection */ case RDPC_WM_DISCONNECT: { assert(m_Connected); - - VARIANTARG arg = { }; - - arg.vt = VT_I4; - arg.lVal = static_cast<long>(wParam); - - FireEventInsideApartment(4, &arg, 1); - - if(m_protocolThread) + assert(InsideApartment()); + assert(InSendMessage()); + + // Unblock the protocol thread and wait for it to terminate + ReplyMessage(0); + JoinProtocolThread(); + + // Finish disconnecting + PerformDisconnect(static_cast<long>(wParam)); + } + + break; + + case RDPC_WM_REDIRECT: + { + assert(InSendMessage()); + assert(lParam); + assert(m_Connected); + assert(m_protocolState.redirect); + + RedirectArguments * redirectArgs = reinterpret_cast<RedirectArguments *>(lParam); + + // BUGBUG: this is extremely messy and more prone to out-of-memory than it should be + LPSTR lpszNewServer = NULL; + LPSTR lpszNewCookie = NULL; + BSTR strNewUsername = NULL; + BSTR strNewDomain = NULL; + BSTR strNewPassword = NULL; + HRESULT hr = S_OK; + + for(;;) { - WaitForSingleObject(m_protocolThread, INFINITE); - CloseHandle(m_protocolThread); + // Allocate the new properties + hr = E_OUTOFMEMORY; + + // FIXME: convert the hostname to Punycode, not the ANSI codepage + lpszNewServer = AllocLpsz(redirectArgs->server, redirectArgs->server_len / sizeof(OLECHAR)); + + if(lpszNewServer == NULL && redirectArgs->server_len) + break; + + lpszNewCookie = AllocLpsz(redirectArgs->cookie, redirectArgs->cookie_len); + + if(lpszNewCookie == NULL && redirectArgs->cookie_len) + break; + + strNewUsername = SysAllocStringLen(redirectArgs->username, redirectArgs->username_len / sizeof(OLECHAR)); + + if(strNewUsername == NULL && redirectArgs->username_len) + break; + + strNewDomain = SysAllocStringLen(redirectArgs->domain, redirectArgs->domain_len / sizeof(OLECHAR)); + + if(strNewDomain == NULL && redirectArgs->domain_len) + break; + + strNewPassword = SysAllocStringLen(redirectArgs->password, redirectArgs->password_len / sizeof(OLECHAR)); + + if(strNewPassword == NULL && redirectArgs->password_len) + break; + + hr = S_OK; + break; } - // TODO: do other disconnection work here... - - m_Connected = false; + // Success + if(SUCCEEDED(hr)) + { + // set the new properties + ReplaceProperty(m_Server, lpszNewServer); + ReplaceProperty(m_LoadBalanceInfo, lpszNewCookie); + ReplaceProperty(m_UserName, strNewUsername); + ReplaceProperty(m_Domain, strNewDomain); + ReplaceProperty(m_ClearTextPassword, strNewPassword); + } + // Failure + else + { + // free the buffers + FreeLpsz(lpszNewServer); + FreeLpsz(lpszNewCookie); + SysFreeString(strNewUsername); + SysFreeString(strNewDomain); + SysFreeString(strNewPassword); + + // signal the error + m_protocolState.disconnect_reason = 262; + m_protocolState.redirect = False; + result = -1; + } + } + + break; + + // BUGBUG: this could potentially disconnect an unrelated connection established later... + case RDPC_WM_REQUEST_CLOSE: + { + assert(!InSendMessage()); + + if(m_Connected) + { + // Ask confirmation to the container in case we are logged in + if(m_loggedIn && !FireConfirmClose()) + break; + + // For reentrancy (OnConfirmClose could deviously call Disconnect) + if(m_protocolThread == NULL) + break; + + // Terminate the protocol thread. It will fire the Disconnected event on exit + TerminateProtocolThread(); + } } break; @@ -595,6 +1876,10 @@ default: return false; } + + // If the calling thread is blocked, unblock it ASAP + if(InSendMessage()) + ReplyMessage(result); return true; } @@ -666,8 +1951,8 @@ void FireDisconnected(long reason) { - // Source: control or protocol. Special handling - SendNotifyMessage(m_controlWindow, RDPC_WM_DISCONNECT, reason, 0); + // Source: protocol. Special handling + SendMessage(m_controlWindow, RDPC_WM_DISCONNECT, reason, 0); } void FireEnterFullScreenMode() @@ -744,6 +2029,17 @@ FireEventOutsideApartment(10, &arg, 1); } + void FireFatalErrorFromApartment(long errorCode) + { + VARIANTARG arg = { }; + + arg.vt = VT_I4; + arg.lVal = errorCode; + + // Source: control + FireEventInsideApartment(10, &arg, 1); + } + void FireWarning(long warningCode) { VARIANTARG arg = { }; @@ -789,14 +2085,19 @@ retval.vt = VT_BYREF | VT_BOOL; retval.pboolVal = &allowClose; - // Source: ??? // BUGBUG: fix this! - FireEventOutsideApartment(15, NULL, 0, &retval); + // Source: control + FireEventInsideApartment(15, NULL, 0, &retval); return allowClose != VARIANT_FALSE; } HRESULT FireReceivedTSPublicKey(void * publicKey, unsigned int publicKeyLength) { + assert(m_Connected); + + if(!m_NotifyTSPublicKey) + return S_OK; + BSTR bstrPublicKey = SysAllocStringByteLen(NULL, publicKeyLength); if(bstrPublicKey == NULL) @@ -979,8 +2280,6 @@ m_DesktopWidth(), m_DesktopHeight(), m_StartConnected(), - m_HorizontalScrollBarVisible(), - m_VerticalScrollBarVisible(), m_ColorDepth(16), m_KeyboardHookMode(2), m_AudioRedirectionMode(0), @@ -1054,7 +2353,17 @@ { assert(m_refCount == 0); - // TODO: if connected, disconnect + if(m_Connected) + { + // Terminate the protocol thread + TerminateProtocolThread(); + + // Dispatch the RDPC_WM_DISCONNECT message sent by the dying thread + MSG msg; + PeekMessage(&msg, m_controlWindow, 0, 0, PM_NOREMOVE); + + assert(!m_Connected); + } DestroyControlWindow(); @@ -1094,11 +2403,8 @@ SysFreeString(m_RdpdrClipCleanTempDirString); SysFreeString(m_RdpdrClipPasteInfoString); - if(m_LoadBalanceInfo) - delete[] m_LoadBalanceInfo; - - if(m_Server) - delete[] m_Server; + FreeLpsz(m_LoadBalanceInfo); + FreeLpsz(m_Server); unlockServer(); } @@ -1678,7 +2984,7 @@ virtual STDMETHODIMP IMsRdpClientAdvancedSettings::put_overallConnectionTimeout(long poverallConnectionTimeout) { - if(poverallConnectionTimeout >= 600) + if(poverallConnectionTimeout < 0 || poverallConnectionTimeout >= 600) return E_INVALIDARG; return Outer()->SetProperty(Outer()->m_overallConnectionTimeout, poverallConnectionTimeout); @@ -2315,6 +3621,11 @@ return CONTAINING_RECORD(innerThis, RdpClient, m_securedSettings); } + static RdpClient * InnerToOuter(RDPCLIENT * innerThis) + { + return CONTAINING_RECORD(innerThis, RdpClient, m_protocolState); + } + static const RdpClient * InnerToOuter(const RdpClientInner * innerThis) { return CONTAINING_RECORD(innerThis, RdpClient, m_inner); @@ -2330,24 +3641,142 @@ return CONTAINING_RECORD(innerThis, RdpClient, m_securedSettings); } + static const RdpClient * InnerToOuter(const RDPCLIENT * innerThis) + { + return CONTAINING_RECORD(innerThis, RdpClient, m_protocolState); + } + + RdpClientUI * GetUI() const + { + assert(m_clientUI); + return m_clientUI; + } + + /* Glue for rdesktop-core */ +public: + static bool OnPublicKey(RDPCLIENT * This, unsigned char * key, unsigned int key_size) + { + return InnerToOuter(This)->OnPublicKey(key, key_size); + } + + static void OnLogon(RDPCLIENT * This) + { + return InnerToOuter(This)->OnLogon(); + } + + static bool OnRedirect + ( + RDPCLIENT * This, + uint32 flags, + uint32 server_len, + wchar_t * server, + uint32 cookie_len, + char * cookie, + uint32 username_len, + wchar_t * username, + uint32 domain_len, + wchar_t * domain, + uint32 password_len, + wchar_t * password + ) + { + return InnerToOuter(This)->OnRedirect + ( + flags, + server_len, + server, + cookie_len, + cookie, + username_len, + username, + domain_len, + domain, + password_len, + password + ); + } + private: - /* Thread that hosts rdesktop-core */ + bool OnPublicKey(unsigned char * key, unsigned int key_size) + { + HRESULT hr = FireReceivedTSPublicKey(key, key_size); + + if(FAILED(hr)) + { + m_protocolState.disconnect_reason = 262; + return false; + } + + return hr == S_OK; + } + + void OnLogon() + { + m_loggedIn = true; + FireLoginComplete(); + } + + bool OnRedirect + ( + uint32 flags, + uint32 server_len, + wchar_t * server, + uint32 cookie_len, + char * cookie, + uint32 username_len, + wchar_t * username, + uint32 domain_len, + wchar_t * domain, + uint32 password_len, + wchar_t * password + ) + { + assert(m_Connected); + assert(!InsideApartment()); + assert(IsWindow(m_controlWindow)); + + RedirectArguments redirectArgs = + { + flags, + server_len, + server, + cookie_len, + cookie, + username_len, + username, + domain_len, + domain, + password_len, + password + }; + + return SendMessage(m_controlWindow, RDPC_WM_REDIRECT, 0, reinterpret_cast<LPARAM>(&redirectArgs)) == 0; + } + +private: static DWORD WINAPI ProtocolLoopThreadProc(LPVOID lpParam) { static_cast<RdpClient *>(lpParam)->ProtocolLoop(); return 0; } + static VOID CALLBACK ConnectionTimerAPC(LPVOID, DWORD, DWORD) + { + } + + // FIXME: various potential inconsistencies due to lack of detailed documentation of expected semantics void ProtocolLoop() { + HANDLE waitingReconnection = NULL; + + // Retrieve the local hostname to be passed to the server WCHAR hostname[MAX_COMPUTERNAME_LENGTH + 1]; DWORD hostnameLen = ARRAYSIZE(hostname); if(!GetComputerNameW(hostname, &hostnameLen)) hostname[0] = 0; - FireConnecting(); - + // Set some connection flags uint32 flags = RDP_LOGON_NORMAL; if(m_Compress) @@ -2358,6 +3787,27 @@ if(m_ClearTextPassword) flags |= RDP_LOGON_AUTO; + + // Notify the container that the connection process is beginning now + FireConnecting(); + + // Set the overall connection timer, if a timeout is set + // BUGBUG: the timeout semantics are ambiguous and have been most probably misinterpreted + HANDLE overallConnectionTimer = NULL; + LARGE_INTEGER overallTimeout; + + if(m_overallConnectionTimeout) + { + overallTimeout.QuadPart = - ((m_overallConnectionTimeout * 1000 * 1000 * 1000) / 100); + + overallConnectionTimer = CreateWaitableTimer(NULL, FALSE, NULL); + + if(overallConnectionTimer == NULL) + goto l_Disconnect; + } + + if(overallConnectionTimer) + SetWaitableTimer(overallConnectionTimer, &overallTimeout, 0, ConnectionTimerAPC, NULL, FALSE); // Initial connection BOOL disconnected = rdp_connect @@ -2374,15 +3824,32 @@ m_LoadBalanceInfo ); - while(!disconnected) + if(overallConnectionTimer) + CancelWaitableTimer(overallConnectionTimer); + + if(disconnected) + goto l_Disconnect; + + // TODO: set the disconnect reason for every instance in which we abort the loop + for(;;) { BOOL deactivated = False; uint32 extendedDisconnectReason = 0; - // The main protocol loop + m_actuallyConnected = true; + + // Notify the container of the successful connection + FireConnected(); + + // Main protocol loop + m_loggedIn = false; rdp_main_loop(&m_protocolState, &deactivated, &extendedDisconnectReason); + rdp_disconnect(&m_protocolState); + + m_actuallyConnected = false; // Redirection + // BUGBUG: redirection is very messy and probably this implementation is not "canonical" if(m_protocolState.redirect) { m_protocolState.redirect = False; @@ -2420,15 +3887,34 @@ // do not reconnect if(reconnectMode == MSTSCLib::autoReconnectContinueStop) - { - disconnected = True; - break; - } - - // the container will reconnect manually with Connect or abort with Disconnect + goto l_Disconnect; + + // the container will reconnect or abort manually if(reconnectMode == MSTSCLib::autoReconnectContinueManual) { - // TODO: wait for a call to Connect or Disconnect + assert(!m_reconnectAborted); + assert(m_protocolThreadWaitingReconnection == NULL); + + if(waitingReconnection == NULL) + { + waitingReconnection = CreateEvent(NULL, TRUE, FALSE, NULL); + + if(waitingReconnection == NULL) + // TODO: fatal error + goto l_Disconnect; + } + + m_protocolThreadWaitingReconnection = waitingReconnection; + + WaitForSingleObject(waitingReconnection, INFINITE); + + m_protocolThreadWaitingReconnection = NULL; + + if(m_reconnectAborted) + { + // FIXME? do we set the disconnection status here? + goto l_Disconnect; + } } // reconnect automatically else @@ -2443,6 +3929,9 @@ ++ autoReconnections; } + + if(overallConnectionTimer) + SetWaitableTimer(overallConnectionTimer, &overallTimeout, 0, ConnectionTimerAPC, NULL, FALSE); // Reconnection success = rdp_reconnect @@ -2458,26 +3947,94 @@ hostname, m_LoadBalanceInfo ); + + if(overallConnectionTimer) + CancelWaitableTimer(overallConnectionTimer); } while(!success); } +l_Disconnect: // Disconnected - // TODO: clean up protocol state, clear "connected" flag FireDisconnected(m_protocolState.disconnect_reason); + + if(overallConnectionTimer) + CloseHandle(overallConnectionTimer); + } + + void JoinProtocolThread() + { + assert(m_protocolThread); + WaitForSingleObject(m_protocolThread, INFINITE); + CloseHandle(m_protocolThread); + m_protocolThread = NULL; + } + + void TerminateProtocolThread() + { + assert(m_protocolThread); + + // wake it up if it's waiting for a manual reconnection + if(m_protocolThreadWaitingReconnection) + { + assert(!m_reconnectAborted); + m_reconnectAborted = true; + SetEvent(m_protocolThreadWaitingReconnection); + } + // otherwise, attempt to interrupt any current blocking operation + else + { + // shutdown(m_protocolState.tcp.sock, SD_BOTH); // TBD: maybe in the future? + QueueUserAPC(DisconnectAPC, m_protocolThread, 0); + } + + assert(m_protocolThreadWaitingReconnection == NULL); + } + + void PerformDisconnect(long reason) + { + assert(InsideApartment()); + assert(m_Connected); + + // TODO: notify virtual channels + + // TODO: do any other disconnection work here... + + // Put the control in the disconnected state + m_Connected = false; + m_loggedIn = false; + + // Notify the container + VARIANTARG arg = { }; + + arg.vt = VT_I4; + arg.lVal = reason; + + FireEventInsideApartment(4, &arg, 1); } public: /* Startup initialization */ static BOOL Startup() { - // TODO: register control window class here - return TRUE; + if(!RdpClientUI::Startup()) + return FALSE; + + WNDCLASSEX wcex = { sizeof(wcex) }; + + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = ControlWindowProc; + wcex.hInstance = GetCurrentModule(); + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wcex.lpszClassName = TEXT("MissTosca_Control"); + + return RegisterClassEx(&wcex);; } static void Shutdown() { - // TODO + UnregisterClass(TEXT("MissTosca_Control"), GetCurrentModule()); } /* Class factory */ @@ -2609,11 +4166,128 @@ }; /* Pay no attention, ActiveX glue... */ - HRESULT CreateControlWindow() - { - // TODO + LRESULT ControlWindowProc(UINT uMsg, WPARAM wParam, LPARAM lParam) + { + switch(uMsg) + { + case WM_SIZE: + { + // TODO: resize UI + } + + return 0; + + case WM_PAINT: + { + LPCWSTR text = NULL; + + if(!m_Connected) + text = m_DisconnectedText; + else if(m_actuallyConnected) + text = m_ConnectedStatusText; + else + text = m_ConnectingText; + + RECT clientRect; + GetClientRect(m_controlWindow, &clientRect); + + PAINTSTRUCT ps; + HDC hdc = BeginPaint(m_controlWindow, &ps); + + SetBkColor(hdc, GetSysColor(COLOR_WINDOW)); + SetTextColor(hdc, GetSysColor(COLOR_WINDOWTEXT)); + SelectObject(hdc, GetStockObject(SYSTEM_FONT)); + + RECT textRect = clientRect; + + DrawTextW + ( + hdc, + text, + -1, + &textRect, + DT_CENTER | DT_EDITCONTROL | DT_END_ELLIPSIS | DT_NOPREFIX | DT_WORDBREAK | DT_CALCRECT + ); + + if(textRect.right > clientRect.right) + textRect.right = clientRect.right; + + if(textRect.bottom > clientRect.bottom) + textRect.bottom = clientRect.bottom; + + textRect.left = (clientRect.right - textRect.right) / 2; + textRect.right += textRect.left; + textRect.top = (clientRect.bottom - textRect.bottom) / 2; + textRect.bottom += textRect.top; + + DrawTextW + ( + hdc, + text, + -1, + &textRect, + DT_CENTER | DT_EDITCONTROL | DT_END_ELLIPSIS | DT_NOPREFIX | DT_WORDBREAK + ); + + EndPaint(m_controlWindow, &ps); + } + + return 0; + + default: + { + LRESULT result; + + if(HandleEvent(uMsg, wParam, lParam, result)) + return result; + } + + break; + } + + return DefWindowProc(m_controlWindow, uMsg, wParam, lParam); + } + + static LRESULT CALLBACK ControlWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { + if(uMsg == WM_CREATE) + { + SetWindowLongPtr + ( + hwnd, + GWLP_USERDATA, + (LONG_PTR)reinterpret_cast<LPCREATESTRUCT>(lParam)->lpCreateParams + ); + } + + RdpClient * Self = reinterpret_cast<RdpClient *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); + assert(Self); + + return Self->ControlWindowProc(uMsg, wParam, lParam); + } + + HRESULT CreateControlWindow(HWND hwndParent) + { + m_controlWindow = CreateWindow + ( + TEXT("MissTosca_Control"), + NULL, + WS_CHILD | WS_CLIPCHILDREN, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + hwndParent, + NULL, + GetCurrentModule(), + this + ); + + if(m_controlWindow == NULL) + return HRESULT_FROM_WIN32(GetLastError()); + m_UIParentWindowHandle = m_controlWindow; - return E_FAIL; + return S_OK; } HRESULT DestroyControlWindow() @@ -2679,7 +4353,7 @@ ShowWindow(m_controlWindow, SW_SHOW); else { - hr = CreateControlWindow(); + hr = CreateControlWindow(hwndParent); if(FAILED(hr)) break; @@ -2697,7 +4371,16 @@ if(FAILED(hr)) break; - // TODO: focus the control window + SetWindowPos + ( + m_controlWindow, + NULL, + lprcPosRect->left, + lprcPosRect->top, + lprcPosRect->right - lprcPosRect->left, + lprcPosRect->bottom - lprcPosRect->top, + SWP_SHOWWINDOW + ); if(frame) { @@ -3045,7 +4728,21 @@ virtual STDMETHODIMP IOleInPlaceObject::SetObjectRects(LPCRECT lprcPosRect, LPCRECT lprcClipRect) { - // TODO: reposition the control window and set its region here + if(m_controlWindow == NULL) + return E_FAIL; + + MoveWindow + ( + m_controlWindow, + lprcPosRect->left, + lprcPosRect->top, + lprcPosRect->right - lprcPosRect->left, + lprcPosRect->bottom - lprcPosRect->top, + TRUE + ); + + SetWindowRgn(m_controlWindow, CreateRectRgnIndirect(lprcClipRect), TRUE); + return E_NOTIMPL; } @@ -3515,12 +5212,12 @@ virtual STDMETHODIMP IMsTscAx::get_HorizontalScrollBarVisible(long * pfHScrollVisible) const { - return GetProperty(m_HorizontalScrollBarVisible, pfHScrollVisible); + return E_NOTIMPL; // TODO } virtual STDMETHODIMP IMsTscAx::get_VerticalScrollBarVisible(long * pfVScrollVisible) const { - return GetProperty(m_VerticalScrollBarVisible, pfVScrollVisible); + return E_NOTIMPL; // TODO } virtual STDMETHODIMP IMsTscAx::put_FullScreenTitle(BSTR rhs) @@ -3576,17 +5273,24 @@ virtual STDMETHODIMP IMsTscAx::Connect() { if(m_Connected) + { + // Protocol thread waiting for a manual reconnection: wake it up + if(m_protocolThreadWaitingReconnection) + { + SetEvent(m_protocolThreadWaitingReconnection); + return S_OK; + } + return E_FAIL; + } m_Connected = true; - // TODO: if the protocol thread is waiting to reconnect, wake it up - HRESULT hr; if(m_controlWindow == NULL) { - hr = CreateControlWindow(); + hr = CreateControlWindow(NULL); if(FAILED(hr)) return hr; @@ -3595,6 +5299,16 @@ for(;;) { // TODO: initialize plugin DLLs/channels + + m_clientUI = new RdpClientUI(); + + if(m_clientUI == NULL) + { + hr = E_OUTOFMEMORY; + break; + } + + m_clientUI->Initialize(m_controlWindow); m_protocolState.licence_username = BstrToLpsz(m_UserName); @@ -3688,9 +5402,9 @@ if(!m_Connected) return E_FAIL; - // TODO: if the protocol thread is waiting to reconnect, wake it up - - return E_NOTIMPL; // TODO + // Terminate the protocol thread. On exit, it will fire the Disconnected event + TerminateProtocolThread(); + return S_OK; } virtual STDMETHODIMP IMsTscAx::CreateVirtualChannels(BSTR newVal) @@ -3776,7 +5490,21 @@ virtual STDMETHODIMP IMsRdpClient::RequestClose(MSTSCLib::ControlCloseStatus * pCloseStatus) { - return E_NOTIMPL; // TODO + if(pCloseStatus == NULL) + return E_POINTER; + + if(!m_Connected) + { + *pCloseStatus = MSTSCLib::controlCloseCanProceed; + return S_OK; + } + + *pCloseStatus = MSTSCLib::controlCloseWaitForEvents; + + if(!PostMessage(m_controlWindow, RDPC_WM_REQUEST_CLOSE, 0, 0)) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; } /* IMsRdpClient2 */ @@ -3884,6 +5612,330 @@ }; #pragma warning(pop) + +/* More glue to interface to the rdesktop code */ +extern "C" +{ + +/* Orders */ +/* support routines */ +void ui_begin_update(RDPCLIENT * This) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_BeginUpdate(); +} + +void ui_end_update(RDPCLIENT * This) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_EndUpdate(); +} + +void ui_set_clip(RDPCLIENT * This, int x, int y, int cx, int cy) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_SetClip(x, y, cx, cy); +} + +void ui_reset_clip(RDPCLIENT * This) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_ResetClip(); +} + +/* blits */ +void ui_destblt(RDPCLIENT * This, uint8 opcode, int x, int y, int cx, int cy) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_DestBlt(opcode, x, y, cx, cy); +} + +void ui_memblt(RDPCLIENT * This, uint8 opcode, int x, int y, int cx, int cy, HBITMAP src, int srcx, int srcy) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_MemBlt(opcode, x, y, cx, cy, src, srcx, srcy); +} + +void ui_patblt(RDPCLIENT * This, uint8 opcode, int x, int y, int cx, int cy, BRUSH * brush, int bgcolour, int fgcolour) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_PatBlt(opcode, x, y, cx, cy, brush, bgcolour, fgcolour); +} + +void ui_screenblt(RDPCLIENT * This, uint8 opcode, int x, int y, int cx, int cy, int srcx, int srcy) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_ScreenBlt(opcode, x, y, cx, cy, srcx, srcy); +} + +void ui_triblt(RDPCLIENT * This, uint8 opcode, int x, int y, int cx, int cy, HBITMAP src, int srcx, int srcy, BRUSH * brush, int bgcolour, int fgcolour) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_TriBlt(opcode, x, y, cx, cy, src, srcx, srcy, brush, bgcolour, fgcolour); +} + +void ui_paint_bitmap(RDPCLIENT * This, int x, int y, int cx, int cy, int width, int height, uint8 * data) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_PaintBitmap(x, y, cx, cy, width, height, data); +} + +/* shapes */ +void ui_ellipse(RDPCLIENT * This, uint8 opcode, uint8 fillmode, int x, int y, int cx, int cy, BRUSH * brush, int bgcolour, int fgcolour) +{ + // TODO +// RdpClient::InnerToOuter(This)->GetUI()->Display_Ellipse(opcode, fillmode, x, y, cx, cy, brush, bgcolour, fgcolour); +} + +void ui_line(RDPCLIENT * This, uint8 opcode, int startx, int starty, int endx, int endy, PEN * pen) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_Line(opcode, startx, starty, endx, endy, pen); +} + +void ui_polygon(RDPCLIENT * This, uint8 opcode, uint8 fillmode, POINT * point, int npoints, BRUSH * brush, int bgcolour, int fgcolour) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_Polygon(opcode, fillmode, point, npoints, brush, bgcolour, fgcolour); +} + +void ui_polyline(RDPCLIENT * This, uint8 opcode, POINT * points, int npoints, PEN * pen) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_Polyline(opcode, points, npoints, pen); +} + +void ui_rect(RDPCLIENT * This, int x, int y, int cx, int cy, int colour) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_Rect(x, y, cx, cy, colour); +} + +/* text */ +void ui_draw_text +( + RDPCLIENT * This, + uint8 font, + uint8 flags, + uint8 opcode, + int mixmode, + int x, + int y, + int clipx, + int clipy, + int clipcx, + int clipcy, + int boxx, + int boxy, + int boxcx, + int boxcy, + BRUSH * brush, + int bgcolour, + int fgcolour, + uint8 * text, + uint8 length +) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_DrawText + ( + font, + flags, + opcode, + mixmode, + x, + y, + clipx, + clipy, + clipcx, + clipcy, + boxx, + boxy, + boxcx, + boxcy, + brush, + bgcolour, + fgcolour, + text, + length + ); +} + +/* desktop save/restore */ +void ui_desktop_save(RDPCLIENT * This, uint32 offset, int x, int y, int cx, int cy) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_SaveDesktop(offset, x, y, cx, cy); +} + +void ui_desktop_restore(RDPCLIENT * This, uint32 offset, int x, int y, int cx, int cy) +{ + RdpClient::InnerToOuter(This)->GetUI()->Display_RestoreDesktop(offset, x, y, cx, cy); +} + +/* Resources */ +/* bitmaps */ +HBITMAP ui_create_bitmap(RDPCLIENT * This, int width, int height, uint8 * data) +{ + return win32_create_dib(width, height, This->server_depth, data); +} + +void ui_destroy_bitmap(RDPCLIENT *, HBITMAP bmp) +{ + DeleteObject(bmp); +} + +/* palettes */ +HCOLOURMAP ui_create_colourmap(RDPCLIENT *, COLOURMAP * colours) +{ + return NULL; +} + +void ui_set_colourmap(RDPCLIENT * This, HCOLOURMAP map) +{ + // TODO +} + +/* cursors */ +HCURSOR ui_create_cursor(RDPCLIENT * This, unsigned int x, unsigned int y, int width, int height, uint8 * andmask, uint8 * xormask) +{ + uint8 * andbuf = NULL; + uint8 * xorbuf = NULL; + + uint8 * andbits = win32_convert_scanlines(width, - height, 1, 2, 4, andmask, &andbuf); + uint8 * xorbits = win32_convert_scanlines(width, height, 24, 2, 4, xormask, &xorbuf); + + HBITMAP hbmMask = CreateBitmap(width, height, 1, 1, andbits); + HBITMAP hbmColor = win32_create_dib(width, height, 24, xorbits); + + ICONINFO iconinfo; + iconinfo.fIcon = FALSE; + iconinfo.xHotspot = x; + iconinfo.yHotspot = y; + iconinfo.hbmMask = hbmMask; + iconinfo.hbmColor = hbmColor; + + HICON icon = CreateIconIndirect(&iconinfo); + + if(icon == NULL) + error("CreateIconIndirect %dx%d failed\n", width, height); + + if(andbuf) + delete[] andbuf; + + if(xorbuf) + delete[] xorbuf; + + DeleteObject(hbmMask); + DeleteObject(hbmColor); + + return icon; +} + +void ui_destroy_cursor(RDPCLIENT *, HCURSOR cursor) +{ + DestroyIcon(cursor); +} + +/* glyphs */ +HGLYPH ui_create_glyph(RDPCLIENT * This, int width, int height, const uint8 * data) +{ + uint8 * databuf = NULL; + uint8 * databits = win32_convert_scanlines(width, height, 1, 1, 2, data, &databuf); + + HBITMAP hbm = CreateBitmap(width, height, 1, 1, databits); + + if(databuf) + delete[] databuf; + + const uint8 * p = data; + int stride = alignup(alignup(width, 8) / 8, 1); + +#ifdef _DEBUG + printf("glyph %p\n", hbm); + + for(int i = 0; i < height; ++ i, p += stride) + { + for(int j = 0; j < width; ++ j) + { + int B = p[j / 8]; + int b = 8 - j % 8 - 1; + + if(B & (1 << b)) + fputs("##", stdout); + else + fputs("..", stdout); + } + + fputc('\n', stdout); + } + + fputc('\n', stdout); +#endif + + return hbm; +} + +void ui_destroy_glyph(RDPCLIENT *, HGLYPH glyph) +{ + DeleteObject(glyph); +} + +/* Input window */ +void ui_move_pointer(RDPCLIENT * This, int x, int y) +{ + // TODO +} + +void ui_set_cursor(RDPCLIENT * This, HCURSOR cursor) +{ + // TODO +} + +void ui_set_null_cursor(RDPCLIENT * This) +{ + // TODO +} + +/* Miscellaneous */ +void ui_resize_window(RDPCLIENT * This) +{ +} + +void ui_bell(RDPCLIENT *) +{ + MessageBeep(0); +} + +int ui_select(RDPCLIENT * This, SOCKET rdp_socket) +{ + return SleepEx(0, TRUE) == WAIT_IO_COMPLETION; +} + +/* Events */ +BOOL event_pubkey(RDPCLIENT * This, unsigned char * key, unsigned int key_size) +{ + if(!RdpClient::OnPublicKey(This, key, key_size)) + return FALSE; + else + return TRUE; +} + +void event_logon(RDPCLIENT * This) +{ + RdpClient::OnLogon(This); +} + +BOOL event_redirect(RDPCLIENT * This, uint32 flags, uint32 server_len, wchar_t * server, uint32 cookie_len, char * cookie, uint32 username_len, wchar_t * username, uint32 domain_len, wchar_t * domain, uint32 password_len, wchar_t * password) +{ + if + ( + !RdpClient::OnRedirect + ( + This, + flags, + server_len, + server, + cookie_len, + cookie, + username_len, + username, + domain_len, + domain, + password_len, + password + ) + ) + return FALSE; + else + return TRUE; +} + +} class ClassFactory: public IClassFactory { @@ -4017,8 +6069,6 @@ { DisableThreadLibraryCalls(hInstance); - InitCommonControls(); - if(!RdpClient::Startup()) return FALSE; } Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp (original) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp Mon Aug 21 01:02:10 2006 @@ -4,16 +4,6 @@ #include "rdesktop/rdesktop.h" #include "rdesktop/proto.h" - -template<class T, class U> T aligndown(const T& X, const U& align) -{ - return X & ~(T(align) - 1); -} - -template<class T, class U> T alignup(const T& X, const U& align) -{ - return aligndown(X + (align - 1), align); -} extern "C" { @@ -199,897 +189,6 @@ HDC hdcBuffer; UINT wmZMouseWheel; - static - HBITMAP - win32_create_dib(LONG width, LONG height, WORD bitcount, const BYTE * data) - { - struct b_ - { - BITMAPINFO bmi; - RGBQUAD colormap[256 - ARRAYSIZE(RTL_FIELD_TYPE(BITMAPINFO, bmiColors))]; - } - b; - - b.bmi.bmiHeader.biSize = sizeof(b.bmi.bmiHeader); - b.bmi.bmiHeader.biWidth = width; - b.bmi.bmiHeader.biHeight = height; - b.bmi.bmiHeader.biPlanes = 1; - b.bmi.bmiHeader.biBitCount = bitcount; - b.bmi.bmiHeader.biCompression = BI_RGB; - b.bmi.bmiHeader.biSizeImage = 0; - b.bmi.bmiHeader.biXPelsPerMeter = 0; - b.bmi.bmiHeader.biYPelsPerMeter = 0; - - if(bitcount > 8) - { - b.bmi.bmiHeader.biClrUsed = 0; - b.bmi.bmiHeader.biClrImportant = 0; - } - else - { - b.bmi.bmiHeader.biClrUsed = 2 << bitcount; - b.bmi.bmiHeader.biClrImportant = 2 << bitcount; - - // TODO: palette - } - - HBITMAP hbm = CreateDIBitmap(hdcBuffer, &b.bmi.bmiHeader, CBM_INIT, data, &b.bmi, DIB_RGB_COLORS); - - if(hbm == NULL) - error("CreateDIBitmap %dx%dx%d failed\n", width, height, bitcount); - - return hbm; - } - - static - uint8 * - win32_convert_scanlines(int width, int height, int bitcount, int fromalign, int toalign, const uint8 * data, uint8 ** buffer) - { - // TBD: profile & optimize the most common cases - assert(width > 0); - assert(height); - assert(bitcount && bitcount <= 32); - assert(fromalign <= toalign); - assert(data); - assert(buffer); - - bool flipped = height < 0; - - if(flipped) - height = - height; - - int bytesperrow = alignup(width * bitcount, 8) / 8; - int fromstride = alignup(bytesperrow, fromalign); - int tostride = alignup(bytesperrow, toalign); - assert(fromstride <= tostride); - - int datasize = tostride * height; - - uint8 * dibits = new(malloc(datasize)) uint8; - - if(dibits == NULL) - return NULL; - - const uint8 * src = data; - uint8 * dest = dibits; - - const int pad = tostride - fromstride; - - assert(pad < 4); - __assume(pad < 4); - - if(flipped) - { - dest += (height - 1) * tostride; - tostride = - tostride; - } - - for(int i = 0; i < height; ++ i) - { - memcpy(dest, src, fromstride); - memset(dest + fromstride, 0, pad); - src += fromstride; - dest += tostride; - } - - *buffer = dibits; - return dibits; - } - - void - ui_resize_window(RDPCLIENT * This) - { - // EVENT: OnRemoteDesktopSizeChange - // TODO: resize buffer - SetWindowPos(hwnd, NULL, 0, 0, This->width, This->height, SWP_ASYNCWINDOWPOS | SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOMOVE); - } - - int - ui_select(RDPCLIENT * This, SOCKET rdp_socket) - { - return 1; // TODO: return 0 for user quit. Or just kill this silly function - } - - void - ui_move_pointer(RDPCLIENT * This, int x, int y) - { - POINT point; - point.x = x; - point.y = y; - - ClientToScreen(hwnd, &point); - SetCursorPos(point.x, point.y); - } - - HCURSOR hcursor; - - HBITMAP - ui_create_bitmap(RDPCLIENT * This, int width, int height, uint8 * data) - { - return win32_create_dib(width, height, This->server_depth, data); - } - - void - ui_destroy_bitmap(RDPCLIENT * This, HBITMAP bmp) - { - DeleteObject(bmp); - } - - HGLYPH - ui_create_glyph(RDPCLIENT * This, int width, int height, const uint8 * data) - { - uint8 * databuf = NULL; - uint8 * databits = win32_convert_scanlines(width, height, 1, 1, 2, data, &databuf); - - if(databits == NULL) - return NULL; - - HBITMAP hbm = CreateBitmap(width, height, 1, 1, databits); - - if(databuf) - free(databuf); - - const uint8 * p = data; - int stride = alignup(alignup(width, 8) / 8, 1); - - printf("glyph %p\n", hbm); - - for(int i = 0; i < height; ++ i, p += stride) - { - for(int j = 0; j < width; ++ j) - { - int B = p[j / 8]; - int b = 8 - j % 8 - 1; - - if(B & (1 << b)) - fputs("##", stdout); - else - fputs("..", stdout); - } - - fputc('\n', stdout); - } - - fputc('\n', stdout); - - return hbm; - } - - void - ui_destroy_glyph(RDPCLIENT * This, HGLYPH glyph) - { - DeleteObject(glyph); - } - - HCURSOR - ui_create_cursor(RDPCLIENT * This, unsigned int x, unsigned int y, int width, int height, - uint8 * andmask, uint8 * xormask) - { - uint8 * andbuf = NULL; - uint8 * xorbuf = NULL; - - uint8 * andbits = win32_convert_scanlines(width, - height, 1, 2, 4, andmask, &andbuf); - - if(andbits == NULL) - return NULL; - - uint8 * xorbits = win32_convert_scanlines(width, height, 24, 2, 4, xormask, &xorbuf); - - if(xorbits == NULL) - { - free(andbits); - return NULL; - } - - HBITMAP hbmMask = CreateBitmap(width, height, 1, 1, andbits); - HBITMAP hbmColor = win32_create_dib(width, height, 24, xorbits); - - ICONINFO iconinfo; - iconinfo.fIcon = FALSE; - iconinfo.xHotspot = x; - iconinfo.yHotspot = y; - iconinfo.hbmMask = hbmMask; - iconinfo.hbmColor = hbmColor; - - HICON icon = CreateIconIndirect(&iconinfo); - - if(icon == NULL) - error("CreateIconIndirect %dx%d failed\n", width, height); - - if(andbuf) - free(andbuf); - - if(xorbuf) - free(xorbuf); - - DeleteObject(hbmMask); - DeleteObject(hbmColor); - - return icon; - } - - void - ui_set_cursor(RDPCLIENT * This, HCURSOR cursor) - { - hcursor = cursor; - } - - void - ui_destroy_cursor(RDPCLIENT * This, HCURSOR cursor) - { - DestroyIcon(cursor); - } - - void - ui_set_null_cursor(RDPCLIENT * This) - { - hcursor = NULL; - } - - HCOLOURMAP - ui_create_colourmap(RDPCLIENT * This, COLOURMAP * colours) - { - // TODO - // TODO: kill HCOLOURMAP/COLOURMAP, use HPALETTE/LOGPALETTE - return 0; - } - - void - ui_destroy_colourmap(RDPCLIENT * This, HCOLOURMAP map) - { - // TODO: see above - } - - void - ui_set_colourmap(RDPCLIENT * This, HCOLOURMAP map) - { - // TODO - } - - RECT rcClip; // TODO: initialize - - void - ui_set_clip(RDPCLIENT * This, int x, int y, int cx, int cy) - { - rcClip.left = x; - rcClip.top = y; - rcClip.right = x + cx + 1; - rcClip.bottom = y + cy + 1; - - HRGN hrgn = CreateRectRgnIndirect(&rcClip); - SelectClipRgn(hdcBuffer, hrgn); - DeleteObject(hrgn); - } - - void - ui_reset_clip(RDPCLIENT * This) - { - rcClip.left = 0; - rcClip.top = 0; - rcClip.right = This->width + 1; - rcClip.bottom = This->height + 1; - SelectClipRgn(hdcBuffer, NULL); - } - - void - ui_bell(RDPCLIENT * This) - { - MessageBeep(MB_OK); // TODO? use Beep() on remote sessions? - } - - static - void - win32_repaint_rect(RDPCLIENT * This, const RECT * lprc) - { - RECT rcDamage; - IntersectRect(&rcDamage, lprc, &rcClip); - -#if 0 - HDC hdc = GetDC(hwnd); - SelectObject(hdc, GetStockObject(NULL_PEN)); - SelectObject(hdc, CreateSolidBrush(RGB(255, 0, 0))); - Rectangle(hdc, rcDamage.left, rcDamage.top, rcDamage.right + 1, rcDamage.bottom + 1); - ReleaseDC(hwnd, hdc); - Sleep(200); -#endif - - InvalidateRect(hwnd, &rcDamage, FALSE); - } - - static - void - win32_repaint_area(RDPCLIENT * This, int x, int y, int cx, int cy) - { - RECT rcDamage; - rcDamage.left = x; - rcDamage.top = y; - rcDamage.right = x + cx; - rcDamage.bottom = y + cy; - win32_repaint_rect(This, &rcDamage); - } - - static - void - win32_repaint_poly(RDPCLIENT * This, POINT * point, int npoints, int linewidth) - { - RECT rcDamage; - - rcDamage.left = MAXLONG; - rcDamage.top = MAXLONG; - rcDamage.right = 0; - rcDamage.bottom = 0; - - for(int i = 0; i < npoints; ++ i) - { - if(point[i].x < rcDamage.left) - rcDamage.left = point[i].x; - - if(point[i].y < rcDamage.top) - rcDamage.top = point[i].y; - - if(point[i].x > rcDamage.right) - rcDamage.right = point[i].x; - - if(point[i].y > rcDamage.bottom) - rcDamage.bottom = point[i].y; - } - - InflateRect(&rcDamage, linewidth, linewidth); - win32_repaint_rect(This, &rcDamage); - } - - static - void - win32_repaint_whole(RDPCLIENT * This) - { - InvalidateRgn(hwnd, NULL, FALSE); - } - - static - HBRUSH - win32_create_brush(RDPCLIENT * This, BRUSH * brush, COLORREF fgcolour) - { - if(brush == NULL) - return (HBRUSH)GetStockObject(NULL_BRUSH); - - switch(brush->style) - { - case BS_SOLID: - case BS_NULL: - case BS_HATCHED: - case BS_PATTERN: - case BS_PATTERN8X8: - break; - - default: - return NULL; - } - - switch(brush->style) - { - case BS_SOLID: - return CreateSolidBrush(fgcolour); - - case BS_HATCHED: - return CreateHatchBrush(brush->pattern[0], fgcolour); - - case BS_NULL: - return (HBRUSH)GetStockObject(NULL_BRUSH); - - case BS_PATTERN: - case BS_PATTERN8X8: - { - uint16 pattern[8]; - - for(size_t i = 0; i < 8; ++ i) - pattern[i] = brush->pattern[i]; - - HBITMAP hpattern = CreateBitmap(8, 8, 1, 1, pattern); - HBRUSH hbr = CreatePatternBrush(hpattern); - DeleteObject(hpattern); - return hbr; - } - - DEFAULT_UNREACHABLE; - } - } - - void - ui_paint_bitmap(RDPCLIENT * This, int x, int y, int cx, int cy, int width, int height, uint8 * data) - { - assert(This->server_depth >= 8); - assert(rcClip.left == 0 && rcClip.top == 0 && rcClip.right == This->width + 1 && rcClip.bottom == This->height + 1); - - GdiFlush(); - - // TBD: we can cache these values - int Bpp = alignup(This->server_depth, 8) / 8; - int tostride = alignup(This->width * Bpp, 4); - - int fromstride = alignup(width * Bpp, 4); - int sizex = cx * Bpp; - - const uint8 * src = data; - uint8 * dst = (uint8 *)pBuffer + (This->height - y - cy) * tostride + x * Bpp; - - for(int i = 0; i < cy; ++ i) - { - memcpy(dst, src, sizex); - src += fromstride; - dst += tostride; - } - - win32_repaint_area(This, x, y, cx, cy); - } - - void - ui_destblt(RDPCLIENT * This, uint8 opcode, - /* dest */ int x, int y, int cx, int cy) - { - int dcsave = SaveDC(hdcBuffer); - SelectObject(hdcBuffer, GetStockObject(BLACK_BRUSH)); - PatBlt(hdcBuffer, x, y, cx, cy, MAKELONG(0, opcode)); - RestoreDC(hdcBuffer, dcsave); - win32_repaint_area(This, x, y, cx, cy); - } - - void - ui_patblt(RDPCLIENT * This, uint8 opcode, - /* dest */ int x, int y, int cx, int cy, - /* brush */ BRUSH * brush, int bgcolour, int fgcolour) - { - HBRUSH hbr = win32_create_brush(This, brush, fgcolour); - - int dcsave = SaveDC(hdcBuffer); - - SetBkColor(hdcBuffer, bgcolour); - SetTextColor(hdcBuffer, fgcolour); - SetBrushOrgEx(hdcBuffer, brush->xorigin, brush->yorigin, NULL); - SelectObject(hdcBuffer, hbr); - - PatBlt(hdcBuffer, x, y, cx, cy, MAKELONG(0, opcode)); - - RestoreDC(hdcBuffer, dcsave); - - DeleteObject(hbr); - - win32_repaint_area(This, x, y, cx, cy); - } - - void - ui_screenblt(RDPCLIENT * This, uint8 opcode, - /* dest */ int x, int y, int cx, int cy, - /* src */ int srcx, int srcy) - { - BitBlt(hdcBuffer, x, y, cx, cy, hdcBuffer, srcx, srcy, MAKELONG(0, opcode)); - win32_repaint_area(This, x, y, cx, cy); - } - - void - ui_memblt(RDPCLIENT * This, uint8 opcode, - /* dest */ int x, int y, int cx, int cy, - /* src */ HBITMAP src, int srcx, int srcy) - { - HDC hdcSrc = CreateCompatibleDC(hdcBuffer); - HGDIOBJ hOld = SelectObject(hdcSrc, src); - - BitBlt(hdcBuffer, x, y, cx, cy, hdcSrc, srcx, srcy, MAKELONG(0, opcode)); - - SelectObject(hdcSrc, hOld); - DeleteDC(hdcSrc); - - win32_repaint_area(This, x, y, cx, cy); - } - - void - ui_triblt(RDPCLIENT * This, uint8 opcode, - /* dest */ int x, int y, int cx, int cy, - /* src */ HBITMAP src, int srcx, int srcy, - /* brush */ BRUSH * brush, int bgcolour, int fgcolour) - { - // TODO - HDC hdcSrc = CreateCompatibleDC(hdcBuffer); - HGDIOBJ hOld = SelectObject(hdcSrc, src); - - //SELECT_BRUSH(brush, bgcolour, fgcolour); - - BitBlt(hdcBuffer, x, y, cx, cy, hdcSrc, srcx, srcy, MAKELONG(0, opcode)); - - //RESET_BRUSH(); - - SelectObject(hdcSrc, hOld); - DeleteDC(hdcSrc); - - win32_repaint_area(This, x, y, cx, cy); - } - - void - ui_line(RDPCLIENT * This, uint8 opcode, - /* dest */ int startx, int starty, int endx, int endy, - /* pen */ PEN * pen) - { - HPEN hpen = CreatePen(pen->style, pen->width, pen->colour); - - int dcsave = SaveDC(hdcBuffer); - - SetROP2(hdcBuffer, opcode); - SelectObject(hdcBuffer, hpen); - MoveToEx(hdcBuffer, startx, starty, NULL); - - LineTo(hdcBuffer, endx, endy); - - RestoreDC(hdcBuffer, dcsave); - - DeleteObject(hpen); - - RECT rcDamage; - - if(startx < endx) - { - rcDamage.left = startx; - rcDamage.right = endx; - } - else - { - rcDamage.left = endx; - rcDamage.right = startx; - } - - if(starty < endy) - { - rcDamage.top = starty; - rcDamage.bottom = endy; - } - else - { - rcDamage.top = endy; - rcDamage.bottom = starty; - } - - InflateRect(&rcDamage, pen->width, pen->width); - win32_repaint_rect(This, &rcDamage); - } - - void - ui_rect(RDPCLIENT * This, - /* dest */ int x, int y, int cx, int cy, - /* brush */ int colour) - { - HBRUSH hbr = CreateSolidBrush(colour); - - int dcsave = SaveDC(hdcBuffer); - - SelectObject(hdcBuffer, hbr); - SelectObject(hdcBuffer, GetStockObject(NULL_PEN)); - - Rectangle(hdcBuffer, x, y, x + cx + 1, y + cy + 1); - - RestoreDC(hdcBuffer, dcsave); - - DeleteObject(hbr); - - win32_repaint_area(This, x, y, cx, cy); - } - - void - ui_polygon(RDPCLIENT * This, uint8 opcode, - /* mode */ uint8 fillmode, - /* dest */ POINT * point, int npoints, - /* brush */ BRUSH * brush, int bgcolour, int fgcolour) - { - HBRUSH hbr = win32_create_brush(This, brush, fgcolour); - - int dcsave = SaveDC(hdcBuffer); - - SetBkColor(hdcBuffer, bgcolour); - SetTextColor(hdcBuffer, fgcolour); - SetPolyFillMode(hdcBuffer, fillmode); - SelectObject(hdcBuffer, hbr); - - Polygon(hdcBuffer, point, npoints); - - RestoreDC(hdcBuffer, dcsave); - - win32_repaint_poly(This, point, npoints, 0); - } - - void - ui_polyline(RDPCLIENT * This, uint8 opcode, - /* dest */ POINT * points, int npoints, - /* pen */ PEN * pen) - { - POINT last = points[0]; - - for(int i = 1; i < npoints; ++ i) - { - points[i].x += last.x; - points[i].y += last.y; - last = points[i]; - } - - HPEN hpen = CreatePen(pen->style, pen->width, pen->colour); - - int dcsave = SaveDC(hdcBuffer); - - SetROP2(hdcBuffer, opcode); - SelectObject(hdcBuffer, hpen); - - Polyline(hdcBuffer, points, npoints); - - RestoreDC(hdcBuffer, dcsave); - - DeleteObject(hpen); - - win32_repaint_poly(This, points, npoints, pen->width); - } - - void - ui_ellipse(RDPCLIENT * This, uint8 opcode, - /* mode */ uint8 fillmode, - /* dest */ int x, int y, int cx, int cy, - /* brush */ BRUSH * brush, int bgcolour, int fgcolour) - { - // TODO - - win32_repaint_area(This, x, y, cx, cy); - } - - // TBD: optimize text drawing - void - ui_draw_glyph(RDPCLIENT * This, int mixmode, - /* dest */ int x, int y, int cx, int cy, - /* src */ HGLYPH glyph, int srcx, int srcy, - int bgcolour, int fgcolour) - { - HBITMAP hbmGlyph = (HBITMAP)glyph; - HDC hdcGlyph = CreateCompatibleDC(hdcBuffer); - HGDIOBJ hOld = SelectObject(hdcGlyph, hbmGlyph); - - int dcsave = SaveDC(hdcBuffer); - - switch(mixmode) - { - case MIX_TRANSPARENT: - { - /* - ROP is DSPDxax: - - where the glyph (S) is white, D is set to the foreground color (P) - - where the glyph (S) is black, D is left untouched - - This paints a transparent glyph in the specified color - */ - HBRUSH hbr = CreateSolidBrush(fgcolour); - SelectObject(hdcBuffer, hbr); - BitBlt(hdcBuffer, x, y, cx, cy, hdcGlyph, srcx, srcy, MAKELONG(0, 0xe2)); - DeleteObject(hbr); - } - - break; - - case MIX_OPAQUE: - { - /* Curiously, glyphs are inverted (white-on-black) */ - SetBkColor(hdcBuffer, fgcolour); - SetTextColor(hdcBuffer, bgcolour); - BitBlt(hdcBuffer, x, y, cx, cy, hdcGlyph, srcx, srcy, SRCCOPY); - } - - break; - } - - RestoreDC(hdcBuffer, dcsave); - - SelectObject(hdcGlyph, hOld); - DeleteDC(hdcGlyph); - - win32_repaint_area(This, x, y, cx, cy); - } - - // TBD: a clean-up would be nice, too... -#define DO_GLYPH(ttext,idx) \ -{\ - glyph = cache_get_font (This, font, ttext[idx]);\ - if (!(flags & TEXT2_IMPLICIT_X))\ - {\ - xyoffset = ttext[++idx];\ - if ((xyoffset & 0x80))\ - {\ - if (flags & TEXT2_VERTICAL)\ - y += ttext[idx+1] | (ttext[idx+2] << 8);\ - else\ - x += ttext[idx+1] | (ttext[idx+2] << 8);\ - idx += 2;\ - }\ - else\ - {\ - if (flags & TEXT2_VERTICAL)\ - y += xyoffset;\ - else\ - x += xyoffset;\ - }\ - }\ - if (glyph != NULL)\ - {\ - ui_draw_glyph (This, mixmode, x + (short) glyph->offset,\ - y + (short) glyph->baseline,\ - glyph->width, glyph->height,\ - glyph->pixmap, 0, 0, bgcolour, fgcolour);\ - if (flags & TEXT2_IMPLICIT_X)\ - x += glyph->width;\ - }\ -} - - void - ui_draw_text(RDPCLIENT * This, uint8 font, uint8 flags, uint8 opcode, int mixmode, int x, int y, - int clipx, int clipy, int clipcx, int clipcy, - int boxx, int boxy, int boxcx, int boxcy, BRUSH * brush, - int bgcolour, int fgcolour, uint8 * text, uint8 length) - { - FONTGLYPH * glyph; - int i, j, xyoffset; - DATABLOB *entry; - - HBRUSH hbr = CreateSolidBrush(bgcolour); - HGDIOBJ holdbrush = SelectObject(hdcBuffer, hbr); - HGDIOBJ holdpen = SelectObject(hdcBuffer, GetStockObject(NULL_PEN)); - - if (boxcx > 1) - Rectangle(hdcBuffer, boxx, boxy, boxx + boxcx + 1, boxy + boxcy + 1); - else if (mixmode == MIX_OPAQUE) - Rectangle(hdcBuffer, clipx, clipy, clipx + clipcx + 1, clipy + clipcy + 1); - - SelectObject(hdcBuffer, holdpen); - SelectObject(hdcBuffer, holdbrush); - - DeleteObject(hbr); - - if(boxcx > 1) - win32_repaint_area(This, boxx, boxy, boxcx, boxcy); - else - win32_repaint_area(This, clipx, clipy, clipcx, clipcy); - - /* Paint text, character by character */ - for (i = 0; i < length;) - { - switch (text[i]) - { - case 0xff: - /* At least two bytes needs to follow */ - if (i + 3 > length) - { - warning("Skipping short 0xff command:"); - for (j = 0; j < length; j++) - fprintf(stderr, "%02x ", text[j]); - fprintf(stderr, "\n"); - i = length = 0; - break; - } - cache_put_text(This, text[i + 1], text, text[i + 2]); - i += 3; - length -= i; - /* this will move pointer from start to first character after FF command */ - text = &(text[i]); - i = 0; - break; - - case 0xfe: - /* At least one byte needs to follow */ - if (i + 2 > length) - { - warning("Skipping short 0xfe command:"); - for (j = 0; j < length; j++) - fprintf(stderr, "%02x ", text[j]); - fprintf(stderr, "\n"); - i = length = 0; - break; - } - entry = cache_get_text(This, text[i + 1]); - if (entry->data != NULL) - { - if ((((uint8 *) (entry->data))[1] == 0) - && (!(flags & TEXT2_IMPLICIT_X)) && (i + 2 < length)) - { - if (flags & TEXT2_VERTICAL) - y += text[i + 2]; - else - x += text[i + 2]; - } - for (j = 0; j < entry->size; j++) - DO_GLYPH(((uint8 *) (entry->data)), j); - } - if (i + 2 < length) - i += 3; - else - i += 2; - length -= i; - /* this will move pointer from start to first character after FE command */ - text = &(text[i]); - i = 0; - break; - - default: - DO_GLYPH(text, i); - i++; - break; - } - } - } - - void - ui_desktop_save(RDPCLIENT * This, uint32 offset, int x, int y, int cx, int cy) - { - GdiFlush(); - int Bpp = alignup(This->server_depth, 8) / 8; - int stride = alignup(This->width * Bpp, 4); - uint8 * data = (uint8 *)pBuffer + x * Bpp + (This->height - y - cy) * stride; - cache_put_desktop(This, offset * Bpp, cx, cy, stride, Bpp, data); - } - - void - ui_desktop_restore(RDPCLIENT * This, uint32 offset, int x, int y, int cx, int cy) - { - // TBD: we can cache these values - int Bpp = alignup(This->server_depth, 8) / 8; - int tostride = alignup(This->width * Bpp, 4); - int fromstride = cx * Bpp; - - const uint8 * src = cache_get_desktop(This, offset, cx, cy, Bpp); - uint8 * dst = (uint8 *)pBuffer + x * Bpp + (This->height - y - cy) * tostride; - - GdiFlush(); - - for(int i = 0; i < cy; ++ i) - { - memcpy(dst, src, fromstride); - src += fromstride; - dst += tostride; - } - - win32_repaint_area(This, x, y, cx, cy); - } - - int nSavedDC; - - void - ui_begin_update(RDPCLIENT * This) - { - nSavedDC = SaveDC(hdcBuffer); - } - - void - ui_end_update(RDPCLIENT * This) - { - RestoreDC(hdcBuffer, nSavedDC); - } - - int event_pubkey(RDPCLIENT * This, const unsigned char * key, size_t key_size) - { - return True; - } - - void event_logon(RDPCLIENT * This) - { - } }; static @@ -1193,7 +292,7 @@ case WM_SETCURSOR: if(LOWORD(lparam) == HTCLIENT) { - SetCursor(hcursor); + //SetCursor(hcursor); return TRUE; } @@ -1291,10 +390,12 @@ SelectObject(hdcBuffer, hbmBuffer); +#if 0 rcClip.left = 0; rcClip.top = 0; rcClip.right = This->width + 1; rcClip.bottom = This->height + 1; +#endif BOOL deactivated; uint32 ext_disc_reason; @@ -1507,7 +608,7 @@ This->rdp.current_status = 1; - hcursor = NULL; + //hcursor = NULL; WNDCLASS wc; ZeroMemory(&wc, sizeof(wc)); Modified: trunk/reactos/base/applications/tsclient/rdesktop/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/iso.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/iso.c Mon Aug 21 01:02:10 2006 @@ -228,9 +228,7 @@ BOOL iso_disconnect(RDPCLIENT * This) { - if(!iso_send_msg(This, ISO_PDU_DR)) - return False; - + iso_send_msg(This, ISO_PDU_DR); return tcp_disconnect(This); } Modified: trunk/reactos/base/applications/tsclient/rdesktop/proto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/proto.h (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/proto.h Mon Aug 21 01:02:10 2006 @@ -310,8 +310,9 @@ unsigned int seamless_send_focus(RDPCLIENT * This, unsigned long id, unsigned long flags); /* events */ -int event_pubkey(RDPCLIENT * This, const unsigned char * key, size_t key_size); +BOOL event_pubkey(RDPCLIENT * This, unsigned char * key, unsigned int key_size); void event_logon(RDPCLIENT * This); +BOOL event_redirect(RDPCLIENT * This, uint32 flags, uint32 server_len, wchar_t * server, uint32 cookie_len, char * cookie, uint32 username_len, wchar_t * username, uint32 domain_len, wchar_t * domain, uint32 password_len, wchar_t * password); /* *INDENT-OFF* */ #ifdef __cplusplus Modified: trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h Mon Aug 21 01:02:10 2006 @@ -303,6 +303,7 @@ SOCKET sock; struct stream in; struct stream out; + long connection_timeout; } tcp; }; Modified: trunk/reactos/base/applications/tsclient/rdesktop/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/rdp.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/rdp.c Mon Aug 21 01:02:10 2006 @@ -1340,50 +1340,81 @@ static BOOL process_redirect_pdu(RDPCLIENT * This, STREAM s /*, uint32 * ext_disc_reason */ ) { - uint32 len; - - // FIXME!!! allocate the strings used here + uint32 flags; + + uint32 server_len; + wchar_t * server; + + uint32 cookie_len; + char * cookie; + + uint32 username_len; + wchar_t * username; + + uint32 domain_len; + wchar_t * domain; + + uint32 password_len; + wchar_t * password; /* these 2 bytes are unknown, seem to be zeros */ in_uint8s(s, 2); /* read connection flags */ - in_uint32_le(s, This->redirect_flags); + in_uint32_le(s, flags); /* read length of ip string */ - in_uint32_le(s, len); + in_uint32_le(s, server_len); /* read ip string */ - rdp_in_unistr(This, s, This->redirect_server, len); + server = (wchar_t *)s->p; + in_uint8s(s, server_len); /* read length of cookie string */ - in_uint32_le(s, len); + in_uint32_le(s, cookie_len); /* read cookie string (plain ASCII) */ - in_uint8a(s, This->redirect_cookie, len); - This->redirect_cookie[len] = 0; + cookie = (char *)s->p; + in_uint8s(s, cookie_len); /* read length of username string */ - in_uint32_le(s, len); + in_uint32_le(s, username_len); /* read username string */ - rdp_in_unistr(This, s, This->redirect_username, len); + username = (wchar_t *)s->p; + in_uint8s(s, username_len); /* read length of domain string */ - in_uint32_le(s, len); + in_uint32_le(s, domain_len); /* read domain string */ - rdp_in_unistr(This, s, This->redirect_domain, len); + domain = (wchar_t *)s->p; + in_uint8s(s, domain_len); /* read length of password string */ - in_uint32_le(s, len); + in_uint32_le(s, password_len); /* read password string */ - rdp_in_unistr(This, s, This->redirect_password, len); + password = (wchar_t *)s->p; + in_uint8s(s, password_len); This->redirect = True; - return True; + return event_redirect + ( + This, + flags, + server_len, + server, + cookie_len, + cookie, + username_len, + username, + domain_len, + domain, + password_len, + password + ); } /* Process incoming packets */ Modified: trunk/reactos/base/applications/tsclient/rdesktop/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/tcp.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/tcp.c Mon Aug 21 01:02:10 2006 @@ -68,17 +68,36 @@ tcp_send(RDPCLIENT * This, STREAM s) { int length = (int)(s->end - s->data); - int sent, total = 0; + int total = 0; + DWORD sent; + + OVERLAPPED overlapped; + memset(&overlapped, 0, sizeof(overlapped)); while (total < length) { - sent = send(This->tcp.sock, s->data + total, length - total, 0); - if (sent <= 0) - { - // error("send: %s\n", strerror(errno)); // EOF + WriteFile((HANDLE)This->tcp.sock, s->data + total, length - total, NULL, &overlapped); + + switch(WaitForSingleObjectEx((HANDLE)This->tcp.sock, INFINITE, TRUE)) + { + /* Success */ + case WAIT_OBJECT_0: + break; + + /* Timeout or error */ + case WAIT_TIMEOUT: + default: This->disconnect_reason = 772; + + /* Aborted, must disconnect ASAP */ + case WAIT_IO_COMPLETION: + CancelIo((HANDLE)This->tcp.sock); + break; + } + + /* Wait for completion. We could hang here, but we shouldn't */ + if(!GetOverlappedResult((HANDLE)This->tcp.sock, &overlapped, &sent, TRUE)) return False; - } total += sent; } @@ -91,7 +110,7 @@ tcp_recv(RDPCLIENT * This, STREAM s, uint32 length) { unsigned int new_length, end_offset, p_offset; - int rcvd = 0; + DWORD rcvd = 0; if (s == NULL) { @@ -137,18 +156,37 @@ while (length > 0) { + OVERLAPPED overlapped; + memset(&overlapped, 0, sizeof(overlapped)); + if (!ui_select(This, This->tcp.sock)) /* User quit */ return NULL; - rcvd = recv(This->tcp.sock, s->end, length, 0); - if (rcvd < 0) - { - // error("recv: %s\n", strerror(errno)); // EOF + ReadFile((HANDLE)This->tcp.sock, s->end, length, NULL, &overlapped); + + switch(WaitForSingleObjectEx((HANDLE)This->tcp.sock, INFINITE, TRUE)) + { + /* Success */ + case WAIT_OBJECT_0: + break; + + /* Timeout or error */ + case WAIT_TIMEOUT: + default: This->disconnect_reason = 1028; - return NULL; - } - else if (rcvd == 0) + + /* Aborted, must disconnect ASAP */ + case WAIT_IO_COMPLETION: + CancelIo((HANDLE)This->tcp.sock); + break; + } + + /* Wait for completion. We could hang here, but we shouldn't */ + if(!GetOverlappedResult((HANDLE)This->tcp.sock, &overlapped, &rcvd, TRUE)) + return False; + + if (rcvd == 0) { error("Connection closed\n"); This->disconnect_reason = 2308; @@ -232,6 +270,8 @@ servaddr.sin_family = AF_INET; servaddr.sin_port = htons(This->tcp_port_rdp); + + // TODO: apply connection timeout here if (connect(This->tcp.sock, (struct sockaddr *) &servaddr, sizeof(struct sockaddr)) < 0) {

1 0

[arty] 23626: Add the ability to specify DNS servers and make adns work right in case they are specified.
by arty＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: arty Date: Mon Aug 21 00:51:54 2006 New Revision: 23626 URL: http://svn.reactos.org/svn/reactos?rev=23626&view=rev Log: Add the ability to specify DNS servers and make adns work right in case they are specified. Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c trunk/reactos/lib/3rdparty/adns/src/adns.h trunk/reactos/lib/3rdparty/adns/src/setup.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c Mon Aug 21 00:51:54 2006 @@ -49,7 +49,7 @@ PDNS_RECORD *QueryResultSet, PVOID *Reserved ) { adns_state astate; - int quflags = 0; + int quflags = 0, i; int adns_error; adns_answer *answer; LPSTR CurrentName; @@ -62,10 +62,18 @@ adns_error = adns_init( &astate, adns_if_noenv | adns_if_noerrprint | - adns_if_noserverwarn, + adns_if_noserverwarn | + (Servers ? adns_if_noserver : 0), 0 ); + if( adns_error != adns_s_ok ) { return DnsIntTranslateAdnsToDNS_STATUS( adns_error ); + } + + if (Servers) { + for( i = 0; i < Servers->AddrCount; i++ ) { + adns_addserver( astate, *((struct in_addr *)&Servers->AddrArray[i]) ); + } } /* Modified: trunk/reactos/lib/3rdparty/adns/src/adns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/adns… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/adns.h (original) +++ trunk/reactos/lib/3rdparty/adns/src/adns.h Mon Aug 21 00:51:54 2006 @@ -95,7 +95,8 @@ adns_if_eintr= 0x0020, /* allow _wait and _synchronous to return EINTR */ adns_if_nosigpipe= 0x0040, /* applic has SIGPIPE set to SIG_IGN, do not protect */ adns_if_checkc_entex= 0x0100, /* do consistency checks on entry/exit to adns funcs */ - adns_if_checkc_freq= 0x0300 /* do consistency checks very frequently (slow!) */ + adns_if_checkc_freq= 0x0300, /* do consistency checks very frequently (slow!) */ + adns_if_noserver= 0x0800, /* do not get dns servers from the environment */ } adns_initflags; typedef enum { @@ -367,6 +368,9 @@ ADNS_API int adns_init(adns_state *newstate_r, adns_initflags flags, FILE *diagfile /*0=>stderr*/); +/* ReactOS addition */ +ADNS_API void adns_addserver(adns_state state, struct in_addr server); + ADNS_API int adns_init_strcfg(adns_state *newstate_r, adns_initflags flags, FILE *diagfile /*0=>discard*/, const char *configtext); Modified: trunk/reactos/lib/3rdparty/adns/src/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/setu… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/setup.c (original) +++ trunk/reactos/lib/3rdparty/adns/src/setup.c Mon Aug 21 00:51:54 2006 @@ -525,7 +525,7 @@ struct protoent *proto; int r; - if (!ads->nservers) { + if (!ads->nservers && !(ads->iflags & adns_if_noserver)) { if (ads->diagfile && ads->iflags & adns_if_debug) fprintf(ads->diagfile,"adns: no nameservers, using localhost\n"); ia.s_addr= htonl(INADDR_LOOPBACK); @@ -589,33 +589,35 @@ ccf_options(ads,"ADNS_RES_OPTIONS",-1,adns_res_options); #ifdef ADNS_JGAA_WIN32 - GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); - strcat(PathBuf,"\\resolv.conf"); - readconfig(ads,PathBuf,1); - GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); - strcat(PathBuf,"\\resolv-adns.conf"); - readconfig(ads,PathBuf,0); - GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); - strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv.conf"); - readconfig(ads,PathBuf,1); - GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); - strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv-adns.conf"); - readconfig(ads,PathBuf,0); - network_info_result = GetNetworkParams(network_info, &network_info_blen); - if (network_info_result != ERROR_SUCCESS){ - switch(network_info_result) { - case ERROR_BUFFER_OVERFLOW: network_err_str = "ERROR_BUFFER_OVERFLOW"; break; - case ERROR_INVALID_PARAMETER: network_err_str = "ERROR_INVALID_PARAMETER"; break; - case ERROR_NO_DATA: network_err_str = "ERROR_NO_DATA"; break; - case ERROR_NOT_SUPPORTED: network_err_str = "ERROR_NOT_SUPPORTED"; break;} - adns__diag(ads,-1,0,"GetNetworkParams() failed with error [%d] %s", - network_info_result,network_err_str); - } - else { - for(pip = &(network_info->DnsServerList); pip; pip = pip->Next) { - addr.s_addr = inet_addr(pip->IpAddress.String); - if ((addr.s_addr != INADDR_ANY) && (addr.s_addr != INADDR_NONE)) - addserver(ads, addr); + if (!(flags & adns_if_noserver)) { + GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); + strcat(PathBuf,"\\resolv.conf"); + readconfig(ads,PathBuf,1); + GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); + strcat(PathBuf,"\\resolv-adns.conf"); + readconfig(ads,PathBuf,0); + GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); + strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv.conf"); + readconfig(ads,PathBuf,1); + GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); + strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv-adns.conf"); + readconfig(ads,PathBuf,0); + network_info_result = GetNetworkParams(network_info, &network_info_blen); + if (network_info_result != ERROR_SUCCESS){ + switch(network_info_result) { + case ERROR_BUFFER_OVERFLOW: network_err_str = "ERROR_BUFFER_OVERFLOW"; break; + case ERROR_INVALID_PARAMETER: network_err_str = "ERROR_INVALID_PARAMETER"; break; + case ERROR_NO_DATA: network_err_str = "ERROR_NO_DATA"; break; + case ERROR_NOT_SUPPORTED: network_err_str = "ERROR_NOT_SUPPORTED"; break;} + adns__diag(ads,-1,0,"GetNetworkParams() failed with error [%d] %s", + network_info_result,network_err_str); + } + else { + for(pip = &(network_info->DnsServerList); pip; pip = pip->Next) { + addr.s_addr = inet_addr(pip->IpAddress.String); + if ((addr.s_addr != INADDR_ANY) && (addr.s_addr != INADDR_NONE)) + addserver(ads, addr); + } } } #else @@ -730,3 +732,8 @@ if (context_r) *context_r= qu->ctx.ext; return qu; } + +/* ReactOS addition */ +void adns_addserver(adns_state ads, struct in_addr addr) { + addserver(ads, addr); +}

1 0

[ion] 23625: - Remove some FPU deprecated constants and use the new ones. - Deliver APCs on return from context switch with pending kernel APCs.
by ion＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: ion Date: Mon Aug 21 00:27:03 2006 New Revision: 23625 URL: http://svn.reactos.org/svn/reactos?rev=23625&view=rev Log: - Remove some FPU deprecated constants and use the new ones. - Deliver APCs on return from context switch with pending kernel APCs. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/fpu.c trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Mon Aug 21 00:27:03 2006 @@ -42,11 +42,6 @@ #define DR7_ACTIVE 0x00000055 /* If any of these bits are set, a Dr is active */ -/* Possible values for KTHREAD's NpxState */ -#define NPX_STATE_INVALID 0x01 -#define NPX_STATE_VALID 0x02 -#define NPX_STATE_DIRTY 0x04 - #define FRAME_EDITED 0xFFF8 #ifndef __ASM__ Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/fpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/fpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c Mon Aug 21 00:27:03 2006 @@ -330,10 +330,10 @@ ULONG Cr0; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if (Thread->NpxState & NPX_STATE_VALID) + if (Thread->NpxState & NPX_STATE_LOADED) { FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof (FX_SAVE_AREA)); - if (Thread->NpxState & NPX_STATE_DIRTY) + if (Thread->NpxState & NPX_STATE_NOT_LOADED) { ASSERT(KeGetCurrentPrcb()->NpxThread == Thread); @@ -349,7 +349,7 @@ KeGetCurrentPrcb()->NpxThread = NULL; } Ke386SetCr0(Cr0); - Thread->NpxState = NPX_STATE_VALID; + Thread->NpxState = NPX_STATE_LOADED; } } KeLowerIrql(OldIrql); @@ -382,7 +382,7 @@ CurrentThread = KeGetCurrentThread(); ASSERT(CurrentThread != NULL); - CurrentThread->NpxState |= NPX_STATE_DIRTY; + CurrentThread->NpxState |= NPX_STATE_NOT_LOADED; KeLowerIrql(oldIrql); DPRINT("Device not present exception handled!\n"); Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Mon Aug 21 00:27:03 2006 @@ -210,7 +210,6 @@ DPRINT("Dispatching Thread as blocked\n"); ApcState = KiDispatchThreadNoLock(Waiting); -#if 0 /* Check if we need to deliver APCs */ if (ApcState) { @@ -221,7 +220,6 @@ KiDeliverApc(KernelMode, NULL, NULL); ASSERT(CurrentThread->WaitIrql == 0); } -#endif /* Lower IRQL back to what it was */ KfLowerIrql(CurrentThread->WaitIrql);

1 0

[ion] 23624: - Don't use EFLAGS to store the Wait IRQL, just push directly, it's cleaner. - Detect if kernel APCs are pending and request APC_LEVEL software interrupt from HAL if they are, returning with the right apc status. - Also update INT21 VDM Descriptor handler when updating LDT descriptor.
by ion＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: ion Date: Mon Aug 21 00:09:25 2006 New Revision: 23624 URL: http://svn.reactos.org/svn/reactos?rev=23624&view=rev Log: - Don't use EFLAGS to store the Wait IRQL, just push directly, it's cleaner. - Detect if kernel APCs are pending and request APC_LEVEL software interrupt from HAL if they are, returning with the right apc status. - Also update INT21 VDM Descriptor handler when updating LDT descriptor. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/thread.c Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Mon Aug 21 00:09:25 2006 @@ -115,14 +115,11 @@ .globl @KiSwapContextInternal@0 @KiSwapContextInternal@0: - /* Save WaitIrql APC-bypass in EFLAGS */ - or cl, cl - /* Set the Thread to running */ mov byte ptr [esi+KTHREAD_STATE], Running - /* Save the flags */ - pushf + /* Save the IRQL */ + push ecx /* Save the Exception list */ push [ebx+KPCR_EXCEPTION_LIST] @@ -224,11 +221,34 @@ /* Restore exception list */ pop [ebx+KPCR_EXCEPTION_LIST] - /* Retore EFLAGS */ - popf - - /* Return no APC pending */ + /* Restore IRQL */ + pop ecx + + /* Check if kernel APCs are pending */ + cmp byte ptr [esi+KTHREAD_PENDING_KERNEL_APC], 0 + jnz CheckApc + + /* No APCs, return */ xor eax, eax + ret + +CheckApc: + + /* Check if they're disabled */ + cmp word ptr [esi+KTHREAD_SPECIAL_APC_DISABLE], 0 + jnz ApcReturn + test cl, cl + jz ApcReturn + + /* Request APC Delivery */ + mov cl, APC_LEVEL + call @HalRequestSoftwareInterrupt@4 + or eax, esp + +ApcReturn: + + /* Return with APC pending */ + setz al ret LdtStuff: @@ -240,6 +260,13 @@ mov eax, [edi+KPROCESS_LDT_DESCRIPTOR1] mov [ecx+KGDT_LDT+4], eax + /* Write the INT21 handler */ + mov ecx, [ebx+KPCR_IDT] + mov eax, [ebp+KPROCESS_INT21_DESCRIPTOR0] + mov [ecx+0x108], eax + mov eax, [ebp+KPROCESS_INT21_DESCRIPTOR1] + mov [ecx+0x10C], eax + /* Save LDT Selector */ mov eax, KGDT_LDT jmp LoadLdt Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thread.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thread.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c Mon Aug 21 00:09:25 2006 @@ -15,7 +15,7 @@ typedef struct _KSHARED_CTXSWITCH_FRAME { PVOID ExceptionList; - ULONG Flags; + KIRQL WaitIrql; PVOID RetEip; } KSHARED_CTXSWITCH_FRAME, *PKSHARED_CTXSWITCH_FRAME; @@ -231,7 +231,7 @@ /* And set up the Context Switch Frame */ CtxSwitchFrame->RetEip = KiThreadStartup; - CtxSwitchFrame->Flags = EFLAGS_INTERRUPT_MASK; + CtxSwitchFrame->WaitIrql = APC_LEVEL; CtxSwitchFrame->ExceptionList = (PVOID)0xFFFFFFFF; /* Save back the new value of the kernel stack. */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs