Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[greatlrd] 25999: merge 25998
by greatlrd＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: greatlrd Date: Mon Mar 5 18:11:23 2007 New Revision: 25999 URL: http://svn.reactos.org/svn/reactos?rev=25999&view=rev Log: merge 25998 Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c Mon Mar 5 18:11:23 2007 @@ -811,6 +811,26 @@ RtlInitUnicodeString(&StdDriver, L"DISPLAY"); + if (Driver != NULL) + { + DPRINT1("NAME Driver: %wZ\n", Driver); + } + else + { + DPRINT1("NAME Driver: NULL\n", Driver); + } + + + if (Driver != NULL) + { + DPRINT1("NAME Device: %wZ\n", Device); + } + else + { + DPRINT1("NAME Device: NULL\n", Device); + } + + if (NULL == Driver || 0 == RtlCompareUnicodeString(Driver, &StdDriver, TRUE)) { if (CreateAsIC) @@ -853,7 +873,8 @@ if (Driver != NULL && Driver->Buffer != NULL) { - DPRINT("NAME: %wZ\n", Driver); // FIXME: Should not crash if NULL + if (Driver!=NULL) + DPRINT1("NAME: %wZ\n", Driver); } /* Allocate a DC object */ @@ -962,9 +983,12 @@ Status = IntSafeCopyUnicodeString(&SafeDevice, Device); if(!NT_SUCCESS(Status)) { - RtlFreeUnicodeString(&SafeDriver); - SetLastNtError(Status); - return NULL; + /* FIXME workaround for a real bug */ + // RtlFreeUnicodeString(&SafeDriver); + // SetLastNtError(Status); + // DPRINT1("fail3\n"); + // return NULL; + Device = NULL; } } @@ -1780,6 +1804,7 @@ } GDIOBJ_UnlockObjByPtr(GdiHandleTable, GdiObject); + return Result; }

1 0

[greatlrd] 25998: tempary fix for CreateDC("DISPLAY", "DISPLAY", ....) until I figout some thing better
by greatlrd＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: greatlrd Date: Mon Mar 5 18:10:26 2007 New Revision: 25998 URL: http://svn.reactos.org/svn/reactos?rev=25998&view=rev Log: tempary fix for CreateDC("DISPLAY","DISPLAY",....) until I figout some thing better Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Mar 5 18:10:26 2007 @@ -811,6 +811,26 @@ RtlInitUnicodeString(&StdDriver, L"DISPLAY"); + if (Driver != NULL) + { + DPRINT1("NAME Driver: %wZ\n", Driver); + } + else + { + DPRINT1("NAME Driver: NULL\n", Driver); + } + + + if (Driver != NULL) + { + DPRINT1("NAME Device: %wZ\n", Device); + } + else + { + DPRINT1("NAME Device: NULL\n", Device); + } + + if (NULL == Driver || 0 == RtlCompareUnicodeString(Driver, &StdDriver, TRUE)) { if (CreateAsIC) @@ -853,7 +873,8 @@ if (Driver != NULL && Driver->Buffer != NULL) { - DPRINT("NAME: %wZ\n", Driver); // FIXME: Should not crash if NULL + if (Driver!=NULL) + DPRINT1("NAME: %wZ\n", Driver); } /* Allocate a DC object */ @@ -962,9 +983,12 @@ Status = IntSafeCopyUnicodeString(&SafeDevice, Device); if(!NT_SUCCESS(Status)) { - RtlFreeUnicodeString(&SafeDriver); - SetLastNtError(Status); - return NULL; + /* FIXME workaround for a real bug */ + // RtlFreeUnicodeString(&SafeDriver); + // SetLastNtError(Status); + // DPRINT1("fail3\n"); + // return NULL; + Device = NULL; } }

1 0

[ion] 25997: - Fix KdpSetCommonSTate to clear breakpoints. - Allow KdpReadVirtualMemory to read SharedUserData since it's now readable. - Allow it to read user-mode pointers as well, just not null-pointers. - Fix KdpReportExceptionStateChange by implementing DumpTraceData. Now the crash in ndis.sys gets caught. - Next up: implement breakpoints so that stepping out works.
by ion＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: ion Date: Mon Mar 5 06:23:58 2007 New Revision: 25997 URL: http://svn.reactos.org/svn/reactos?rev=25997&view=rev Log: - Fix KdpSetCommonSTate to clear breakpoints. - Allow KdpReadVirtualMemory to read SharedUserData since it's now readable. - Allow it to read user-mode pointers as well, just not null-pointers. - Fix KdpReportExceptionStateChange by implementing DumpTraceData. Now the crash in ndis.sys gets caught. - Next up: implement breakpoints so that stepping out works. Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kddata.c Modified: 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 (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h Mon Mar 5 06:23:58 2007 @@ -219,6 +219,13 @@ NTAPI KdpDeleteBreakpoint( IN ULONG BpEntry +); + +BOOLEAN +NTAPI +KdpDeleteBreakpointRange( + IN PVOID Base, + IN PVOID Limit ); // @@ -262,3 +269,5 @@ extern BOOLEAN BreakpointsSuspended; extern ULONG KdpNumInternalBreakpoints; extern ULONG KdpCurrentSymbolStart, KdpCurrentSymbolEnd; +extern ULONG TraceDataBuffer[40]; +extern ULONG TraceDataBufferPosition; 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 Mon Mar 5 06:23:58 2007 @@ -16,6 +16,21 @@ VOID NTAPI +DumpTraceData(IN PSTRING TraceData) +{ + /* Update the buffer */ + TraceDataBuffer[0] = TraceDataBufferPosition; + + /* Setup the trace data */ + TraceData->Length = TraceDataBufferPosition * sizeof(ULONG); + TraceData->Buffer = (PCHAR)TraceDataBuffer; + + /* Reset the buffer location */ + TraceDataBufferPosition = 1; +} + +VOID +NTAPI KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State, IN PCONTEXT Context) { @@ -87,13 +102,10 @@ WaitStateChange->ControlReport.InstructionCount = InstructionCount; /* Clear all the breakpoints in this region */ - HadBreakpoints = FALSE; -#if 0 - KdpDeleteBreakpointRange((PVOID)WaitStateChange->ProgramCounter, - (PVOID)(WaitStateChange->ProgramCounter + - WaitStateChange->ControlReport. - InstructionCount - 1)); -#endif + HadBreakpoints = + KdpDeleteBreakpointRange((PVOID)(LONG_PTR)WaitStateChange->ProgramCounter, + (PVOID)((ULONG)WaitStateChange->ProgramCounter + + WaitStateChange->ControlReport.InstructionCount - 1)); if (HadBreakpoints) { /* Copy the instruction stream again, this time without breakpoints */ @@ -190,12 +202,7 @@ } #endif - if ((ULONG_PTR)State->u.ReadMemory.TargetBaseAddress < KSEG0_BASE) - { - Length = 0; - Status = STATUS_UNSUCCESSFUL; - } - else if ((ULONG_PTR)State->u.ReadMemory.TargetBaseAddress >= (ULONG_PTR)SharedUserData) + if (!State->u.ReadMemory.TargetBaseAddress) { Length = 0; Status = STATUS_UNSUCCESSFUL; @@ -900,6 +907,9 @@ Header.Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); Header.Buffer = (PCHAR)&WaitStateChange; + /* Setup the trace data */ + DumpTraceData(&Data); + /* Send State Change packet and wait for a reply */ Status = KdpSendWaitContinue(PACKET_TYPE_KD_STATE_CHANGE64, &Header, @@ -971,13 +981,9 @@ KdSave(FALSE); /* Report a state change */ -#if 0 Status = KdpReportExceptionStateChange(ExceptionRecord, ContextRecord, SecondChanceException); -#else - Status = FALSE; -#endif /* Restore the port data and return */ KdRestore(FALSE); Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c Mon Mar 5 06:23:58 2007 @@ -54,6 +54,12 @@ ULONG KdpNumInternalBreakpoints; ULONG KdpCurrentSymbolStart, KdpCurrentSymbolEnd; + +// +// Tracepoint Data +// +ULONG TraceDataBuffer[40]; +ULONG TraceDataBufferPosition = 1; // // Time Slip Support

