Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 25987: - Wrap some KDBG-specific initialization in _WINKD_ guard. - Remove KdpDetectConflicts since our serial driver correctly uses KdComPortInUse for this (and kdcom fills it out).
by ion＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: ion Date: Sun Mar 4 23:28:18 2007 New Revision: 25987 URL: http://svn.reactos.org/svn/reactos?rev=25987&view=rev Log: - Wrap some KDBG-specific initialization in _WINKD_ guard. - Remove KdpDetectConflicts since our serial driver correctly uses KdComPortInUse for this (and kdcom fills it out). Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/kd/kdio.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Sun Mar 4 23:28:18 2007 @@ -517,11 +517,13 @@ /* Mark the system boot partition */ if (!IopMarkBootPartition(LoaderBlock)) return FALSE; +#ifndef _WINKD_ /* Read KDB Data */ KdbInit(); /* I/O is now setup for disk access, so phase 3 */ KdInitSystem(3, LoaderBlock); +#endif /* Load services for devices found by PnP manager */ IopInitializePnpServices(IopRootDeviceNode, FALSE); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Sun Mar 4 23:28:18 2007 @@ -89,16 +89,6 @@ *ConflictDetected = FALSE; - /* FIXME: Manually indicate conflicts with KD Ports */ - if (DriverList) - { - if (KdpDetectConflicts(DriverList)) - { - *ConflictDetected = TRUE; - return STATUS_CONFLICTING_ADDRESSES; - } - } - if (PopSystemPowerDeviceNode != NULL && DriverListSize > 0) { /* We hope legacy devices will be enumerated by ACPI */ Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=259… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c Sun Mar 4 23:28:18 2007 @@ -239,43 +239,6 @@ /* GENERAL FUNCTIONS *********************************************************/ -BOOLEAN -STDCALL -KdpDetectConflicts(PCM_RESOURCE_LIST DriverList) -{ - ULONG ComPortBase = 0; - ULONG i; - PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; - - /* Select the COM Port Base */ - switch (KdpPort) - { - case 1: ComPortBase = 0x3f8; break; - case 2: ComPortBase = 0x2f8; break; - case 3: ComPortBase = 0x3e8; break; - case 4: ComPortBase = 0x2e8; break; - } - - /* search for this port address in DriverList */ - for (i = 0; i < DriverList->List[0].PartialResourceList.Count; i++) - { - ResourceDescriptor = &DriverList->List[0].PartialResourceList.PartialDescriptors[i]; - if (ResourceDescriptor->Type == CmResourceTypePort) - { - if ((ResourceDescriptor->u.Port.Start.u.LowPart <= ComPortBase) && - (ResourceDescriptor->u.Port.Start.u.LowPart + - ResourceDescriptor->u.Port.Length > ComPortBase)) - { - /* Conflict found */ - return TRUE; - } - } - } - - /* No Conflicts */ - return FALSE; -} - ULONG STDCALL KdpPrintString(LPSTR String,

1 0

[ion] 25986: - Add kd64.h header from branch and format it nicely. - Add support for _WINKD_ definition to use kd64.h instead of kd.h, as well as disable usage of rossym.h - Add KdSystemDebugControl, NtSet/QueryDebugFilterState to kdapi.c for the KD64 code.
by ion＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: ion Date: Sun Mar 4 22:54:39 2007 New Revision: 25986 URL: http://svn.reactos.org/svn/reactos?rev=25986&view=rev Log: - Add kd64.h header from branch and format it nicely. - Add support for _WINKD_ definition to use kd64.h instead of kd.h, as well as disable usage of rossym.h - Add KdSystemDebugControl, NtSet/QueryDebugFilterState to kdapi.c for the KD64 code. Added: trunk/reactos/ntoskrnl/include/internal/kd64.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kd64/kdapi.c Added: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h (added) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h Sun Mar 4 22:54:39 2007 @@ -1,0 +1,265 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/include/kd64.h + * PURPOSE: Internal header for the KD64 Library + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +// +// Breakpoint Status Flags +// +typedef enum _KDP_BREAKPOINT_FLAGS +{ + KdpBreakpointActive = 1, + KdpBreakpointPending = 2, + KdpBreakpointSuspended = 4, + KdpBreakpointExpired = 8 +} KDP_BREAKPOINT_FLAGS; + +// +// Structure for Breakpoints +// +typedef struct _BREAKPOINT_ENTRY +{ + ULONG Flags; + PKPROCESS Process; + PVOID Address; + UCHAR Content; +} BREAKPOINT_ENTRY, *PBREAKPOINT_ENTRY; + +// +// Debug and Multi-Processor Switch Routine Definitions +// +typedef +BOOLEAN +(NTAPI *PKDEBUG_ROUTINE)( + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChance +); + +typedef +BOOLEAN +(NTAPI *PKDEBUG_SWITCH_ROUTINE)( + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN BOOLEAN SecondChance +); + +// +// Debug and Multi-Processor Switch Routines +// +BOOLEAN +NTAPI +KdpEnterDebuggerException( + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChance +); + +BOOLEAN +NTAPI +KdpSwitchProcessor( + IN PEXCEPTION_RECORD ExceptionRecord, + IN OUT PCONTEXT ContextRecord, + IN BOOLEAN SecondChanceException +); + +// +// Time Slip Support +// +VOID +NTAPI +KdpTimeSlipWork( + IN PVOID Context +); + +VOID +NTAPI +KdpTimeSlipDpcRoutine( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2 +); + +// +// Debug Trap Handlers +// +BOOLEAN +NTAPI +KdpStub( + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException +); + +BOOLEAN +NTAPI +KdpTrap( + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException +); + +// +// Port Locking +// +VOID +NTAPI +KdpPortLock( + VOID +); + +VOID +NTAPI +KdpPortUnlock( + VOID +); + +BOOLEAN +NTAPI +KdpPollBreakInWithPortLock( + VOID +); + +// +// Debugger Enable, Enter and Exit +// +BOOLEAN +NTAPI +KdEnterDebugger( + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame +); + +VOID +NTAPI +KdExitDebugger( + IN BOOLEAN Entered +); + +NTSTATUS +NTAPI +KdEnableDebuggerWithLock( + IN BOOLEAN NeedLock +); + +// +// Debug Event Handlers +// +ULONG +NTAPI +KdpPrint( + IN ULONG ComponentId, + IN ULONG ComponentMask, + IN LPSTR String, + IN ULONG Length, + IN KPROCESSOR_MODE PreviousMode, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + OUT PBOOLEAN Status +); + +ULONG +NTAPI +KdpSymbol( + IN PSTRING DllPath, + IN PKD_SYMBOLS_INFO DllBase, + IN BOOLEAN Unload, + IN KPROCESSOR_MODE PreviousMode, + IN PCONTEXT ContextRecord, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame +); + +// +// State Change Notifications +// +BOOLEAN +NTAPI +KdpReportLoadSymbolsStateChange( + IN PSTRING PathName, + IN PKD_SYMBOLS_INFO SymbolInfo, + IN BOOLEAN Unload, + IN OUT PCONTEXT Context +); + +BOOLEAN +NTAPI +KdpReportExceptionStateChange( + IN PEXCEPTION_RECORD ExceptionRecord, + IN OUT PCONTEXT Context, + IN BOOLEAN SecondChanceException +); + +// +// Breakpoint Support +// +VOID +NTAPI +KdpRestoreAllBreakpoints( + VOID +); + +BOOLEAN +NTAPI +KdpDeleteBreakpoint( + IN ULONG BpEntry +); + +// +// Global KD Data +// +extern DBGKD_GET_VERSION64 KdVersionBlock; +extern KDDEBUGGER_DATA64 KdDebuggerDataBlock; +extern LIST_ENTRY KdpDebuggerDataListHead; +extern KSPIN_LOCK KdpDataSpinLock; +extern LARGE_INTEGER KdPerformanceCounterRate; +extern LARGE_INTEGER KdTimerStart; +extern ULONG KdDisableCount; +extern KD_CONTEXT KdpContext; +extern PKDEBUG_ROUTINE KiDebugRoutine; +extern PKDEBUG_SWITCH_ROUTINE KiDebugSwitchRoutine; +extern BOOLEAN KdBreakAfterSymbolLoad; +extern BOOLEAN KdPitchDebugger; +extern BOOLEAN _KdDebuggerNotPresent; +extern BOOLEAN _KdDebuggerEnabled; +extern BOOLEAN KdAutoEnableOnEvent; +extern BOOLEAN KdPreviouslyEnabled; +extern BOOLEAN KdpDebuggerStructuresInitialized; +extern BOOLEAN KdEnteredDebugger; +extern KDPC KdpTimeSlipDpc; +extern KTIMER KdpTimeSlipTimer; +extern WORK_QUEUE_ITEM KdpTimeSlipWorkItem; +extern LONG KdpTimeSlipPending; +extern PKEVENT KdpTimeSlipEvent; +extern KSPIN_LOCK KdpTimeSlipEventLock; +extern BOOLEAN KdpControlCPressed; +extern BOOLEAN KdpControlCWaiting; +extern BOOLEAN KdpPortLocked; +extern KSPIN_LOCK KdpDebuggerLock; +extern LARGE_INTEGER KdTimerStop, KdTimerStart, KdTimerDifference; +extern ULONG KdComponentTableSize; +extern ULONG Kd_WIN2000_Mask; +extern PULONG KdComponentTable[104]; +extern CHAR KdpMessageBuffer[4096], KdpPathBuffer[4096]; +extern BREAKPOINT_ENTRY KdpBreakpointTable[20]; +extern ULONG KdpBreakpointInstruction; +extern BOOLEAN KdpOweBreakpoint; +extern BOOLEAN BreakpointsSuspended; +extern ULONG KdpNumInternalBreakpoints; +extern ULONG KdpCurrentSymbolStart, KdpCurrentSymbolEnd; Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Sun Mar 4 22:54:39 2007 @@ -36,7 +36,11 @@ #include "po.h" #include "se.h" #include "ldr.h" +#ifndef _WINKD_ #include "kd.h" +#else +#include "kd64.h" +#endif #include "fsrtl.h" #include "lpc.h" #include "rtl.h" Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h Sun Mar 4 22:54:39 2007 @@ -50,7 +50,6 @@ #include <reactos/bugcodes.h> #define ExRaiseStatus RtlRaiseStatus #include <reactos/probe.h> -#include <reactos/rossym.h> /* SetupLDR Support */ #include <arc/setupblk.h> @@ -59,6 +58,9 @@ #include <windbgkd.h> #include <wdbgexts.h> #include <kddll.h> +#ifndef _WINKD_ +#include <reactos/rossym.h> +#endif /* PNP GUIDs */ #include <umpnpmgr/sysguid.h> Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c Sun Mar 4 22:54:39 2007 @@ -328,6 +328,9 @@ return STATUS_SUCCESS; } +/* + * @unimplemented + */ NTSTATUS NTAPI KdSystemDebugControl(IN SYSDBG_COMMAND Command, Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c Sun Mar 4 22:54:39 2007 @@ -1156,3 +1156,37 @@ return KdEnableDebuggerWithLock(TRUE); } +/* +* @unimplemented +*/ +NTSTATUS +NTAPI +KdSystemDebugControl(IN SYSDBG_COMMAND Command, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN OUT PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode) +{ + /* HACK */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NtQueryDebugFilterState(ULONG ComponentId, + ULONG Level) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NtSetDebugFilterState(ULONG ComponentId, + ULONG Level, + BOOLEAN State) +{ + return STATUS_SUCCESS; +} +