1 0

[ion] 25996: - Add proper bootcd/install freeldr.ini flags to allow KD debugging to work. - Fix KdPollBreakIn. - Add initial debug breakpoint code to ExpInitializeExecutive. - WinDBG now breaks at the initial breakpoint and you can continue execution from there. - There's still a lot of weird hangs when using WinDBG, it's far from usable.
by ion＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: ion Date: Mon Mar 5 05:29:46 2007 New Revision: 25996 URL: http://svn.reactos.org/svn/reactos?rev=25996&view=rev Log: - Add proper bootcd/install freeldr.ini flags to allow KD debugging to work. - Fix KdPollBreakIn. - Add initial debug breakpoint code to ExpInitializeExecutive. - WinDBG now breaks at the initial breakpoint and you can continue execution from there. - There's still a lot of weird hangs when using WinDBG, it's far from usable. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/kd64/kdlock.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c (original) +++ trunk/reactos/base/setup/usetup/bootsup.c Mon Mar 5 05:29:46 2007 @@ -305,12 +305,12 @@ L"SystemPath", ArcPath); - /* Options=/DEBUGPORT=SCREEN /NOGUIBOOT /SOS*/ + /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS*/ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /SOS"); + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); /* Create "DOS" section */ IniSection = IniCacheAppendSection(IniCache, @@ -423,12 +423,12 @@ L"SystemPath", ArcPath); - /* Options=/DEBUGPORT=COM1 /NOGUIBOOT /SOS*/ + /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS*/ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=COM1 /SOS"); + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); /* Save the ini file */ IniCacheSave(IniCache, IniPath); Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Mon Mar 5 05:29:46 2007 @@ -40,7 +40,7 @@ [SetupData] DefaultPath = \ReactOS ;OsLoadOptions = "/NOGUIBOOT /NODEBUG" -OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1" +OsLoadOptions = "/NOGUIBOOT" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" 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 Mon Mar 5 05:29:46 2007 @@ -734,9 +734,6 @@ i++; NextEntry = NextEntry->Flink; } - - /* Check if we should break after symbol load */ - if (KdBreakAfterSymbolLoad) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); } VOID @@ -916,6 +913,9 @@ /* Load boot symbols */ ExpLoadBootSymbols(LoaderBlock); + /* Check if we should break after symbol load */ + if (KdBreakAfterSymbolLoad) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + /* Set system ranges */ SharedUserData->Reserved1 = (ULONG_PTR)MmHighestUserAddress; SharedUserData->Reserved3 = (ULONG_PTR)MmSystemRangeStart; Modified: 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 (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h Mon Mar 5 05:29:46 2007 @@ -248,9 +248,8 @@ extern LONG KdpTimeSlipPending; extern PKEVENT KdpTimeSlipEvent; extern KSPIN_LOCK KdpTimeSlipEventLock; +extern BOOLEAN KdpPortLocked; extern BOOLEAN KdpControlCPressed; -extern BOOLEAN KdpControlCWaiting; -extern BOOLEAN KdpPortLocked; extern KSPIN_LOCK KdpDebuggerLock; extern LARGE_INTEGER KdTimerStop, KdTimerStart, KdTimerDifference; extern ULONG KdComponentTableSize; Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c Mon Mar 5 05:29:46 2007 @@ -20,10 +20,9 @@ // Debugger State // KD_CONTEXT KdpContext; -BOOLEAN KdpControlCPressed; -BOOLEAN KdpControlCWaiting; BOOLEAN KdpPortLocked; KSPIN_LOCK KdpDebuggerLock; +BOOLEAN KdpControlCPressed; // // Debug Trap Handlers Modified: trunk/reactos/ntoskrnl/kd64/kdlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdlock.c (original) +++ trunk/reactos/ntoskrnl/kd64/kdlock.c Mon Mar 5 05:29:46 2007 @@ -86,12 +86,12 @@ _disable(); /* Check if a CTRL-C is in the queue */ - if (KdpControlCWaiting) + if (KdpContext.KdpControlCPending) { /* Set it and prepare for break */ KdpControlCPressed = TRUE; DoBreak = TRUE; - KdpControlCWaiting = FALSE; + KdpContext.KdpControlCPending = FALSE; } else {

1 0

[ion] 25995: - KD branch isn't really needed anymore. All the various fixes made in it were ported to trunk, KD64 is now in trunk, and _WINKD_ flag allows seamless trial of KD64 implementation.
by ion＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: ion Date: Mon Mar 5 04:37:03 2007 New Revision: 25995 URL: http://svn.reactos.org/svn/reactos?rev=25995&view=rev Log: - KD branch isn't really needed anymore. All the various fixes made in it were ported to trunk, KD64 is now in trunk, and _WINKD_ flag allows seamless trial of KD64 implementation. Removed: branches/alex-kd-branch/

1 0

[ion] 25994: - Stub NtSystemDebugControl. - Fully support _WINKD_. Change this to 1, and get kdcom.dll from Windows 2003 or TinyKRNL and you'll be able to connect to WinDBG if using the right debug settings. You can now boot to desktop with WinDBG connected and see debug messages, but not much else is supported. - Fix bugs in KeGetBugMessageText. - Implement KeEnterKernelDebugger.
by ion＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: ion Date: Mon Mar 5 04:35:43 2007 New Revision: 25994 URL: http://svn.reactos.org/svn/reactos?rev=25994&view=rev Log: - Stub NtSystemDebugControl. - Fully support _WINKD_. Change this to 1, and get kdcom.dll from Windows 2003 or TinyKRNL and you'll be able to connect to WinDBG if using the right debug settings. You can now boot to desktop with WinDBG connected and see debug messages, but not much else is supported. - Fix bugs in KeGetBugMessageText. - Implement KeEnterKernelDebugger. Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/timerobj.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/dbgctrl.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/dbgctrl.c (original) +++ trunk/reactos/ntoskrnl/ex/dbgctrl.c Mon Mar 5 04:35:43 2007 @@ -60,23 +60,6 @@ ULONG OutputBufferLength, PULONG ReturnLength) { - switch (ControlCode) - { - case SysDbgQueryTraceInformation: - case SysDbgSetTracepoint: - case SysDbgSetSpecialCall: - case SysDbgClearSpecialCalls: - case SysDbgQuerySpecialCalls: - case SysDbgBreakPoint: - break; - - case SysDbgQueryVersion: - KDB_LOADUSERMODULE_HOOK((PLDR_DATA_TABLE_ENTRY) InputBuffer); - break; - - default: - break; - } - + /* FIXME: TODO */ return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h Mon Mar 5 04:35:43 2007 @@ -16,6 +16,7 @@ extern BOOLEAN _KdDebuggerEnabled; extern BOOLEAN _KdDebuggerNotPresent; extern BOOLEAN KdBreakAfterSymbolLoad; +extern BOOLEAN KdPitchDebugger; BOOLEAN NTAPI 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 Mon Mar 5 04:35:43 2007 @@ -19,6 +19,7 @@ BOOLEAN KiEnableTimerWatchdog = FALSE; BOOLEAN KdBreakAfterSymbolLoad = FALSE; BOOLEAN KdpBreakPending; +BOOLEAN KdPitchDebugger = TRUE; VOID STDCALL PspDumpThreads(BOOLEAN SystemThreads); typedef struct @@ -232,22 +233,6 @@ KdPollBreakIn(VOID) { return KdpBreakPending; -} - -/* - * @implemented - */ -VOID -STDCALL -KeEnterKernelDebugger(VOID) -{ - HalDisplayString("\n\n *** Entered kernel debugger ***\n"); - - /* Set the Variable */ - KdEnteredDebugger = TRUE; - - /* Halt the CPU */ - for (;;) Ke386HaltProcessor(); } /* 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 Mon Mar 5 04:35:43 2007 @@ -1157,8 +1157,8 @@ } /* -* @unimplemented -*/ + * @unimplemented + */ NTSTATUS NTAPI KdSystemDebugControl(IN SYSDBG_COMMAND Command, @@ -1173,20 +1173,60 @@ 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; -} - +/* + * @unimplemented + */ +NTSTATUS +NTAPI +KdChangeOption(IN KD_OPTION Option, + IN ULONG InBufferBytes OPTIONAL, + IN PVOID InBuffer, + IN ULONG OutBufferBytes OPTIONAL, + OUT PVOID OutBuffer, + OUT PULONG OutBufferNeeded OPTIONAL) +{ + /* HACK */ + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +KdPowerTransition(IN DEVICE_POWER_STATE NewState) +{ + /* HACK */ + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +KdDisableDebugger(VOID) +{ + /* HACK */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NtQueryDebugFilterState(ULONG ComponentId, + ULONG Level) +{ + /* HACK */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NtSetDebugFilterState(ULONG ComponentId, + ULONG Level, + BOOLEAN State) +{ + /* HACK */ + return STATUS_SUCCESS; +} + Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2599… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Mon Mar 5 04:35:43 2007 @@ -99,7 +99,7 @@ } /* Print it out */ - if (!KeRosPrintAddress((PVOID)Addr)) DbgPrint("<%X>", Addr); + KiRosPrintAddress((PVOID)Addr); /* Go to the next frame */ DbgPrint("\n"); @@ -148,7 +148,7 @@ } } -VOID +BOOLEAN NTAPI KeGetBugMessageText(IN ULONG BugCheckCode, OUT PANSI_STRING OutputString OPTIONAL) @@ -157,6 +157,10 @@ ULONG IdOffset; ULONG_PTR MessageEntry; PCHAR BugCode; + BOOLEAN Result = FALSE; + + /* Make sure we're not bugchecking too early */ + if (!KiBugCodeMessages) return Result; /* Find the message. This code is based on RtlFindMesssage */ for (i = 0; i < KiBugCodeMessages->NumberOfBlocks; i++) @@ -164,7 +168,7 @@ /* Check if the ID Matches */ if ((BugCheckCode >= KiBugCodeMessages->Blocks[i].LowId) && (BugCheckCode <= KiBugCodeMessages->Blocks[i].HighId)) - { + { /* Get Offset to Entry */ MessageEntry = KiBugCodeMessages->Blocks[i].OffsetToEntries + (ULONG_PTR)KiBugCodeMessages; @@ -182,22 +186,39 @@ BugCode = ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)->Text; i = strlen(BugCode); - /* Return it in the OutputString */ + /* Handle newlines */ + while ((i > 0) && ((BugCode[i] == '\n') || + (BugCode[i] == '\r') || + (BugCode[i] == ANSI_NULL))) + { + /* Check if we have a string to return */ + if (!OutputString) BugCode[i] = ANSI_NULL; + i--; + } + + /* Check if caller wants an output string */ if (OutputString) { + /* Return it in the OutputString */ OutputString->Buffer = BugCode; - OutputString->Length = i + 1; - OutputString->MaximumLength = i + 1; + OutputString->Length = (USHORT)i + 1; + OutputString->MaximumLength = (USHORT)i + 1; } else { /* Direct Output to Screen */ InbvDisplayString(BugCode); InbvDisplayString("\r"); - break; - } - } - } + } + + /* We're done */ + Result = TRUE; + break; + } + } + + /* Return the result */ + return Result; } VOID @@ -489,7 +510,7 @@ /* Print message for technical information */ KeGetBugMessageText(BUGCHECK_TECH_INFO, NULL); - /* Show the techincal Data */ + /* Show the technical Data */ sprintf(AnsiName, "\r\n\r\n*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)\r\n\r\n", KiBugCheckData[0], @@ -819,6 +840,9 @@ } /* Check if we need to save the context for KD */ +#ifdef _WINKD_ + if (!KdPitchDebugger) KdDebuggerDataBlock.SavedContext = (ULONG)&Context; +#endif /* Check if a debugger is connected */ if ((BugCheckCode != MANUALLY_INITIATED_CRASH) && (KdDebuggerEnabled)) @@ -901,12 +925,14 @@ AnsiName); /* Check if the debugger is disabled but we can enable it */ - //if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) + if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) { /* Enable it */ - //KdEnableDebuggerWithLock(FALSE); - } - //else +#ifdef _WINKD_ + KdEnableDebuggerWithLock(FALSE); +#endif + } + else { /* Otherwise, print the last line */ InbvDisplayString("\r\n"); @@ -1116,4 +1142,30 @@ KeBugCheckWithTf(BugCheckCode, 0, 0, 0, 0, NULL); } +/* + * @implemented + */ +VOID +NTAPI +KeEnterKernelDebugger(VOID) +{ + /* Disable interrupts */ + KiHardwareTrigger = 1; + _disable(); + + /* Check the bugcheck count */ + if (!InterlockedDecrement(&KeBugCheckCount)) + { + /* There was only one, is the debugger disabled? */ + if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) + { + /* Enable the debugger */ + KdInitSystem(0, NULL); + } + } + + /* Bugcheck */ + KiBugCheckDebugBreak(DBG_STATUS_FATAL); +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timerobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timerobj.c (original) +++ trunk/reactos/ntoskrnl/ke/timerobj.c Mon Mar 5 04:35:43 2007 @@ -17,6 +17,7 @@ KTIMER_TABLE_ENTRY KiTimerTableListHead[TIMER_TABLE_SIZE]; LARGE_INTEGER KiTimeIncrementReciprocal; UCHAR KiTimeIncrementShiftCount; +BOOLEAN KiEnableTimerWatchdog; /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Mar 5 04:35:43 2007 @@ -10,6 +10,9 @@ <define name="__USE_W32API" /> <define name="WIN9X_COMPAT_SPINLOCK" /> <define name="_IN_KERNEL_" /> + <if property="_WINKD_" value="1"> + <define name="_WINKD_" /> + </if> <include base="cmlib">.</include> <include base="ntoskrnl">include</include> <include base="ReactOS">include/reactos/drivers</include>