1 0

[ion] 25985: - Enable stubs in kdcom to actually be exported (to simplfiy compatibility with KD Branch, which won't be needed soon thanks to a build flag). - Enable call to KdDebuggerInitialize1 even in trunk, since it doesn't do anything. - Make i8042prt stop using a reactos-only kernel export hack (KdpServiceDispatcher), and use KdSystemDebugControl instead, which is the NT version and fully-exported. - Implement a stub KdSystemDebugControl and export it.
by ion＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: ion Date: Sun Mar 4 22:20:03 2007 New Revision: 25985 URL: http://svn.reactos.org/svn/reactos?rev=25985&view=rev Log: - Enable stubs in kdcom to actually be exported (to simplfiy compatibility with KD Branch, which won't be needed soon thanks to a build flag). - Enable call to KdDebuggerInitialize1 even in trunk, since it doesn't do anything. - Make i8042prt stop using a reactos-only kernel export hack (KdpServiceDispatcher),and use KdSystemDebugControl instead, which is the NT version and fully-exported. - Implement a stub KdSystemDebugControl and export it. Modified: trunk/reactos/drivers/base/kdcom/kdcom.def trunk/reactos/drivers/input/i8042prt/keyboard.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/drivers/base/kdcom/kdcom.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.d… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.def (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.def Sun Mar 4 22:20:03 2007 @@ -1,6 +1,7 @@ LIBRARY kdcom.dll EXPORTS +; Old KD KdPortGetByte@4 KdPortGetByteEx@8 KdPortInitialize@12 @@ -13,3 +14,11 @@ KdPortSave@0 KdPortDisableInterrupts@0 KdPortEnableInterrupts@0 + +; New KD +KdDebuggerInitialize0@4 +KdDebuggerInitialize1@4 +KdSave@4 +KdRestore@4 +KdReceivePacket@20 +KdSendPacket@16 Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c Sun Mar 4 22:20:03 2007 @@ -12,6 +12,7 @@ /* INCLUDES ****************************************************************/ #include "i8042prt.h" +#include "kdfuncs.h" #define NDEBUG #include <debug.h> @@ -750,10 +751,6 @@ } /* debug stuff */ -VOID STDCALL -KdpServiceDispatcher(ULONG Code, PVOID Context1, PVOID Context2); -#define EnterDebugger ((PVOID)0x25) - static VOID STDCALL I8042DebugWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context) { @@ -771,6 +768,6 @@ /* We hope kernel would understand this. If * that's not the case, nothing would happen. */ - KdpServiceDispatcher(TAG('R', 'o', 's', ' '), (PVOID)Key, NULL); + KdSystemDebugControl(TAG('R', 'o', 's', ' '), (PVOID)Key, 0, NULL, 0, NULL, KernelMode); #endif /* __REACTOS__ */ } Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=259… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Mar 4 22:20:03 2007 @@ -1172,7 +1172,7 @@ HalReportResourceUsage(); /* Call the debugger DLL once we have KD64 6.0 support */ - //KdDebuggerInitialize1(LoaderBlock); + KdDebuggerInitialize1(LoaderBlock); /* Setup PnP Manager in phase 1 */ if (!PpInitSystem()) KeBugCheck(PP1_INITIALIZATION_FAILED); @@ -1255,3 +1255,5 @@ MmZeroPageThreadMain(NULL); } + + Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c Sun Mar 4 22:20:03 2007 @@ -328,6 +328,20 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +KdSystemDebugControl(IN SYSDBG_COMMAND Command, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN OUT PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode) +{ + /* HACK */ + return KdpServiceDispatcher(Command, InputBuffer, InputBufferLength); +} + PKDEBUG_ROUTINE KiDebugRoutine = KdpEnterDebuggerException; /* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Sun Mar 4 22:20:03 2007 @@ -528,6 +528,7 @@ KdPollBreakIn@0 KdPowerTransition@4 KdpServiceDispatcher@12 +KdSystemDebugControl@28 Ke386CallBios@8 @KeAcquireGuardedMutex@4 @KeAcquireGuardedMutexUnsafe@4

1 0

[ion] 25984: - Fix a bug in KeQueryPerformanceCounter which was reading the flags in ESI instead of ECX. - Fix a bug in KeQueryPerformanceCounter which wasn't handling the possibility of an invalid counter value. - Don't disable/enable interrupts in HalpInitializeClock and HalCalibratePerformanceCounter. Instead, save the flags, disable, and then restore flags, so that if interrupts were disabled initially, they'll remain that way. - Make KeUpdateRunTime and KeUpdateSystemTime support KPRCB->Ski
by ion＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: ion Date: Sun Mar 4 22:06:34 2007 New Revision: 25984 URL: http://svn.reactos.org/svn/reactos?rev=25984&view=rev Log: - Fix a bug in KeQueryPerformanceCounter which was reading the flags in ESI instead of ECX. - Fix a bug in KeQueryPerformanceCounter which wasn't handling the possibility of an invalid counter value. - Don't disable/enable interrupts in HalpInitializeClock and HalCalibratePerformanceCounter. Instead, save the flags, disable, and then restore flags, so that if interrupts were disabled initially, they'll remain that way. - Make KeUpdateRunTime and KeUpdateSystemTime support KPRCB->SkipTick. - Atomically check for DPC routine active by referencing fs. Also update Debug DPC time. - Add support for detecting break-in during KeUpdateSystemTime. - DPC Routine active is a BOOLEAN, not a ULONG. Fix the check in KeUpdateRunTime since this might've messed up a lot of things. - Temporarily disable DbgBreakPoint during DbgPrint. - Hang in KeQueryPerformanceCounter while WinDBG is connected is now fixed, as well as DbgPrint support. WinDBG can now remain connected and show all the DebugPrints! (But GUI doesn't boot -- yet). Modified: trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/include/ndk/asm.h trunk/reactos/lib/rtl/debug.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/systimer.S Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Sun Mar 4 22:06:34 2007 @@ -100,9 +100,9 @@ /* Check if someone updated the counter */ cmp eax, ebx - jne LoopPostInt + jnz LoopPostInt cmp edx, esi - jne LoopPostInt + jnz LoopPostInt /* Check if the current 8254 value causes rollover */ neg ecx @@ -180,21 +180,35 @@ or ecx, esi jz BelowLow + /* Make sure that the count is still valid */ + sub ebx, eax + sbb esi, edx + jnz InvalidCount + cmp ebx, _HalpCurrentRollOver + jg InvalidCount + /* Fixup the count with the last known value */ sub eax, ebx sbb edx, esi /* We might have an incoming interrupt, save EFLAGS */ - mov esi, [esp] + mov ecx, [esp] popf /* Check if interrupts were enabled and try again */ - test esi, EFLAGS_INTERRUPT_MASK + test ecx, EFLAGS_INTERRUPT_MASK jnz LoopPreInt /* They're not, continue where we left */ pushf jmp BelowLow + +InvalidCount: + popf + xor eax, eax + mov _HalpLastPerfCounterLow, eax + mov _HalpLastPerfCounterHigh, eax + jmp LoopPreInt .endfunc .globl _HalpClockInterrupt@0 Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c (original) +++ trunk/reactos/hal/halx86/generic/timer.c Sun Mar 4 22:06:34 2007 @@ -48,6 +48,7 @@ PKPRCB Prcb = KeGetCurrentPrcb(); ULONG Increment; USHORT RollOver; + ULONG Flags = 0; /* Check the CPU Type */ if (Prcb->CpuType <= 4) @@ -66,6 +67,7 @@ KeSetTimeIncrement(Increment, HalpRolloverTable[0].HighPart); /* Disable interrupts */ + Ke386SaveFlags(Flags); _disable(); /* Set the rollover */ @@ -73,8 +75,8 @@ __outbyte(TIMER_DATA_PORT0, RollOver & 0xFF); __outbyte(TIMER_DATA_PORT0, RollOver >> 8); - /* Restore interrupts */ - _enable(); + /* Restore interrupts if they were previously enabled */ + Ke386RestoreFlags(Flags); /* Save rollover and return */ HalpCurrentRollOver = RollOver; @@ -90,18 +92,20 @@ HalCalibratePerformanceCounter(IN volatile PLONG Count, IN ULONGLONG NewCount) { + ULONG Flags = 0; + /* Disable interrupts */ + Ke386SaveFlags(Flags); _disable(); /* Do a decrement for this CPU */ - //_InterlockedDecrement(Count); - InterlockedDecrement(Count); + _InterlockedDecrement(Count); /* Wait for other CPUs */ while (*Count); - /* Bring interrupts back */ - _enable(); + /* Restore interrupts if they were previously enabled */ + Ke386RestoreFlags(Flags); } /* Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2598… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Sun Mar 4 22:06:34 2007 @@ -202,6 +202,7 @@ #define KPCR_PRCB_DEBUG_DPC_TIME 0x654 #define KPCR_PRCB_INTERRUPT_TIME 0x658 #define KPCR_PRCB_ADJUST_DPC_THRESHOLD 0x65C +#define KPCR_PRCB_SKIP_TICK 0x664 #define KPCR_SYSTEM_CALLS 0x6B8 #define KPCR_PRCB_DPC_QUEUE_DEPTH 0xA4C #define KPCR_PRCB_DPC_COUNT 0xA50 Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=25984&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c (original) +++ trunk/reactos/lib/rtl/debug.c Sun Mar 4 22:06:34 2007 @@ -142,7 +142,7 @@ if (Status == STATUS_BREAKPOINT) { /* Breakpoint */ - DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + //DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); Status = STATUS_SUCCESS; } } Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Mar 4 22:06:34 2007 @@ -237,7 +237,7 @@ if (KeFeatureBits & KF_MTRR) { /* Then manually initialize MTRR for the CPU */ - KiInitializeMTRR((BOOLEAN)i ? FALSE : TRUE); + KiInitializeMTRR(i ? FALSE : TRUE); } /* Check if we have AMD MTRR and initialize it for the CPU */ Modified: trunk/reactos/ntoskrnl/ke/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/systimer.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/systimer.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/systimer.S Sun Mar 4 22:06:34 2007 @@ -59,6 +59,10 @@ /* Get KPCR */ mov eax, [fs:KPCR_SELF] + /* Check if this tick is getting skipped */ + cmp byte ptr [eax+KPCR_PRCB_SKIP_TICK], 0 + jnz SkipTick + /* Save EBX */ push ebx @@ -84,11 +88,12 @@ ja AboveDispatch /* Check if the DPC routine is active */ - cmp dword ptr[eax+KPCR_PRCB_DPC_ROUTINE_ACTIVE], 0 + cmp byte ptr fs:[KPCR_PRCB_DPC_ROUTINE_ACTIVE], 0 jz BelowDispatch /* At dispatch, increase DPC time */ inc dword ptr [eax+KPCR_PRCB_DPC_TIME] + inc dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME] jmp AfterSet AboveDispatch: @@ -185,11 +190,20 @@ /* Restore ebx and return */ pop ebx ret 4 + +SkipTick: + /* Disable skipping the next tick and return */ + mov byte ptr [eax+KPCR_PRCB_SKIP_TICK], 0 + ret 4 .endfunc .globl _KeUpdateSystemTime@0 .func KeUpdateSystemTime@0 _KeUpdateSystemTime@0: + + /* Check if this tick is getting skipped */ + cmp byte ptr fs:[KPCR_PRCB_SKIP_TICK], 0 + jnz SkipTickSys /* Get shared data in ECX */ mov ecx, USER_SHARED_DATA @@ -296,9 +310,12 @@ call @HalRequestSoftwareInterrupt@4 DebugCheck: - /* FIXME: Check for KdDebuggerEnabled */ + /* Check if the debugger is enabled */ + cmp dword ptr __KdDebuggerEnabled, 0 + jnz DebuggerEnabled /* Check if this was a full tick */ +NoDebug: cmp dword ptr _KiTickOffset, 0 jg IncompleteTick2 @@ -320,4 +337,20 @@ cli call _HalEndSystemInterrupt@8 jmp _Kei386EoiHelper@0 + +DebuggerEnabled: + /* Check for break-in request */ + call _KdPollBreakIn@0 + or al, al + jz NoDebug + + /* Break-in requested! */ + push 1 + call _DbgBreakPointWithStatus@4 + jmp NoDebug + +SkipTickSys: + /* Disable skipping the next tick and return */ + mov byte ptr fs:[KPCR_PRCB_SKIP_TICK], 0 + jmp IncompleteTick2 .endfunc

1 0

[ekohl] 25983: Translate german resources.
by ekohl＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: ekohl Date: Sun Mar 4 21:47:12 2007 New Revision: 25983 URL: http://svn.reactos.org/svn/reactos?rev=25983&view=rev Log: Translate german resources. Modified: trunk/reactos/dll/cpl/desk/de.rc Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Sun Mar 4 21:47:12 2007 @@ -140,8 +140,8 @@ IDR_PREVIEW_MENU MENU BEGIN MENUITEM "Normal", ID_MENU_NORMAL - MENUITEM "Disabled", ID_MENU_DISABLED - MENUITEM "Selected", ID_MENU_SELECTED + MENUITEM "Deaktiviert", ID_MENU_DISABLED + MENUITEM "Ausgewählt", ID_MENU_SELECTED END STRINGTABLE @@ -172,11 +172,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INACTWIN "Inactive Window" - IDS_ACTWIN "Active Window" - IDS_WINTEXT "Window Text" - IDS_MESSBOX "Message Box" - IDS_MESSTEXT "Message Text" + IDS_INACTWIN "Inaktives Fenster" + IDS_ACTWIN "Aktives Fenster" + IDS_WINTEXT "Fenstertext" + IDS_MESSBOX "Dialogfeld" + IDS_MESSTEXT "Dialogfeldtext" IDS_BUTTEXT "OK" END @@ -185,8 +185,8 @@ IDS_ELEMENT_1 "Desktop" IDS_ELEMENT_2 "Titelleiste der inaktiven Fenster" IDS_ELEMENT_3 "Rahmen der inaktiven Fenster" - IDS_ELEMENT_4 "Titelleiste der aktiven Fenster" - IDS_ELEMENT_5 "Rahmen der Aktiven Fenster" + IDS_ELEMENT_4 "Titelleiste des aktiven Fensters" + IDS_ELEMENT_5 "Rahmen des aktiven Fensters" IDS_ELEMENT_6 "Menü" IDS_ELEMENT_7 "Markierte Elemente" IDS_ELEMENT_8 "Fenster"

1 0

[ekohl] 25982: - Show disables and selected menu items. - User the caption font to display the window text.
by ekohl＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: ekohl Date: Sun Mar 4 21:41:47 2007 New Revision: 25982 URL: http://svn.reactos.org/svn/reactos?rev=25982&view=rev Log: - Show disables and selected menu items. - User the caption font to display the window text. Modified: trunk/reactos/dll/cpl/desk/preview.c Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c (original) +++ trunk/reactos/dll/cpl/desk/preview.c Sun Mar 4 21:41:47 2007 @@ -186,14 +186,13 @@ /* Load and modify the menu */ pPreviewData->hMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_PREVIEW_MENU)); - EnableMenuItem(pPreviewData->hMenu, ID_MENU_DISABLED, - MF_BYCOMMAND | MF_DISABLED); + EnableMenuItem(pPreviewData->hMenu, + 1, MF_BYPOSITION | MF_GRAYED); HiliteMenuItem(hwnd, pPreviewData->hMenu, - ID_MENU_SELECTED, MF_BYCOMMAND | MF_HILITE); + 2, MF_BYPOSITION | MF_HILITE); // GetMenuItemRect(hwnd, pPreviewData->hMenu, -// ID_MENU_SELECTED, &pPreviewData->rcSelectedMenuItem); - +// 2, &pPreviewData->rcSelectedMenuItem); AllocAndLoadString(&pPreviewData->lpInAct, hApplet, IDS_INACTWIN); AllocAndLoadString(&pPreviewData->lpAct, hApplet, IDS_ACTWIN); @@ -382,7 +381,7 @@ rc.left += 4; rc.top += 2; SetTextColor(hdc, pPreviewData->clrWindowText); - hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); + hOldFont = SelectObject(hdc, pPreviewData->hCaptionFont); DrawText(hdc, pPreviewData->lpWinTxt, lstrlen(pPreviewData->lpWinTxt), &rc, DT_LEFT); SelectObject(hdc, hOldFont); @@ -444,11 +443,11 @@ if (PtInRect(&pPreviewData->rcActiveCaptionButtons, pt)) type = IDX_CAPTION_BUTTON; +// if (PtInRect(&pPreviewData->rcSelectedMenuItem, pt)) +// type = IDX_SELECTION; + if (PtInRect(&pPreviewData->rcActiveMenuBar, pt)) type = IDX_MENU; - -// if (PtInRect(&pPreviewData->rcSelectedMenuItem, pt)) -// type = IDX_SELECTION; if (PtInRect(&pPreviewData->rcActiveClient, pt)) type = IDX_WINDOW;

1 0

[greatlrd] 25981: split up all testcase to own file. the size are growning
by greatlrd＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: greatlrd Date: Sun Mar 4 14:57:44 2007 New Revision: 25981 URL: http://svn.reactos.org/svn/reactos?rev=25981&view=rev Log: split up all testcase to own file. the size are growning Added: trunk/rosapps/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c (with props) trunk/rosapps/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c (with props) trunk/rosapps/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c (with props) Modified: trunk/rosapps/dxtest/win32kdxtest/main.c trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild Added: trunk/rosapps/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/NtGdiD… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c (added) +++ trunk/rosapps/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c Sun Mar 4 14:57:44 2007 @@ -1,0 +1,33 @@ +#include <stdio.h> +/* SDK/DDK/NDK Headers. */ +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> +#include <dll/directx/d3d8thk.h> +#include "test.h" + + +/* + * Test see if we getting a DirectDrawObject from win32k + * + */ +HANDLE +test_NtGdiDdCreateDirectDrawObject() +{ + HANDLE retValue=0; + int fails=0; + HDC hdc=CreateDCW(L"Display",NULL,NULL,NULL); + + printf("Start testing of NtGdiDdCreateDirectDrawObject\n"); + + retValue = OsThunkDdCreateDirectDrawObject(NULL); + testing_noteq(retValue,NULL,fails,"NtGdiDdCreateDirectDrawObject(NULL);\0"); + + retValue = OsThunkDdCreateDirectDrawObject(hdc); + testing_eq(retValue,NULL,fails,"NtGdiDdCreateDirectDrawObject(hdc);\0"); + + show_status(fails, "NtGdiDdCreateDirectDrawObject\0"); + + return retValue; +} Propchange: trunk/rosapps/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/NtGdiD… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c (added) +++ trunk/rosapps/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c Sun Mar 4 14:57:44 2007 @@ -1,0 +1,28 @@ +#include <stdio.h> +/* SDK/DDK/NDK Headers. */ +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> +#include <dll/directx/d3d8thk.h> +#include "test.h" + +/* + * Test see if we can delete a DirectDrawObject from win32k + * + */ +void +test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) +{ + int fails=0; + BOOL retValue=FALSE; + printf("Start testing of NtGdiDdDeleteDirectDrawObject\n"); + + retValue = OsThunkDdDeleteDirectDrawObject(hDirectDrawLocal); + testing_eq(retValue,FALSE,fails,"NtGdiDdDeleteDirectDrawObject(hDirectDrawLocal);\0"); + + retValue = OsThunkDdDeleteDirectDrawObject(NULL); + testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0"); + + show_status(fails, "NtGdiDdDeleteDirectDrawObject\0"); +} Propchange: trunk/rosapps/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/NtGdiD… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c (added) +++ trunk/rosapps/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c Sun Mar 4 14:57:44 2007 @@ -1,0 +1,251 @@ +#include <stdio.h> +/* SDK/DDK/NDK Headers. */ +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> +#include <dll/directx/d3d8thk.h> +#include "test.h" + +extern BOOL dumping_on; + +/* + * Test see if we can setup DirectDrawObject + * + */ +void +test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) +{ + int fails=0; + BOOL retValue=FALSE; + + DD_HALINFO *pHalInfo = NULL; + DWORD *pCallBackFlags = NULL; + LPD3DNTHAL_CALLBACKS puD3dCallbacks = NULL; + LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData = NULL; + PDD_D3DBUFCALLBACKS puD3dBufferCallbacks = NULL; + LPDDSURFACEDESC puD3dTextureFormats = NULL; + DWORD *puNumHeaps = NULL; + VIDEOMEMORY *puvmList = NULL; + DWORD *puNumFourCC = NULL; + DWORD *puFourCC = NULL; + + DD_HALINFO HalInfo; + DWORD CallBackFlags[4]; + D3DNTHAL_CALLBACKS D3dCallbacks; + D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; + DD_D3DBUFCALLBACKS D3dBufferCallbacks; + DDSURFACEDESC2 D3dTextureFormats[100]; + // DWORD NumHeaps = 0; + VIDEOMEMORY vmList; + // DWORD NumFourCC = 0; + //DWORD FourCC = 0; + + /* clear data */ + memset(&vmList,0,sizeof(VIDEOMEMORY)); + memset(&D3dTextureFormats,0,sizeof(DDSURFACEDESC)); + memset(&D3dBufferCallbacks,0,sizeof(DD_D3DBUFCALLBACKS)); + memset(&D3dDriverData,0,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + memset(&D3dCallbacks,0,sizeof(D3DNTHAL_CALLBACKS)); + memset(&HalInfo,0,sizeof(DD_HALINFO)); + memset(CallBackFlags,0,sizeof(DWORD)*3); + + printf("Start testing of NtGdiDdQueryDirectDrawObject\n"); + + /* testing OsThunkDdQueryDirectDrawObject( NULL, .... */ + printf("testing DdQueryDirectDrawObject( NULL, ....)\n"); + + retValue = OsThunkDdQueryDirectDrawObject( NULL, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + + /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, NULL, .... */ + printf("testing DdQueryDirectDrawObject( hDD, NULL, ....)\n"); + + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + + /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, NULL, .... */ + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, NULL, ....)\n"); + + pHalInfo = &HalInfo; + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + + if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && + (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) + { + printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\n"); + fails++; + } + + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...)"); + } + + /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, NULL, ....)\n"); + + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && + (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) + { + printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\n"); + fails++; + } + + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + } + + /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ....)\n"); + + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + + testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && + (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) + { + printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\n"); + fails++; + } + + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + /* FIXME dump puD3dCallbacks */ + } + + /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ....)\n"); + + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + + testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && + (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) + { + printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\n"); + fails++; + } + + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + /* FIXME dump puD3dCallbacks */ + /* FIXME dump puD3dDriverData */ + } + + show_status(fails, "NtGdiDdQueryDirectDrawObject\0"); +} Propchange: trunk/rosapps/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/main.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/main.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/main.c Sun Mar 4 14:57:44 2007 @@ -42,290 +42,6 @@ return 0; } -/* - * Test see if we getting a DirectDrawObject from win32k - * - */ -HANDLE -test_NtGdiDdCreateDirectDrawObject() -{ - HANDLE retValue=0; - int fails=0; - HDC hdc=CreateDCW(L"Display",NULL,NULL,NULL); - - printf("Start testing of NtGdiDdCreateDirectDrawObject\n"); - - retValue = OsThunkDdCreateDirectDrawObject(NULL); - testing_noteq(retValue,NULL,fails,"NtGdiDdCreateDirectDrawObject(NULL);\0"); - - retValue = OsThunkDdCreateDirectDrawObject(hdc); - testing_eq(retValue,NULL,fails,"NtGdiDdCreateDirectDrawObject(hdc);\0"); - - show_status(fails, "NtGdiDdCreateDirectDrawObject\0"); - - return retValue; -} - -/* - * Test see if we can setup DirectDrawObject - * - */ -void -test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) -{ - int fails=0; - BOOL retValue=FALSE; - - DD_HALINFO *pHalInfo = NULL; - DWORD *pCallBackFlags = NULL; - LPD3DNTHAL_CALLBACKS puD3dCallbacks = NULL; - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData = NULL; - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks = NULL; - LPDDSURFACEDESC puD3dTextureFormats = NULL; - DWORD *puNumHeaps = NULL; - VIDEOMEMORY *puvmList = NULL; - DWORD *puNumFourCC = NULL; - DWORD *puFourCC = NULL; - - DD_HALINFO HalInfo; - DWORD CallBackFlags[4]; - D3DNTHAL_CALLBACKS D3dCallbacks; - D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; - DD_D3DBUFCALLBACKS D3dBufferCallbacks; - DDSURFACEDESC2 D3dTextureFormats[100]; - // DWORD NumHeaps = 0; - VIDEOMEMORY vmList; - // DWORD NumFourCC = 0; - //DWORD FourCC = 0; - - /* clear data */ - memset(&vmList,0,sizeof(VIDEOMEMORY)); - memset(&D3dTextureFormats,0,sizeof(DDSURFACEDESC)); - memset(&D3dBufferCallbacks,0,sizeof(DD_D3DBUFCALLBACKS)); - memset(&D3dDriverData,0,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - memset(&D3dCallbacks,0,sizeof(D3DNTHAL_CALLBACKS)); - memset(&HalInfo,0,sizeof(DD_HALINFO)); - memset(CallBackFlags,0,sizeof(DWORD)*3); - - printf("Start testing of NtGdiDdQueryDirectDrawObject\n"); - - /* testing OsThunkDdQueryDirectDrawObject( NULL, .... */ - printf("testing DdQueryDirectDrawObject( NULL, ....)\n"); - - retValue = OsThunkDdQueryDirectDrawObject( NULL, pHalInfo, - pCallBackFlags, puD3dCallbacks, - puD3dDriverData, puD3dBufferCallbacks, - puD3dTextureFormats, puNumHeaps, - puvmList, puNumFourCC, - puFourCC); - testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - - /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, NULL, .... */ - printf("testing DdQueryDirectDrawObject( hDD, NULL, ....)\n"); - - retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, - pCallBackFlags, puD3dCallbacks, - puD3dDriverData, puD3dBufferCallbacks, - puD3dTextureFormats, puNumHeaps, - puvmList, puNumFourCC, - puFourCC); - - testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - - /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, NULL, .... */ - printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, NULL, ....)\n"); - - pHalInfo = &HalInfo; - retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, - pCallBackFlags, puD3dCallbacks, - puD3dDriverData, puD3dBufferCallbacks, - puD3dTextureFormats, puNumHeaps, - puvmList, puNumFourCC, - puFourCC); - - testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - - if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && - (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) - { - printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\n"); - fails++; - } - - if (dumping_on == TRUE) - { - dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...)"); - } - - /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ - printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, NULL, ....)\n"); - - pHalInfo = &HalInfo; - pCallBackFlags = CallBackFlags; - - RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); - - retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, - pCallBackFlags, puD3dCallbacks, - puD3dDriverData, puD3dBufferCallbacks, - puD3dTextureFormats, puNumHeaps, - puvmList, puNumFourCC, - puFourCC); - - testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); - testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); - testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); - testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); - testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); - testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); - testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); - testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); - testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); - if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && - (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) - { - printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\n"); - fails++; - } - - if (dumping_on == TRUE) - { - dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); - dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); - } - - /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ - printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ....)\n"); - - pHalInfo = &HalInfo; - pCallBackFlags = CallBackFlags; - puD3dCallbacks = &D3dCallbacks; - - RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); - RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); - - retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, - pCallBackFlags, puD3dCallbacks, - puD3dDriverData, puD3dBufferCallbacks, - puD3dTextureFormats, puNumHeaps, - puvmList, puNumFourCC, - puFourCC); - - testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); - testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); - testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); - testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); - - testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); - testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); - testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); - testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); - testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); - if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && - (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) - { - printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\n"); - fails++; - } - - if (dumping_on == TRUE) - { - dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); - dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); - /* FIXME dump puD3dCallbacks */ - } - - /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ - printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ....)\n"); - - pHalInfo = &HalInfo; - pCallBackFlags = CallBackFlags; - puD3dCallbacks = &D3dCallbacks; - puD3dDriverData = &D3dDriverData; - - RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); - RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); - RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); - - retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, - pCallBackFlags, puD3dCallbacks, - puD3dDriverData, puD3dBufferCallbacks, - puD3dTextureFormats, puNumHeaps, - puvmList, puNumFourCC, - puFourCC); - - testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); - testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); - testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); - testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); - - testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); - - testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); - testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); - testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); - testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); - if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && - (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) - { - printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\n"); - fails++; - } - - if (dumping_on == TRUE) - { - dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); - dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); - /* FIXME dump puD3dCallbacks */ - /* FIXME dump puD3dDriverData */ - } - - show_status(fails, "NtGdiDdQueryDirectDrawObject\0"); -} - -/* - * Test see if we can delete a DirectDrawObject from win32k - * - */ -void -test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) -{ - int fails=0; - BOOL retValue=FALSE; - printf("Start testing of NtGdiDdDeleteDirectDrawObject\n"); - - retValue = OsThunkDdDeleteDirectDrawObject(hDirectDrawLocal); - testing_eq(retValue,FALSE,fails,"NtGdiDdDeleteDirectDrawObject(hDirectDrawLocal);\0"); - - retValue = OsThunkDdDeleteDirectDrawObject(NULL); - testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0"); - - show_status(fails, "NtGdiDdDeleteDirectDrawObject\0"); -} @@ -333,3 +49,7 @@ + + + + Modified: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild (original) +++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild Sun Mar 4 14:57:44 2007 @@ -9,5 +9,8 @@ <library>gdi32</library> <library>d3d8thk</library> <file>main.c</file> + <file>NtGdiDdCreateDirectDrawObject.c</file> + <file>NtGdiDdDeleteDirectDrawObject.c</file> + <file>NtGdiDdQueryDirectDrawObject.c</file> <file>dump.c</file> </module>

1 0

[greatlrd] 25980: adding so dump can decoding pCallBackFlags[0] so we do not need calc out what hardware acclations DD_CALLBACKS support.
by greatlrd＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: greatlrd Date: Sun Mar 4 14:45:29 2007 New Revision: 25980 URL: http://svn.reactos.org/svn/reactos?rev=25980&view=rev Log: adding so dump can decoding pCallBackFlags[0] so we do not need calc out what hardware acclations DD_CALLBACKS support. Modified: trunk/rosapps/dxtest/win32kdxtest/dump.c Modified: trunk/rosapps/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/dump.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/dump.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/dump.c Sun Mar 4 14:45:29 2007 @@ -13,10 +13,109 @@ void dump_CallBackFlags(DWORD *pCallBackFlags, char *text) { + UINT flag=pCallBackFlags[0]; + INT count=0; + printf("dumping the CallBackFlags from %s\n",text); - printf("pCallBackFlags[0] : 0x%08lx\n",pCallBackFlags[0]); - printf("pCallBackFlags[1] : 0x%08lx\n",pCallBackFlags[1]); - printf("pCallBackFlags[2] : 0x%08lx\n",pCallBackFlags[2]); + printf("pCallBackFlags[0] : "); + if (flag & DDHAL_CB32_CANCREATESURFACE) + { + if (count!=0) + { + printf("| "); + } + flag = flag - DDHAL_CB32_CANCREATESURFACE; + printf("DDHAL_CB32_CANCREATESURFACE "); + count++; + } + if (flag & DDHAL_CB32_CREATEPALETTE) + { + if (count!=0) + { + printf("| "); + } + flag = flag - DDHAL_CB32_CREATEPALETTE; + printf("DDHAL_CB32_CREATEPALETTE "); + count++; + } + if (flag & DDHAL_CB32_CREATESURFACE) + { + if (count!=0) + { + printf("| "); + } + flag = flag - DDHAL_CB32_CREATESURFACE; + printf("DDHAL_CB32_CREATESURFACE "); + count++; + } + if (flag & DDHAL_CB32_GETSCANLINE) + { + if (count!=0) + { + printf("| "); + } + flag = flag - DDHAL_CB32_GETSCANLINE; + printf("DDHAL_CB32_GETSCANLINE "); + count++; + } + if (flag & DDHAL_CB32_MAPMEMORY) + { + if (count!=0) + { + printf("| "); + } + flag = flag - DDHAL_CB32_MAPMEMORY; + printf("DDHAL_CB32_MAPMEMORY "); + count++; + } + if (flag & DDHAL_CB32_SETCOLORKEY) + { + if (count!=0) + { + printf("| "); + } + flag = flag - DDHAL_CB32_SETCOLORKEY; + printf("DDHAL_CB32_SETCOLORKEY "); + count++; + } + if (flag & DDHAL_CB32_SETMODE) + { + if (count!=0) + { + printf("| "); + } + flag = flag - DDHAL_CB32_SETMODE; + printf("DDHAL_CB32_SETMODE "); + count++; + } + if (flag & DDHAL_CB32_WAITFORVERTICALBLANK) + { + if (count!=0) + { + printf("| "); + } + flag = flag - DDHAL_CB32_WAITFORVERTICALBLANK; + printf("DDHAL_CB32_WAITFORVERTICALBLANK "); + count++; + } + + if (count==0) + { + printf("0x%04lx\n",pCallBackFlags[0]); + } + else + { + printf("\n"); + } + + + if (flag != 0) + { + printf("undoc value in DD_CALLBACKS flags value %04lx\n",flag); + } + + printf("pCallBackFlags[1] : 0x%04lx\n",pCallBackFlags[1]); + printf("pCallBackFlags[2] : 0x%04lx\n",pCallBackFlags[2]); } void @@ -225,7 +324,14 @@ } else { - printf("unkonwn dwSize DD_HALINFO : the size found is 0x%8lx\n",pHalInfo->dwSize); + if (pHalInfo->dwSize !=0) + { + printf("unkonwn dwSize DD_HALINFO : the size found is 0x%08lx\n",pHalInfo->dwSize); + } + else + { + printf("none pHalInfo from the driver\n",pHalInfo->dwSize); + } } }

1 0

[greatlrd] 25979: merge down 25795 and 25796
by greatlrd＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: greatlrd Date: Sun Mar 4 02:45:23 2007 New Revision: 25979 URL: http://svn.reactos.org/svn/reactos?rev=25979&view=rev Log: merge down 25795 and 25796 Modified: branches/ros-branch-0_3_1/reactos/include/ndk/kdtypes.h branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/i386/asmmacro.S branches/ros-branch-0_3_1/reactos/ntoskrnl/kd/kdmain.c branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/exp.c branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/trap.s Modified: branches/ros-branch-0_3_1/reactos/include/ndk/kdtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_1/reactos/include/ndk/kdtypes.h (original) +++ branches/ros-branch-0_3_1/reactos/include/ndk/kdtypes.h Sun Mar 4 02:45:23 2007 @@ -52,6 +52,7 @@ #define BREAKPOINT_PROMPT 2 #define BREAKPOINT_LOAD_SYMBOLS 3 #define BREAKPOINT_UNLOAD_SYMBOLS 4 +#define BREAKPOINT_COMMAND_STRING 5 // // Debug Control Codes for NtSystemDebugcontrol Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/i386/asmmacro.S Sun Mar 4 02:45:23 2007 @@ -304,7 +304,7 @@ /* Set them */ mov dr6, ebx mov dr7, ecx - jz 3f + jmp 3f .endm // @@ -482,12 +482,12 @@ /* Flush DR7 */ and dword ptr [ebp+KTRAP_FRAME_DR7], 0 -3: /* Check if the thread was being debugged */ test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF jnz Dr_&Label /* Set the Trap Frame Debug Header */ +3: SET_TF_DEBUG_HEADER .endm @@ -1171,7 +1171,7 @@ mov dr3, esi mov dr6, edi mov dr7, ebx - jz 4b + jmp 4b 7: /* Restore real CS value */ Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/kd/kdmain.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/kd/kdmain.c Sun Mar 4 02:45:23 2007 @@ -107,8 +107,29 @@ { KD_CONTINUE_TYPE Return; - /* HACK (just like all this routine */ - if (ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) Context->Eip++; + ULONG ExceptionCommand = ExceptionRecord->ExceptionInformation[0]; + + /* Check if this was a breakpoint due to DbgPrint or Load/UnloadSymbols */ + if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && + (ExceptionRecord->NumberParameters > 0) && + ((ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) || + (ExceptionCommand == BREAKPOINT_UNLOAD_SYMBOLS) || + (ExceptionCommand == BREAKPOINT_COMMAND_STRING) || + (ExceptionCommand == BREAKPOINT_PRINT))) + { + /* Check if this is a debug print */ + if (ExceptionCommand == BREAKPOINT_PRINT) + { + /* Print the string */ + KdpServiceDispatcher(BREAKPOINT_PRINT, + (PVOID)ExceptionRecord->ExceptionInformation[1], + ExceptionRecord->ExceptionInformation[2]); + } + + /* This we can handle: simply bump EIP */ + Context->Eip++; + return TRUE; + } /* Get out of here if the Debugger isn't connected */ if (KdDebuggerNotPresent) return FALSE; Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/exp.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/exp.c Sun Mar 4 02:45:23 2007 @@ -140,7 +140,7 @@ NewMask |= DR_MASK(DR7_OVERRIDE_V); /* Set DR7 override */ - *DrMask = DR7_OVERRIDE_MASK; + *DrMask |= DR7_OVERRIDE_MASK; } else { @@ -210,10 +210,19 @@ KiEspToTrapFrame(IN PKTRAP_FRAME TrapFrame, IN ULONG Esp) { - ULONG Previous = KiEspFromTrapFrame(TrapFrame); + KIRQL OldIrql; + ULONG Previous; + + /* Raise to APC_LEVEL if needed */ + OldIrql = KeGetCurrentIrql(); + if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + + /* Get the old ESP */ + Previous = KiEspFromTrapFrame(TrapFrame); /* Check if this is user-mode or V86 */ - if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) + if ((TrapFrame->SegCs & MODE_MASK) || + (TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* Write it directly */ TrapFrame->HardwareEsp = Esp; @@ -221,7 +230,11 @@ else { /* Don't allow ESP to be lowered, this is illegal */ - if (Esp < Previous) KeBugCheck(SET_OF_INVALID_CONTEXT); + if (Esp < Previous) KeBugCheckEx(SET_OF_INVALID_CONTEXT, + Esp, + Previous, + (ULONG_PTR)TrapFrame, + 0); /* Create an edit frame, check if it was alrady */ if (!(TrapFrame->SegCs & FRAME_EDITED)) @@ -243,6 +256,9 @@ } } } + + /* Restore IRQL */ + if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } ULONG @@ -316,12 +332,13 @@ PFX_SAVE_AREA FxSaveArea; ULONG i; BOOLEAN V86Switch = FALSE; - KIRQL OldIrql = APC_LEVEL; + KIRQL OldIrql; ULONG DrMask = 0; PVOID SafeDr; /* Do this at APC_LEVEL */ - if (KeGetCurrentIrql() < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + OldIrql = KeGetCurrentIrql(); + if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); /* Start with the basic Registers */ if ((ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) @@ -544,7 +561,7 @@ else { /* FIXME: Handle FPU Emulation */ - ASSERT(FALSE); + //ASSERT(FALSE); } } @@ -600,11 +617,12 @@ FLOATING_SAVE_AREA UnalignedArea; } FloatSaveBuffer; FLOATING_SAVE_AREA *FloatSaveArea; - KIRQL OldIrql = APC_LEVEL; + KIRQL OldIrql; ULONG i; /* Do this at APC_LEVEL */ - if (KeGetCurrentIrql() < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + OldIrql = KeGetCurrentIrql(); + if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); /* Start with the Control flags */ if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) @@ -817,11 +835,26 @@ /* Get a Context */ KeTrapFrameToContext(TrapFrame, ExceptionFrame, &Context); - /* Fix up EIP */ - if (ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) - { - /* Decrement EIP by one */ - Context.Eip--; + /* Look at our exception code */ + switch (ExceptionRecord->ExceptionCode) + { + /* Breapoint */ + case STATUS_BREAKPOINT: + + /* Decrement EIP by one */ + Context.Eip--; + break; + + /* Internal exception */ + case KI_EXCEPTION_ACCESS_VIOLATION: + + /* Set correct code */ + ExceptionRecord->ExceptionCode = STATUS_ACCESS_VIOLATION; + if (PreviousMode == UserMode) + { + /* FIXME: Handle no execute */ + } + break; } /* Sanity check */ @@ -869,8 +902,8 @@ KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, ExceptionRecord->ExceptionCode, (ULONG_PTR)ExceptionRecord->ExceptionAddress, - ExceptionRecord->ExceptionInformation[0], - ExceptionRecord->ExceptionInformation[1]); + (ULONG_PTR)TrapFrame, + 0); } else { @@ -995,8 +1028,8 @@ KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, ExceptionRecord->ExceptionCode, (ULONG_PTR)ExceptionRecord->ExceptionAddress, - ExceptionRecord->ExceptionInformation[0], - ExceptionRecord->ExceptionInformation[1]); + (ULONG_PTR)TrapFrame, + 0); } Handled: Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/trap.s (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/trap.s Sun Mar 4 02:45:23 2007 @@ -11,6 +11,9 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix + +#define Running 2 +#define WrDispatchInt 0x1F /* GLOBALS *******************************************************************/ @@ -225,22 +228,6 @@ /* Copy the parameters */ rep movsd -#ifdef DBG - /* - * The following lines are for the benefit of GDB. It will see the return - * address of the "call ebx" below, find the last label before it and - * thinks that that's the start of the function. It will then check to see - * if it starts with a standard function prolog (push ebp, mov ebp,esp1). - * When that standard function prolog is not found, it will stop the - * stack backtrace. Since we do want to backtrace into usermode, let's - * make GDB happy and create a standard prolog. - */ -KiSystemService: - push ebp - mov ebp,esp - pop ebp -#endif - /* Do the System Call */ call ebx @@ -479,50 +466,15 @@ TRAP_PROLOG kids /* Increase EIP so we skip the INT3 */ - //inc dword ptr [ebp+KTRAP_FRAME_EIP] + inc dword ptr [ebp+KTRAP_FRAME_EIP] /* Call debug service dispatcher */ mov eax, [ebp+KTRAP_FRAME_EAX] mov ecx, [ebp+KTRAP_FRAME_ECX] mov edx, [ebp+KTRAP_FRAME_EDX] - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz NotUserMode - - /* Check if this is kernel or user-mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - jz CallDispatch - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jnz NotUserMode - - /* Re-enable interrupts */ -VdmProc: - sti - - /* Call the debug routine */ -CallDispatch: - mov esi, ecx - mov edi, edx - mov edx, eax - mov ecx, 3 - push edi - push esi - push edx - call _KdpServiceDispatcher@12 - -NotUserMode: - - /* Get the current process */ - mov ebx, [fs:KPCR_CURRENT_THREAD] - mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] - - /* Check if this is a VDM Process */ - //cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - //jz VdmProc - - /* Exit through common routine */ - jmp _Kei386EoiHelper@0 + /* Jump to INT3 handler */ + jmp PrepareInt3 .endfunc .func NtRaiseException@12 @@ -652,7 +604,7 @@ /* Set the record in ECX and check if this was V86 */ mov ecx, esp - test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jz SetPreviousMode /* Set V86 mode */ @@ -661,9 +613,11 @@ SetPreviousMode: - /* Calculate the previous mode */ + /* Get the caller's CS */ mov eax, [ebp+KTRAP_FRAME_CS] + MaskMode: + /* Check if it was user-mode or kernel-mode */ and eax, MODE_MASK /* Dispatch the exception */ @@ -816,7 +770,11 @@ /* Enter trap */ TRAP_PROLOG kit3 + /* Set status code */ + mov eax, 0 //STATUS_SUCCESS + /* Check for V86 */ +PrepareInt3: test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz V86Int3 @@ -833,6 +791,7 @@ sti PrepInt3: + /* Prepare the exception */ mov esi, ecx mov edi, edx @@ -842,6 +801,7 @@ mov ebx, [ebp+KTRAP_FRAME_EIP] dec ebx mov ecx, 3 + mov eax, STATUS_BREAKPOINT call _CommonDispatchException V86Int3: @@ -2226,7 +2186,7 @@ /* Restore stack and exception list */ pop esp - pop dword ptr [ebx] + pop dword ptr [ebx+KPCR_EXCEPTION_LIST] pop ebp CheckQuantum:

1 0

[ekohl] 25978: Users can now set bold or italic fonts.
by ekohl＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: ekohl Date: Sun Mar 4 00:03:22 2007 New Revision: 25978 URL: http://svn.reactos.org/svn/reactos?rev=25978&view=rev Log: Users can now set bold or italic fonts. Modified: trunk/reactos/dll/cpl/desk/advappdlg.c Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c Sun Mar 4 00:03:22 2007 @@ -536,7 +536,7 @@ case IDC_ADVAPPEARANCE_SIZE_E: if (g && HIWORD(wParam) == EN_CHANGE) { - int i = (int)LOWORD(SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD, UDM_GETPOS,0,0L)); + INT i = (INT)LOWORD(SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD, UDM_GETPOS,0,0L)); switch (g->CurrentElement) { @@ -665,6 +665,86 @@ } break; + case IDC_ADVAPPEARANCE_FONTBOLD: + if (g && HIWORD(wParam) == BN_CLICKED) + { + INT i; + + switch (g->CurrentElement) + { + case IDX_INACTIVE_CAPTION: + case IDX_ACTIVE_CAPTION: + i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_GETCHECK, 0, 0); + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfWeight = + (i == BST_CHECKED) ? FW_BOLD : FW_NORMAL; + + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + case IDX_MENU: + i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_GETCHECK, 0, 0); + + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfWeight = + (i == BST_CHECKED) ? FW_BOLD : FW_NORMAL; + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + case IDX_DIALOG: + i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_GETCHECK, 0, 0); + + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfWeight = + (i == BST_CHECKED) ? FW_BOLD : FW_NORMAL; + + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + } + } + break; + + case IDC_ADVAPPEARANCE_FONTITALIC: + if (g && HIWORD(wParam) == BN_CLICKED) + { + INT i; + + switch (g->CurrentElement) + { + case IDX_INACTIVE_CAPTION: + case IDX_ACTIVE_CAPTION: + i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_GETCHECK, 0, 0); + + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfItalic = + (i == BST_CHECKED) ? TRUE : FALSE; + + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + case IDX_MENU: + i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_GETCHECK, 0, 0); + + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfItalic = + (i == BST_CHECKED) ? TRUE : FALSE; + + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + case IDX_DIALOG: + i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_GETCHECK, 0, 0); + + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfItalic = + (i == BST_CHECKED) ? TRUE : FALSE; + + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + } + } + break; + case IDC_ADVAPPEARANCE_COLOR1_B: GetColor(hwndDlg, g, 0); break;

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