1 0

[ion] 25993: - Detect if reparsing is being used during IRP completion and complain. - Free MDLs in a safer way by not actually using the Irp->MdlAddress as we're looping through them. - Don't leak an event for each Asynchronous API anymore. - Handle IRP_OB_QUERY_NAME completion properly. - handle IRP_CREATE_OPERATION with a file object present. - Use deferred delete for File Object dereferences, to speed up I/O completion. - Clear the I/O Stack Location when parsing completion stacks. - Support
by ion＠svn.reactos.org 05 Mar '07

05 Mar '07

Author: ion Date: Mon Mar 5 03:47:19 2007 New Revision: 25993 URL: http://svn.reactos.org/svn/reactos?rev=25993&view=rev Log: - Detect if reparsing is being used during IRP completion and complain. - Free MDLs in a safer way by not actually using the Irp->MdlAddress as we're looping through them. - Don't leak an event for each Asynchronous API anymore. - Handle IRP_OB_QUERY_NAME completion properly. - handle IRP_CREATE_OPERATION with a file object present. - Use deferred delete for File Object dereferences, to speed up I/O completion. - Clear the I/O Stack Location when parsing completion stacks. - Support SL_ERROR_RETURNED during completion routines. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon Mar 5 03:47:19 2007 @@ -3813,6 +3813,7 @@ /* IO_STACK_LOCATION.Control */ #define SL_PENDING_RETURNED 0x01 +#define SL_ERROR_RETURNED 0x02 #define SL_INVOKE_ON_CANCEL 0x20 #define SL_INVOKE_ON_SUCCESS 0x40 #define SL_INVOKE_ON_ERROR 0x80 Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c Mon Mar 5 03:47:19 2007 @@ -239,7 +239,7 @@ { PFILE_OBJECT FileObject; PIRP Irp; - PMDL Mdl; + PMDL Mdl, NextMdl; PVOID Port = NULL, Key = NULL; BOOLEAN SignaledCreateRequest = FALSE; @@ -252,10 +252,26 @@ Irp, FileObject); + /* Sanity check */ + ASSERT(Irp->IoStatus.Status != 0xFFFFFFFF); + + /* Check if we have a file object */ + if (*SystemArgument2) + { + /* Check if we're reparsing */ + if ((Irp->IoStatus.Status == STATUS_REPARSE) && + (Irp->IoStatus.Information == IO_REPARSE_TAG_MOUNT_POINT)) + { + /* We should never get this yet */ + DPRINT1("Reparse support not yet present!\n"); + while (TRUE); + } + } + /* Handle Buffered case first */ if (Irp->Flags & IRP_BUFFERED_IO) { - /* Check if we have an input buffer and if we suceeded */ + /* Check if we have an input buffer and if we succeeded */ if ((Irp->Flags & IRP_INPUT_OPERATION) && (Irp->IoStatus.Status != STATUS_VERIFY_REQUIRED) && !(NT_ERROR(Irp->IoStatus.Status))) @@ -278,22 +294,25 @@ Irp->Flags &= ~(IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER); /* Check if there's an MDL */ - while ((Mdl = Irp->MdlAddress)) - { - /* Clear all of them */ - Irp->MdlAddress = Mdl->Next; + for (Mdl = Irp->MdlAddress; Mdl; Mdl = NextMdl) + { + /* Free it */ + NextMdl = Mdl->Next; IoFreeMdl(Mdl); } + + /* No MDLs left */ + Irp->MdlAddress = NULL; /* * Check if either the request was completed without any errors * (but warnings are OK!), or if it was completed with an error, but * did return from a pending I/O Operation and is not synchronous. */ - if ((!NT_ERROR(Irp->IoStatus.Status)) || - (NT_ERROR(Irp->IoStatus.Status) && - (Irp->PendingReturned) && - !(IsIrpSynchronous(Irp, FileObject)))) + if (!(NT_ERROR(Irp->IoStatus.Status)) || + (NT_ERROR(Irp->IoStatus.Status) && + (Irp->PendingReturned) && + !(IsIrpSynchronous(Irp, FileObject)))) { /* Get any information we need from the FO before we kill it */ if ((FileObject) && (FileObject->CompletionContext)) @@ -324,12 +343,20 @@ /* Check if we also have a File Object */ if (FileObject) { + /* Check if this is an Asynch API */ + if (!(Irp->Flags & IRP_SYNCHRONOUS_API)) + { + /* Dereference the event */ + ObDereferenceObject(Irp->UserEvent); + } + /* * Now, if this is a Synch I/O File Object, then this event is * NOT an actual Executive Event, so we won't dereference it, * and instead, we will signal the File Object */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) + if ((FileObject->Flags & FO_SYNCHRONOUS_IO) && + !(Irp->Flags & IRP_OB_QUERY_NAME)) { /* Signal the file object and set the status */ KeSetEvent(&FileObject->Event, 0, FALSE); @@ -342,7 +369,7 @@ */ if (Irp->Flags & IRP_CREATE_OPERATION) { - /* Clear the APC Routine and remmeber this */ + /* Clear the APC Routine and remember this */ Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; SignaledCreateRequest = TRUE; } @@ -353,6 +380,17 @@ /* Signal the file object and set the status */ KeSetEvent(&FileObject->Event, 0, FALSE); FileObject->FinalStatus = Irp->IoStatus.Status; + + /* + * This could also be a create operation, in which case we want + * to make sure there's no APC fired. + */ + if (Irp->Flags & IRP_CREATE_OPERATION) + { + /* Clear the APC Routine and remember this */ + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + SignaledCreateRequest = TRUE; + } } /* Now that we've signaled the events, de-associate the IRP */ @@ -394,7 +432,7 @@ if ((FileObject) && !(SignaledCreateRequest)) { /* Dereference it, since it's not needed anymore either */ - ObDereferenceObject(FileObject); + ObDereferenceObjectDeferDelete(FileObject); } } else @@ -408,7 +446,7 @@ /* So we did return with a synch operation, was it the IRP? */ if (Irp->Flags & IRP_SYNCHRONOUS_API) { - /* Yes, this IRP was synchronous, so retrn the I/O Status */ + /* Yes, this IRP was synchronous, so return the I/O Status */ *Irp->UserIosb = Irp->IoStatus; /* Now check if the user gave an event */ @@ -438,7 +476,7 @@ if ((FileObject) && !(Irp->Flags & IRP_CREATE_OPERATION)) { /* Dereference the File Object unless this was a create */ - ObDereferenceObject(FileObject); + ObDereferenceObjectDeferDelete(FileObject); } /* @@ -520,7 +558,7 @@ /* Did we try lookaside and fail? */ if (Flags & IRP_ALLOCATED_FIXED_SIZE) List->L.AllocateMisses++; - /* Check if we shoudl charge quota */ + /* Check if we should charge quota */ if (ChargeQuota) { /* Irp = ExAllocatePoolWithQuotaTag(NonPagedPool, Size, TAG_IRP); */ @@ -1087,6 +1125,19 @@ Irp); } +FORCEINLINE +VOID +IopClearStackLocation(IN PIO_STACK_LOCATION IoStackLocation) +{ + IoStackLocation->MinorFunction = 0; + IoStackLocation->Flags = 0; + IoStackLocation->Control &= SL_ERROR_RETURNED; + IoStackLocation->Parameters.Others.Argument1 = 0; + IoStackLocation->Parameters.Others.Argument2 = 0; + IoStackLocation->Parameters.Others.Argument3 = 0; + IoStackLocation->FileObject = NULL; +} + /* * @implemented */ @@ -1095,33 +1146,42 @@ IofCompleteRequest(IN PIRP Irp, IN CCHAR PriorityBoost) { - PIO_STACK_LOCATION StackPtr; + PIO_STACK_LOCATION StackPtr, LastStackPtr; PDEVICE_OBJECT DeviceObject; PFILE_OBJECT FileObject; PETHREAD Thread; NTSTATUS Status; - PMDL Mdl; - ULONG MasterIrpCount; + PMDL Mdl, NextMdl; + ULONG MasterCount; PIRP MasterIrp; ULONG Flags; + NTSTATUS ErrorCode = STATUS_SUCCESS; IOTRACE(IO_IRP_DEBUG, "%s - Completing IRP %p\n", __FUNCTION__, Irp); /* Make sure this IRP isn't getting completed twice or is invalid */ - if (((Irp->CurrentLocation) > (Irp->StackCount + 1)) || - (Irp->Type != IO_TYPE_IRP)) + if ((Irp->CurrentLocation) > (Irp->StackCount + 1)) { /* Bugcheck */ KeBugCheckEx(MULTIPLE_IRP_COMPLETE_REQUESTS, (ULONG_PTR)Irp, 0, 0, 0); } /* Some sanity checks */ + ASSERT(Irp->Type == IO_TYPE_IRP); ASSERT(!Irp->CancelRoutine); ASSERT(Irp->IoStatus.Status != STATUS_PENDING); ASSERT(Irp->IoStatus.Status != 0xFFFFFFFF); + /* Get the last stack */ + LastStackPtr = (PIO_STACK_LOCATION)(Irp + 1); + if (LastStackPtr->Control & SL_ERROR_RETURNED) + { + /* Get the error code */ + ErrorCode = (NTSTATUS)LastStackPtr->Parameters.Others.Argument4; + } + /* Get the Current Stack and skip it */ StackPtr = IoGetCurrentIrpStackLocation(Irp); IoSkipCurrentIrpStackLocation(Irp); @@ -1131,14 +1191,32 @@ { /* Set Pending Returned */ Irp->PendingReturned = StackPtr->Control & SL_PENDING_RETURNED; + + /* Check if we failed */ + if (!NT_SUCCESS(Irp->IoStatus.Status)) + { + /* Check if it was changed by a completion routine */ + if (Irp->IoStatus.Status != ErrorCode) + { + /* Update the error for the current stack */ + ErrorCode = Irp->IoStatus.Status; + StackPtr->Control |= SL_ERROR_RETURNED; + LastStackPtr->Parameters.Others.Argument4 = (PVOID)ErrorCode; + LastStackPtr->Control |= SL_ERROR_RETURNED; + } + } /* Check if there is a Completion Routine to Call */ if ((NT_SUCCESS(Irp->IoStatus.Status) && (StackPtr->Control & SL_INVOKE_ON_SUCCESS)) || (!NT_SUCCESS(Irp->IoStatus.Status) && (StackPtr->Control & SL_INVOKE_ON_ERROR)) || - (Irp->Cancel && (StackPtr->Control & SL_INVOKE_ON_CANCEL))) - { + (Irp->Cancel && + (StackPtr->Control & SL_INVOKE_ON_CANCEL))) + { + /* Clear the stack location */ + IopClearStackLocation(StackPtr); + /* Check for highest-level device completion routines */ if (Irp->CurrentLocation == (Irp->StackCount + 1)) { @@ -1168,6 +1246,9 @@ /* Mark it as pending */ IoMarkIrpPending(Irp); } + + /* Clear the stack location */ + IopClearStackLocation(StackPtr); } /* Move to next stack location and pointer */ @@ -1180,17 +1261,13 @@ { /* Get the master IRP and count */ MasterIrp = Irp->AssociatedIrp.MasterIrp; - MasterIrpCount = InterlockedDecrement(&MasterIrp-> - AssociatedIrp.IrpCount); - - /* Set the thread of this IRP as the master's */ - Irp->Tail.Overlay.Thread = MasterIrp->Tail.Overlay.Thread; + MasterCount = InterlockedDecrement(&MasterIrp->AssociatedIrp.IrpCount); /* Free the MDLs */ - while ((Mdl = Irp->MdlAddress)) + for (Mdl = Irp->MdlAddress; Mdl; Mdl = NextMdl) { /* Go to the next one */ - Irp->MdlAddress = Mdl->Next; + NextMdl = Mdl->Next; IoFreeMdl(Mdl); } @@ -1198,7 +1275,7 @@ IoFreeIrp(Irp); /* Complete the Master IRP */ - if (!MasterIrpCount) IofCompleteRequest(MasterIrp, PriorityBoost); + if (!MasterCount) IofCompleteRequest(MasterIrp, PriorityBoost); return; } @@ -1216,11 +1293,11 @@ /* Check if this is a Paging I/O or Close Operation */ if (Irp->Flags & (IRP_PAGING_IO | IRP_CLOSE_OPERATION)) { - /* Handle a Close Operation or Sync Paging I/O (see page 165) */ + /* Handle a Close Operation or Sync Paging I/O */ if (Irp->Flags & (IRP_SYNCHRONOUS_PAGING_IO | IRP_CLOSE_OPERATION)) { /* Set the I/O Status and Signal the Event */ - Flags = Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO; + Flags = Irp->Flags & (IRP_SYNCHRONOUS_PAGING_IO | IRP_PAGING_IO); *Irp->UserIosb = Irp->IoStatus; KeSetEvent(Irp->UserEvent, PriorityBoost, FALSE); @@ -1245,7 +1322,8 @@ PriorityBoost); #else /* Not implemented yet. */ - ASSERT(FALSE); + DPRINT1("Not supported!\n"); + while (TRUE); #endif }

1 0

[hpoussin] 25992: Convert text to multibyte before displaying it
by hpoussin＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: hpoussin Date: Mon Mar 5 02:26:30 2007 New Revision: 25992 URL: http://svn.reactos.org/svn/reactos?rev=25992&view=rev Log: Convert text to multibyte before displaying it Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c (original) +++ trunk/reactos/base/shell/cmd/console.c Mon Mar 5 02:26:30 2007 @@ -240,7 +240,7 @@ INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { INT len; - PTCHAR pBuf; + PCHAR pBuf; CONSOLE_SCREEN_BUFFER_INFO csbi; TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; @@ -281,12 +281,17 @@ //make sure they didnt make the screen to small if(ScreenLines<4) { - ConPrintf(szFormat, arg_ptr, nStdHandle); + ConPrintf(szFormat, arg_ptr, nStdHandle); return 0; } len = _vstprintf (szOut, szFormat, arg_ptr); +#ifdef _UNICODE + pBuf = malloc(len + 1); + len = WideCharToMultiByte( OutputCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; +#else pBuf = szOut; +#endif for(i = 0; i < len; i++) { @@ -300,11 +305,14 @@ if(LineCount >= ScreenLines) { - if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) + if(_strnicmp(&pBuf[i], "\n", 2)!=0) WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); if(PagePrompt() != PROMPT_YES) { +#ifdef _UNICODE + free(pBuf); +#endif return 1; } //reset the number of lines being printed

1 0

[hpoussin] 25991: Some reformatting, no code change
by hpoussin＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: hpoussin Date: Mon Mar 5 02:18:28 2007 New Revision: 25991 URL: http://svn.reactos.org/svn/reactos?rev=25991&view=rev Log: Some reformatting, no code change Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c (original) +++ trunk/reactos/base/shell/cmd/console.c Mon Mar 5 02:18:28 2007 @@ -16,71 +16,71 @@ * 02-Feb-2007 (Paolo Devoti) <devotip at gmail.com>) * Fixed ConPrintfPaging */ - - - + + + #include <precomp.h> #include "resource.h" - - + + #define OUTPUT_BUFFER_SIZE 4096 - - + + UINT InputCodePage; UINT OutputCodePage; - - + + VOID ConInDisable (VOID) { HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); DWORD dwMode; - + GetConsoleMode (hInput, &dwMode); dwMode &= ~ENABLE_PROCESSED_INPUT; SetConsoleMode (hInput, dwMode); } - - + + VOID ConInEnable (VOID) { HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); DWORD dwMode; - + GetConsoleMode (hInput, &dwMode); dwMode |= ENABLE_PROCESSED_INPUT; SetConsoleMode (hInput, dwMode); } - - + + VOID ConInDummy (VOID) { HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); INPUT_RECORD dummy; DWORD dwRead; - + #ifdef _DEBUG if (hInput == INVALID_HANDLE_VALUE) DebugPrintf (_T("Invalid input handle!!!\n")); #endif /* _DEBUG */ ReadConsoleInput (hInput, &dummy, 1, &dwRead); } - + VOID ConInFlush (VOID) { FlushConsoleInputBuffer (GetStdHandle (STD_INPUT_HANDLE)); } - - + + VOID ConInKey (PINPUT_RECORD lpBuffer) { HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); DWORD dwRead; - + #ifdef _DEBUG if (hInput == INVALID_HANDLE_VALUE) DebugPrintf (_T("Invalid input handle!!!\n")); #endif /* _DEBUG */ - + do { ReadConsoleInput (hInput, lpBuffer, 1, &dwRead); @@ -90,19 +90,18 @@ } while (TRUE); } - - - + + VOID ConInString (LPTSTR lpInput, DWORD dwLength) { DWORD dwOldMode; DWORD dwRead; HANDLE hFile; - + LPTSTR p; DWORD i; PCHAR pBuf; - + #ifdef _UNICODE pBuf = (PCHAR)malloc(dwLength); #else @@ -111,11 +110,11 @@ ZeroMemory (lpInput, dwLength * sizeof(TCHAR)); hFile = GetStdHandle (STD_INPUT_HANDLE); GetConsoleMode (hFile, &dwOldMode); - + SetConsoleMode (hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); - + ReadFile (hFile, (PVOID)pBuf, dwLength, &dwRead, NULL); - + #ifdef _UNICODE MultiByteToWideChar( InputCodePage, 0, pBuf, dwLength + 1, lpInput, dwLength + 1); #endif @@ -128,14 +127,14 @@ break; } } - + #ifdef _UNICODE free(pBuf); #endif - + SetConsoleMode (hFile, dwOldMode); } - + static VOID ConChar(TCHAR c, DWORD nStdHandle) { DWORD dwWritten; @@ -156,18 +155,18 @@ &dwWritten, NULL); } - + VOID ConOutChar (TCHAR c) { ConChar(c, STD_OUTPUT_HANDLE); } - + VOID ConPuts(LPTSTR szText, DWORD nStdHandle) { DWORD dwWritten; PCHAR pBuf; INT len; - + len = _tcslen(szText); #ifdef _UNICODE pBuf = malloc(len + 1); @@ -189,35 +188,35 @@ free(pBuf); #endif } - + VOID ConOutResPaging(BOOL NewPage, UINT resID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintfPaging(NewPage, szMsg); -} - + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintfPaging(NewPage, szMsg); +} + VOID ConOutResPuts (UINT resID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - - ConPuts(szMsg, STD_OUTPUT_HANDLE); -} - + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + + ConPuts(szMsg, STD_OUTPUT_HANDLE); +} + VOID ConOutPuts (LPTSTR szText) { ConPuts(szText, STD_OUTPUT_HANDLE); } - - + + VOID ConPrintf(LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { INT len; PCHAR pBuf; TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; - + len = _vstprintf (szOut, szFormat, arg_ptr); #ifdef _UNICODE pBuf = malloc(len + 1); @@ -225,19 +224,19 @@ #else pBuf = szOut; #endif - + WriteFile (GetStdHandle (nStdHandle), pBuf, len, &dwWritten, NULL); - - + + #ifdef _UNICODE free(pBuf); #endif } - + INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { INT len; @@ -245,89 +244,89 @@ CONSOLE_SCREEN_BUFFER_INFO csbi; TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; - - /* used to count number of lines since last pause */ + + /* used to count number of lines since last pause */ static int LineCount = 0; - - /* used to see how big the screen is */ + + /* used to see how big the screen is */ int ScreenLines = 0; - - /* the number of chars in a roow */ + + /* the number of chars in a roow */ int ScreenCol = 0; - - /* chars since start of line */ + + /* chars since start of line */ int CharSL = 0; - + int i = 0; - + if(NewPage == TRUE) LineCount = 0; - - /* rest LineCount and return if no string have been given */ - if (szFormat == NULL) - return 0; - - + + /* rest LineCount and return if no string have been given */ + if (szFormat == NULL) + return 0; + + //get the size of the visual screen that can be printed too if (!GetConsoleScreenBufferInfo(hConsole, &csbi)) - { - // we assuming its a file handle - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } + { + // we assuming its a file handle + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; ScreenCol = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; - + //make sure they didnt make the screen to small if(ScreenLines<4) - { - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } - + { + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } + len = _vstprintf (szOut, szFormat, arg_ptr); pBuf = szOut; - + for(i = 0; i < len; i++) { // search 'end of string' '\n' or 'end of screen line' for(; (i < len) && (pBuf[i] != _T('\n') && (CharSL<ScreenCol)) ; i++) CharSL++; - WriteFile (GetStdHandle (nStdHandle),&pBuf[i-CharSL],sizeof(CHAR)*(CharSL+1),&dwWritten,NULL); + WriteFile (GetStdHandle (nStdHandle),&pBuf[i-CharSL],sizeof(CHAR)*(CharSL+1),&dwWritten,NULL); LineCount++; - CharSL=0; - - if(LineCount >= ScreenLines) - { - if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) + CharSL=0; + + if(LineCount >= ScreenLines) + { + if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); - if(PagePrompt() != PROMPT_YES) - { - return 1; - } - //reset the number of lines being printed - LineCount = 0; - CharSL=0; - } - - } - + if(PagePrompt() != PROMPT_YES) + { + return 1; + } + //reset the number of lines being printed + LineCount = 0; + CharSL=0; + } + + } + #ifdef _UNICODE free(pBuf); #endif return 0; } - + VOID ConErrFormatMessage (DWORD MessageId, ...) { TCHAR szMsg[RC_STRING_MAX_SIZE]; DWORD ret; LPTSTR text; va_list arg_ptr; - + va_start (arg_ptr, MessageId); ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, @@ -336,7 +335,7 @@ (LPTSTR) &text, 0, &arg_ptr); - + va_end (arg_ptr); if(ret > 0) { @@ -349,14 +348,14 @@ ConErrPrintf(szMsg); } } - + VOID ConOutFormatMessage (DWORD MessageId, ...) { TCHAR szMsg[RC_STRING_MAX_SIZE]; DWORD ret; LPTSTR text; va_list arg_ptr; - + va_start (arg_ptr, MessageId); ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, @@ -365,7 +364,7 @@ (LPTSTR) &text, 0, &arg_ptr); - + va_end (arg_ptr); if(ret > 0) { @@ -378,60 +377,60 @@ ConErrPrintf(szMsg); } } - + VOID ConOutPrintf (LPTSTR szFormat, ...) { va_list arg_ptr; - + va_start (arg_ptr, szFormat); ConPrintf(szFormat, arg_ptr, STD_OUTPUT_HANDLE); va_end (arg_ptr); } - + INT ConOutPrintfPaging (BOOL NewPage, LPTSTR szFormat, ...) { INT iReturn; va_list arg_ptr; - + va_start (arg_ptr, szFormat); iReturn = ConPrintfPaging(NewPage, szFormat, arg_ptr, STD_OUTPUT_HANDLE); va_end (arg_ptr); return iReturn; } - + VOID ConErrChar (TCHAR c) { ConChar(c, STD_ERROR_HANDLE); } - - + + VOID ConErrResPuts (UINT resID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); ConPuts(szMsg, STD_ERROR_HANDLE); } - + VOID ConErrPuts (LPTSTR szText) { ConPuts(szText, STD_ERROR_HANDLE); } - - + + VOID ConErrPrintf (LPTSTR szFormat, ...) { va_list arg_ptr; - + va_start (arg_ptr, szFormat); ConPrintf(szFormat, arg_ptr, STD_ERROR_HANDLE); va_end (arg_ptr); } - + #ifdef _DEBUG VOID DebugPrintf (LPTSTR szFormat, ...) { va_list arg_ptr; - + va_start (arg_ptr, szFormat); ConPrintf(szFormat, arg_ptr, STD_ERROR_HANDLE); va_end (arg_ptr); @@ -444,69 +443,69 @@ #endif } #endif /* _DEBUG */ - + VOID SetCursorXY (SHORT x, SHORT y) { COORD coPos; - + coPos.X = x; coPos.Y = y; SetConsoleCursorPosition (GetStdHandle (STD_OUTPUT_HANDLE), coPos); } - - + + VOID GetCursorXY (PSHORT x, PSHORT y) { CONSOLE_SCREEN_BUFFER_INFO csbi; - + GetConsoleScreenBufferInfo (hConsole, &csbi); - + *x = csbi.dwCursorPosition.X; *y = csbi.dwCursorPosition.Y; } - - + + SHORT GetCursorX (VOID) { CONSOLE_SCREEN_BUFFER_INFO csbi; - + GetConsoleScreenBufferInfo (hConsole, &csbi); - + return csbi.dwCursorPosition.X; } - - + + SHORT GetCursorY (VOID) { CONSOLE_SCREEN_BUFFER_INFO csbi; - + GetConsoleScreenBufferInfo (hConsole, &csbi); - + return csbi.dwCursorPosition.Y; } - - + + VOID GetScreenSize (PSHORT maxx, PSHORT maxy) { CONSOLE_SCREEN_BUFFER_INFO csbi; - + GetConsoleScreenBufferInfo (hConsole, &csbi); - + if (maxx) *maxx = csbi.dwSize.X; if (maxy) *maxy = csbi.dwSize.Y; } - - + + VOID SetCursorType (BOOL bInsert, BOOL bVisible) { CONSOLE_CURSOR_INFO cci; - + cci.dwSize = bInsert ? 10 : 99; cci.bVisible = bVisible; - + SetConsoleCursorInfo (GetStdHandle (STD_OUTPUT_HANDLE), &cci); } - + /* EOF */

1 0

[greatlrd] 25990: merge down 25984 on alex request
by greatlrd＠svn.reactos.org 04 Mar '07

04 Mar '07

Author: greatlrd Date: Mon Mar 5 01:01:08 2007 New Revision: 25990 URL: http://svn.reactos.org/svn/reactos?rev=25990&view=rev Log: merge down 25984 on alex request Modified: branches/ros-branch-0_3_1/reactos/hal/halx86/generic/systimer.S branches/ros-branch-0_3_1/reactos/hal/halx86/generic/timer.c branches/ros-branch-0_3_1/reactos/include/ndk/asm.h branches/ros-branch-0_3_1/reactos/lib/rtl/debug.c branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/clock.S branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/kiinit.c Modified: branches/ros-branch-0_3_1/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/hal/ha… ============================================================================== --- branches/ros-branch-0_3_1/reactos/hal/halx86/generic/systimer.S (original) +++ branches/ros-branch-0_3_1/reactos/hal/halx86/generic/systimer.S Mon Mar 5 01:01:08 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,37 @@ 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: branches/ros-branch-0_3_1/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/hal/ha… ============================================================================== --- branches/ros-branch-0_3_1/reactos/hal/halx86/generic/timer.c (original) +++ branches/ros-branch-0_3_1/reactos/hal/halx86/generic/timer.c Mon Mar 5 01:01:08 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,21 @@ 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: branches/ros-branch-0_3_1/reactos/include/ndk/asm.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/asm.h (original) +++ branches/ros-branch-0_3_1/reactos/include/ndk/asm.h Mon Mar 5 01:01:08 2007 @@ -187,6 +187,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: branches/ros-branch-0_3_1/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/lib/rt… ============================================================================== --- branches/ros-branch-0_3_1/reactos/lib/rtl/debug.c (original) +++ branches/ros-branch-0_3_1/reactos/lib/rtl/debug.c Mon Mar 5 01:01:08 2007 @@ -150,7 +150,7 @@ if (Status == STATUS_BREAKPOINT) { /* Breakpoint */ - DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + // DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); Status = STATUS_SUCCESS; } } Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/clock.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/clock.S (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/clock.S Mon Mar 5 01:01:08 2007 @@ -20,6 +20,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 @@ -45,11 +49,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: @@ -146,11 +151,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 @@ -222,7 +236,13 @@ push offset _KiExpireTimerDpc call _KeInsertQueueDpc@12 +DebugCheck: + /* 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 @@ -244,4 +264,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 Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/kiinit.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/kiinit.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ke/i386/kiinit.c Mon Mar 5 01:01:08 2007 @@ -159,7 +159,7 @@ if (!(KeFeatureBits & KF_PAT) && (KeFeatureBits & KF_MTRR)) { /* Then manually initialize MTRR for the CPU */ - KiInitializeMTRR((BOOLEAN)i); + KiInitializeMTRR(i ? FALSE : TRUE); } /* Check if we have AMD MTRR and initialize it for the CPU */

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2007