Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[hbirr] 14763: Remove the thread from the list when terminating.
by hbirr＠svn.reactos.com 23 Apr '05

23 Apr '05

Remove the thread from the list when terminating. Modified: trunk/reactos/ntoskrnl/ke/kthread.c _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-23 06:45:56 UTC (rev 14762) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-23 10:11:37 UTC (rev 14763) @@ -1137,6 +1137,9 @@ /* Lock the Dispatcher Database and the APC Queue */ DPRINT("Terminating\n"); OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Remove the thread from the list */ + RemoveEntryList(&Thread->ThreadListEntry); /* Insert into the Reaper List */ DPRINT("List: %p\n", PspReaperList);

1 0

[ion] 14762: And these should've been added...
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

And these should've been added... Added: trunk/reactos/ntoskrnl/dbgk/ Added: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Added: trunk/reactos/ntoskrnl/dbgk/debug.c Added: trunk/reactos/ntoskrnl/ex/dbgctrl.c Added: trunk/reactos/ntoskrnl/include/internal/dbgk.h Added: trunk/reactos/ntoskrnl/include/internal/kdb.h Added: trunk/reactos/ntoskrnl/rtl/debug.c _____ Added: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c 2005-04-23 06:43:39 UTC (rev 14761) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c 2005-04-23 06:45:56 UTC (rev 14762) @@ -0,0 +1,57 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/dbgk/dbgkutil.c + * PURPOSE: User-Mode Debugging Support, Internal Debug Functions. + * + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +/* FUNCTIONS *****************************************************************/ + +VOID +STDCALL +DbgkCreateThread(PVOID StartAddress) +{ +#if 0 + LPC_DBG_MESSAGE Message; + LPC_DBG_MESSAGE Reply; + NTSTATUS Status; + + if (PsGetCurrentThread()->ThreadsProcess->DebugPort == NULL) + { + return; + } + + Message.Header.MessageSize = sizeof(LPC_DBG_MESSAGE); + Message.Header.DataSize = sizeof(LPC_DBG_MESSAGE) - + sizeof(LPC_MESSAGE); + Message.Type = DBG_EVENT_CREATE_THREAD; + Message.Status = STATUS_SUCCESS; + Message.Data.CreateThread.Reserved = 0; + Message.Data.CreateThread.StartAddress = StartAddress; + + /* FIXME: Freeze all threads in process */ + + /* Send the message to the process's debug port and wait for a reply */ + Status = + LpcSendDebugMessagePort(PsGetCurrentThread()->ThreadsProcess->DebugPort, + &Message, + &Reply); + if (!NT_SUCCESS(Status)) + { + return; + } + + /* FIXME: Examine reply */ + return; +#endif +} + +/* EOF */ _____ Added: trunk/reactos/ntoskrnl/dbgk/debug.c --- trunk/reactos/ntoskrnl/dbgk/debug.c 2005-04-23 06:43:39 UTC (rev 14761) +++ trunk/reactos/ntoskrnl/dbgk/debug.c 2005-04-23 06:45:56 UTC (rev 14762) @@ -0,0 +1,164 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/dbgk/debug.c + * PURPOSE: User-Mode Debugging Support, Debug Object Management. + * + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +POBJECT_TYPE DbgkDebugObjectType; +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +STDCALL +NtCreateDebugObject(OUT PHANDLE DebugHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN BOOLEAN KillProcessOnExit) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PDBGK_DEBUG_OBJECT DebugObject; + HANDLE hDebug; + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + DPRINT("NtCreateDebugObject(0x%x, 0x%x, 0x%x)\n", DebugHandle, DesiredAccess, ObjectAttributes); + + /* Check Output Safety */ + if(PreviousMode != KernelMode) { + + _SEH_TRY { + + ProbeForWrite(DebugHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + + if(!NT_SUCCESS(Status)) return Status; + } + + /* Create the Object */ + Status = ObCreateObject(PreviousMode, + DbgkDebugObjectType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(PDBGK_DEBUG_OBJECT), + 0, + 0, + (PVOID*)&DebugObject); + + /* Check for Success */ + if(NT_SUCCESS(Status)) { + + /* Initialize the Debug Object's Fast Mutex */ + ExInitializeFastMutex(&DebugObject->Mutex); + + /* Initialize the State Event List */ + InitializeListHead(&DebugObject->StateEventListEntry); + + /* Initialize the Debug Object's Wait Event */ + KeInitializeEvent(&DebugObject->Event, NotificationEvent, 0); + + /* Set the Flags */ + DebugObject->KillProcessOnExit = KillProcessOnExit; + + /* Insert it */ + Status = ObInsertObject((PVOID)DebugObject, + NULL, + DesiredAccess, + 0, + NULL, + &hDebug); + ObDereferenceObject(DebugObject); + + /* Check for success and return handle */ + if(NT_SUCCESS(Status)) { + + _SEH_TRY { + + *DebugHandle = hDebug; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + } + } + + /* Return Status */ + return Status; +} + +NTSTATUS +STDCALL +NtWaitForDebugEvent(IN HANDLE DebugObject, // Debug object handle must grant DEBUG_OBJECT_WAIT_STATE_CHANGE access. + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL, + OUT PDBGUI_WAIT_STATE_CHANGE StateChange) +{ + + UNIMPLEMENTED; + + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +STDCALL +NtDebugContinue(IN HANDLE DebugObject, // Debug object handle must grant DEBUG_OBJECT_WAIT_STATE_CHANGE access. + IN PCLIENT_ID AppClientId, + IN NTSTATUS ContinueStatus) +{ + + UNIMPLEMENTED; + + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +STDCALL +NtDebugActiveProcess(IN HANDLE Process, // Process handle must grant PROCESS_SUSPEND_RESUME access. + IN HANDLE DebugObject) // Debug object handle must grant DEBUG_OBJECT_ADD_REMOVE_PROCESS access. +{ + + UNIMPLEMENTED; + + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +STDCALL +NtRemoveProcessDebug(IN HANDLE Process, // Process handle must grant PROCESS_SUSPEND_RESUME access. + IN HANDLE DebugObject) // Debug object handle must grant DEBUG_OBJECT_ADD_REMOVE_PROCESS access. +{ + + UNIMPLEMENTED; + + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +STDCALL +NtSetInformationDebugObject(IN HANDLE DebugObject, // Debug object handle need not grant any particular access right. + IN DEBUGOBJECTINFOCLASS DebugObjectInformationClass, + IN PVOID DebugInformation, + IN ULONG DebugInformationLength, + OUT PULONG ReturnLength OPTIONAL) +{ + UNIMPLEMENTED; + + return STATUS_NOT_IMPLEMENTED; +} +/* EOF */ _____ Added: trunk/reactos/ntoskrnl/ex/dbgctrl.c --- trunk/reactos/ntoskrnl/ex/dbgctrl.c 2005-04-23 06:43:39 UTC (rev 14761) +++ trunk/reactos/ntoskrnl/ex/dbgctrl.c 2005-04-23 06:45:56 UTC (rev 14762) @@ -0,0 +1,46 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ex/dbgctrl.c + * PURPOSE: System debug control + * + * PROGRAMMERS: No programmer listed. + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +STDCALL +NtSystemDebugControl(DEBUG_CONTROL_CODE ControlCode, + PVOID InputBuffer, + ULONG InputBufferLength, + PVOID OutputBuffer, + ULONG OutputBufferLength, + PULONG ReturnLength) +{ + switch (ControlCode) + { + case DebugGetTraceInformation: + case DebugSetInternalBreakpoint: + case DebugSetSpecialCall: + case DebugClearSpecialCalls: + case DebugQuerySpecialCalls: + case DebugDbgBreakPoint: + break; + + case DebugDbgLoadSymbols: + KDB_LOADUSERMODULE_HOOK((PLDR_MODULE) InputBuffer); + break; + + default: + break; + } + + return STATUS_SUCCESS; +} _____ Added: trunk/reactos/ntoskrnl/include/internal/dbgk.h --- trunk/reactos/ntoskrnl/include/internal/dbgk.h 2005-04-23 06:43:39 UTC (rev 14761) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h 2005-04-23 06:45:56 UTC (rev 14762) @@ -0,0 +1,143 @@ +/* + * ReactOS kernel + * Copyright (C) 2000 David Welch <welch(a)cwcom.net> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_DBGK_H +#define __NTOSKRNL_INCLUDE_INTERNAL_DBGK_H + +// +// DebugObject access rights. +// Note that DEBUG_OBJECT_ALL_ACCESS includes the specific rights 0x0F, but there are only two +// debug object specific access rights that are ever checked by the kernel. This appears to be a bug. +// +#define DEBUG_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x0F) +#define DEBUG_OBJECT_WAIT_STATE_CHANGE 0x0001 /* Required to call NtWaitForDebugEvent & NtContinueDebugEvent */ +#define DEBUG_OBJECT_ADD_REMOVE_PROCESS 0x0002 /* Required to call NtDebugActiveProcess & NtRemoveProcessDebug */ + +typedef enum _DEBUGOBJECTINFOCLASS { + DebugObjectUnusedInformation, + DebugObjectKillProcessOnExitInformation +} DEBUGOBJECTINFOCLASS, * PDEBUGOBJECTINFOCLASS; + +typedef struct _DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION { + ULONG KillProcessOnExit; // Interpreted as a BOOLEAN, TRUE -> process is terminated on NtRemoveProcessDebug. +} DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION, * +PDEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION; + +// +// Debug Object +// +typedef struct _DBGK_DEBUG_OBJECT { + KEVENT Event; + FAST_MUTEX Mutex; + LIST_ENTRY StateEventListEntry; + union { + ULONG Flags; + struct { + UCHAR DebuggerInactive :1; + UCHAR KillProcessOnExit :1; + }; + }; +} DBGK_DEBUG_OBJECT, *PDBGK_DEBUG_OBJECT; + +// +// DbgUi types for LPC debug port messages (KM -> UM). +// +// These also apply to Nt*Debug APIs with NT 5.01, 5.02, and later. +// +typedef enum _DBG_STATE { + DbgIdle, + DbgReplyPending, + DbgCreateThreadStateChange, + DbgCreateProcessStateChange, + DbgExitThreadStateChange, + DbgExitProcessStateChange, + DbgExceptionStateChange, + DbgBreakpointStateChange, + DbgSingleStepStateChange, + DbgLoadDllStateChange, + DbgUnloadDllStateChange +} DBG_STATE, *PDBG_STATE; + +typedef struct _DBGKM_EXCEPTION { + EXCEPTION_RECORD ExceptionRecord; + ULONG FirstChance; +} DBGKM_EXCEPTION, *PDBGKM_EXCEPTION; + +typedef struct _DBGKM_CREATE_THREAD { + ULONG SubSystemKey; + PVOID StartAddress; +} DBGKM_CREATE_THREAD, *PDBGKM_CREATE_THREAD; + +typedef struct _DBGKM_CREATE_PROCESS { + ULONG SubSystemKey; + HANDLE FileHandle; + PVOID BaseOfImage; + ULONG DebugInfoFileOffset; + ULONG DebugInfoSize; + DBGKM_CREATE_THREAD InitialThread; +} DBGKM_CREATE_PROCESS, *PDBGKM_CREATE_PROCESS; + +typedef struct _DBGKM_EXIT_THREAD { + NTSTATUS ExitStatus; +} DBGKM_EXIT_THREAD, *PDBGKM_EXIT_THREAD; + +typedef struct _DBGKM_EXIT_PROCESS { + NTSTATUS ExitStatus; +} DBGKM_EXIT_PROCESS, *PDBGKM_EXIT_PROCESS; + +typedef struct _DBGKM_LOAD_DLL { + HANDLE FileHandle; + PVOID BaseOfDll; + ULONG DebugInfoFileOffset; + ULONG DebugInfoSize; +} DBGKM_LOAD_DLL, *PDBGKM_LOAD_DLL; + +typedef struct _DBGKM_UNLOAD_DLL { + PVOID BaseAddress; +} DBGKM_UNLOAD_DLL, *PDBGKM_UNLOAD_DLL; + +typedef struct _DBGUI_WAIT_STATE_CHANGE { + DBG_STATE NewState; + CLIENT_ID AppClientId; + union { + struct { + HANDLE HandleToThread; + DBGKM_CREATE_THREAD NewThread; + } CreateThread; + struct { + HANDLE HandleToProcess; + HANDLE HandleToThread; + DBGKM_CREATE_PROCESS NewProcess; + } CreateProcessInfo; + DBGKM_EXIT_THREAD ExitThread; + DBGKM_EXIT_PROCESS ExitProcess; + DBGKM_EXCEPTION Exception; + DBGKM_LOAD_DLL LoadDll; + DBGKM_UNLOAD_DLL UnloadDll; + } StateInfo; +} DBGUI_WAIT_STATE_CHANGE, * PDBGUI_WAIT_STATE_CHANGE; + + +VOID +STDCALL +DbgkCreateThread(PVOID StartAddress); + +#endif + +/* EOF */ _____ Added: trunk/reactos/ntoskrnl/include/internal/kdb.h --- trunk/reactos/ntoskrnl/include/internal/kdb.h 2005-04-23 06:43:39 UTC (rev 14761) +++ trunk/reactos/ntoskrnl/include/internal/kdb.h 2005-04-23 06:45:56 UTC (rev 14762) @@ -0,0 +1,284 @@ +#ifndef NTOSKRNL_KDB_H +#define NTOSKRNL_KDB_H + +/* INCLUDES ******************************************************************/ + +#define NTOS_MODE_KERNEL +#include <ntos.h> + +#include <internal/ke.h> + +/* DEFINES *******************************************************************/ + +#define TAG_KDBG (('K' << 24) | ('D' << 16) | ('B' << 8) | 'G') + +#ifndef RTL_NUMBER_OF +# define RTL_NUMBER_OF(x) (sizeof(x) / sizeof((x)[0])) +#endif + + +/* TYPES *********************************************************************/ + +/* from kdb.c */ +typedef struct _KDB_KTRAP_FRAME +{ + KTRAP_FRAME Tf; + ULONG Cr0; + ULONG Cr1; /* reserved/unused */ + ULONG Cr2; + ULONG Cr3; + ULONG Cr4; +} KDB_KTRAP_FRAME, *PKDB_KTRAP_FRAME; + +typedef enum _KDB_BREAKPOINT_TYPE +{ + KdbBreakPointNone = 0, + KdbBreakPointSoftware, + KdbBreakPointHardware, + KdbBreakPointTemporary +} KDB_BREAKPOINT_TYPE; + +typedef enum _KDB_ACCESS_TYPE +{ + KdbAccessRead, + KdbAccessWrite, + KdbAccessReadWrite, + KdbAccessExec +} KDB_ACCESS_TYPE; + +typedef struct _KDB_BREAKPOINT +{ + KDB_BREAKPOINT_TYPE Type; /* Type of breakpoint */ + BOOLEAN Enabled; /* Whether the bp is enabled */ + ULONG_PTR Address; /* Address of the breakpoint */ + BOOLEAN Global; /* Whether the breakpoint is global or local to a process */ + PEPROCESS Process; /* Owning process */ + PCHAR ConditionExpression; + PVOID Condition; + union { + /* KdbBreakPointSoftware */ + UCHAR SavedInstruction; + /* KdbBreakPointHardware */ + struct { + UCHAR DebugReg : 2; + UCHAR Size : 3; + KDB_ACCESS_TYPE AccessType; + } Hw; + } Data; +} KDB_BREAKPOINT, *PKDB_BREAKPOINT; + +typedef enum _KDB_ENTER_CONDITION +{ + KdbDoNotEnter, + KdbEnterAlways, + KdbEnterFromKmode, + KdbEnterFromUmode +} KDB_ENTER_CONDITION; + + +/* from kdb_symbols.c */ +typedef struct _KDB_MODULE_INFO +{ + WCHAR Name[256]; + ULONG_PTR Base; + ULONG Size; + PROSSYM_INFO RosSymInfo; +} KDB_MODULE_INFO, *PKDB_MODULE_INFO; + + +/* FUNCTIONS *****************************************************************/ + +/* from i386/i386-dis.c */ + +LONG +KdbpDisassemble( + IN ULONG Address, + IN ULONG IntelSyntax); + +LONG +KdbpGetInstLength( + IN ULONG Address); + +/* from i386/kdb_help.S */ + +STDCALL VOID +KdbpStackSwitchAndCall( + IN PVOID NewStack, + IN VOID (*Function)(VOID)); + +/* from kdb_cli.c */ + +extern PCHAR KdbInitFileBuffer; + +VOID +KdbpCliInit(); + +VOID +KdbpCliMainLoop( + IN BOOLEAN EnteredOnSingleStep); + +VOID +KdbpCliModuleLoaded( + IN PUNICODE_STRING Name); + +VOID +KdbpCliInterpretInitFile(); + +VOID +KdbpPrint( + IN PCHAR Format, + IN ... OPTIONAL); + +/* from kdb_expr.c */ + +BOOLEAN +KdbpRpnEvaluateExpression( + IN PCHAR Expression, + IN PKDB_KTRAP_FRAME TrapFrame, + OUT PULONGLONG Result, + OUT PLONG ErrOffset OPTIONAL, + OUT PCHAR ErrMsg OPTIONAL); + +PVOID +KdbpRpnParseExpression( + IN PCHAR Expression, + OUT PLONG ErrOffset OPTIONAL, + OUT PCHAR ErrMsg OPTIONAL); + +BOOLEAN +KdbpRpnEvaluateParsedExpression( + IN PVOID Expression, + IN PKDB_KTRAP_FRAME TrapFrame, + OUT PULONGLONG Result, + OUT PLONG ErrOffset OPTIONAL, + OUT PCHAR ErrMsg OPTIONAL); + +/* from kdb_symbols.c */ + +BOOLEAN +KdbpSymFindModuleByAddress(IN PVOID Address, + OUT PKDB_MODULE_INFO pInfo); + +BOOLEAN +KdbpSymFindModuleByName(IN LPCWSTR Name, + OUT PKDB_MODULE_INFO pInfo); + +BOOLEAN +KdbpSymFindModuleByIndex(IN INT Index, + OUT PKDB_MODULE_INFO pInfo); + +BOOLEAN +KdbSymPrintAddress(IN PVOID Address); + +NTSTATUS +KdbSymGetAddressInformation(IN PROSSYM_INFO RosSymInfo, + IN ULONG_PTR RelativeAddress, + OUT PULONG LineNumber OPTIONAL, + OUT PCH FileName OPTIONAL, + OUT PCH FunctionName OPTIONAL); + +/* from kdb.c */ + +extern PEPROCESS KdbCurrentProcess; +extern PETHREAD KdbCurrentThread; +extern LONG KdbLastBreakPointNr; +extern ULONG KdbNumSingleSteps; +extern BOOLEAN KdbSingleStepOver; +extern PKDB_KTRAP_FRAME KdbCurrentTrapFrame; + +VOID +KdbInit(); + +VOID +KdbModuleLoaded( + IN PUNICODE_STRING Name); + +LONG +KdbpGetNextBreakPointNr( + IN ULONG Start OPTIONAL); + +BOOLEAN +KdbpGetBreakPointInfo( + IN ULONG BreakPointNr, + OUT ULONG_PTR *Address OPTIONAL, + OUT KDB_BREAKPOINT_TYPE *Type OPTIONAL, + OUT UCHAR *Size OPTIONAL, + OUT KDB_ACCESS_TYPE *AccessType OPTIONAL, + OUT UCHAR *DebugReg OPTIONAL, + OUT BOOLEAN *Enabled OPTIONAL, + OUT BOOLEAN *Global OPTIONAL, + OUT PEPROCESS *Process OPTIONAL, + OUT PCHAR *ConditionExpression OPTIONAL); + +NTSTATUS +KdbpInsertBreakPoint( + IN ULONG_PTR Address, + IN KDB_BREAKPOINT_TYPE Type, + IN UCHAR Size OPTIONAL, + IN KDB_ACCESS_TYPE AccessType OPTIONAL, + IN PCHAR ConditionExpression OPTIONAL, + IN BOOLEAN Global, + OUT PULONG BreakPointNumber OPTIONAL); + +BOOLEAN +KdbpDeleteBreakPoint( + IN LONG BreakPointNr OPTIONAL, + IN OUT PKDB_BREAKPOINT BreakPoint OPTIONAL); + +BOOLEAN +KdbpEnableBreakPoint( + IN LONG BreakPointNr OPTIONAL, + IN OUT PKDB_BREAKPOINT BreakPoint OPTIONAL); + +BOOLEAN +KdbpDisableBreakPoint( + IN LONG BreakPointNr OPTIONAL, + IN OUT PKDB_BREAKPOINT BreakPoint OPTIONAL); + +BOOLEAN +KdbpGetEnterCondition( + IN LONG ExceptionNr, + IN BOOLEAN FirstChance, + OUT KDB_ENTER_CONDITION *Condition); + +BOOLEAN +KdbpSetEnterCondition( + IN LONG ExceptionNr, + IN BOOLEAN FirstChance, + IN KDB_ENTER_CONDITION Condition); + +BOOLEAN +KdbpAttachToThread( + PVOID ThreadId); + +BOOLEAN +KdbpAttachToProcess( + PVOID ProcessId); + +/* other functions */ + +#define KdbpSafeReadMemory(dst, src, size) MmSafeCopyFromUser(dst, src, size) +#define KdbpSafeWriteMemory(dst, src, size) MmSafeCopyToUser(dst, src, size) + +#define KdbpGetCharKeyboard(ScanCode) KdbpTryGetCharKeyboard(ScanCode, 0) +CHAR +KdbpTryGetCharKeyboard(PULONG ScanCode, UINT Retry); + +#define KdbpGetCharSerial() KdbpTryGetCharSerial(0) +CHAR +KdbpTryGetCharSerial(UINT Retry); + +VOID +KdbEnter(VOID); +VOID +DbgRDebugInit(VOID); +VOID +DbgShowFiles(VOID); +VOID +DbgEnableFile(PCH Filename); +VOID +DbgDisableFile(PCH Filename); + + +#endif /* NTOSKRNL_KDB_H */ + _____ Added: trunk/reactos/ntoskrnl/rtl/debug.c --- trunk/reactos/ntoskrnl/rtl/debug.c 2005-04-23 06:43:39 UTC (rev 14761) +++ trunk/reactos/ntoskrnl/rtl/debug.c 2005-04-23 06:45:56 UTC (rev 14762) @@ -0,0 +1,190 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/rtl/dbgprint.c + * PURPOSE: Debug output + * + * PROGRAMMERS: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#include <internal/debug.h> + +/* FUNCTIONS ****************************************************************/ + +/* + * Note: DON'T CHANGE THIS FUNCTION!!! + * DON'T CALL HalDisplayString OR SOMETING ELSE!!! + * You'll only break the serial/bochs debugging feature!!! + */ + +/* + * @implemented + */ +ULONG +DbgPrint(PCH Format, ...) +{ + ANSI_STRING DebugString; + CHAR Buffer[1024]; + va_list ap; +#ifdef SERIALIZE_DBGPRINT +# define MESSAGETABLE_SIZE 16 + LONG MyTableIndex; + static LONG Lock = 0; + static LONG TableWriteIndex = 0, TableReadIndex = 0; + static CHAR MessageTable[MESSAGETABLE_SIZE][sizeof(Buffer)] = { { '\0' } }; +#endif /* SERIALIZE_DBGPRINT */ + + /* init ansi string */ + DebugString.Buffer = Buffer; + DebugString.MaximumLength = sizeof(Buffer); + + va_start (ap, Format); + DebugString.Length = _vsnprintf (Buffer, sizeof( Buffer ), Format, ap); + va_end (ap); + +#ifdef SERIALIZE_DBGPRINT + /* check if we are already running */ + if (InterlockedCompareExchange(&Lock, 1, 0) == 1) + { + MyTableIndex = InterlockedIncrement(&TableWriteIndex) - 1; + InterlockedCompareExchange(&TableWriteIndex, 0, MESSAGETABLE_SIZE); + MyTableIndex %= MESSAGETABLE_SIZE; + + if (MessageTable[MyTableIndex][0] != '\0') /* table is full */ + { + DebugString.Buffer = "CRITICAL ERROR: DbgPrint Table is FULL!"; + DebugString.Length = 39; + KdpPrintString(&DebugString); + for (;;); + } + else + { + /*DebugString.Buffer = "ÁÁÁ"; + DebugString.Length = 3; + KdpPrintString(&DebugString);*/ + memcpy(MessageTable[MyTableIndex], DebugString.Buffer, DebugString.Length); + MessageTable[MyTableIndex][DebugString.Length] = '\0'; + } + } + else + { +#endif /* SERIALIZE_DBGPRINT */ + KdpPrintString (&DebugString); +#ifdef SERIALIZE_DBGPRINT + MyTableIndex = TableReadIndex; + while (MessageTable[MyTableIndex][0] != '\0') + { + /*DebugString.Buffer = "$$$"; + DebugString.Length = 3; + KdpPrintString(&DebugString);*/ + + DebugString.Buffer = MessageTable[MyTableIndex]; + DebugString.Length = strlen(DebugString.Buffer); + DebugString.MaximumLength = DebugString.Length + 1; + + KdpPrintString(&DebugString); + MessageTable[MyTableIndex][0] = '\0'; + + MyTableIndex = InterlockedIncrement(&TableReadIndex); + InterlockedCompareExchange(&TableReadIndex, 0, MESSAGETABLE_SIZE); + MyTableIndex %= MESSAGETABLE_SIZE; + } + InterlockedDecrement(&Lock); + } +# undef MESSAGETABLE_SIZE +#endif /* SERIALIZE_DBGPRINT */ + + return (ULONG)DebugString.Length; +} + +/* + * @unimplemented + */ +ULONG +__cdecl +DbgPrintEx(IN ULONG ComponentId, + IN ULONG Level, + IN PCH Format, + ...) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +ULONG +__cdecl +DbgPrintReturnControlC(PCH Format, + ...) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +VOID +STDCALL +DbgPrompt(PCH OutputString, + PCH InputString, + USHORT InputSize) +{ + ANSI_STRING Output; + ANSI_STRING Input; + + Input.Length = 0; + Input.MaximumLength = InputSize; + Input.Buffer = InputString; + + Output.Length = strlen (OutputString); + Output.MaximumLength = Output.Length + 1; + Output.Buffer = OutputString; + + /* FIXME: Not implemented yet! + KdpPromptString (&Output, &Input); */ +} + +/* + * @unimplemented + */ +NTSTATUS +STDCALL +DbgQueryDebugFilterState(IN ULONG ComponentId, + IN ULONG Level) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +STDCALL +DbgSetDebugFilterState(IN ULONG ComponentId, + IN ULONG Level, + IN BOOLEAN State) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +STDCALL +DbgLoadImageSymbols(IN PUNICODE_STRING Name, + IN ULONG Base, + IN ULONG Unknown3) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} +/* EOF */

1 0

[ion] 14761: Bug in previous commit...these should've been deleted
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Bug in previous commit...these should've been deleted Deleted: trunk/reactos/ntoskrnl/kdbg/dbgctrl.c Deleted: trunk/reactos/ntoskrnl/kdbg/errinfo.c Deleted: trunk/reactos/ntoskrnl/kdbg/print.c Deleted: trunk/reactos/ntoskrnl/kdbg/rdebug.c Deleted: trunk/reactos/ntoskrnl/kdbg/user.c _____ Deleted: trunk/reactos/ntoskrnl/kdbg/dbgctrl.c --- trunk/reactos/ntoskrnl/kdbg/dbgctrl.c 2005-04-23 06:41:25 UTC (rev 14760) +++ trunk/reactos/ntoskrnl/kdbg/dbgctrl.c 2005-04-23 06:43:39 UTC (rev 14761) @@ -1,58 +0,0 @@ -/* $Id:$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/dbgctrl.c - * PURPOSE: System debug control - * - * PROGRAMMERS: No programmer listed. - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* FUNCTIONS *****************************************************************/ - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -DbgLoadImageSymbols( - IN PUNICODE_STRING Name, - IN ULONG Base, - IN ULONG Unknown3 - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -NTSTATUS STDCALL -NtSystemDebugControl(DEBUG_CONTROL_CODE ControlCode, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - PULONG ReturnLength) -{ - switch (ControlCode) { - case DebugGetTraceInformation: - case DebugSetInternalBreakpoint: - case DebugSetSpecialCall: - case DebugClearSpecialCalls: - case DebugQuerySpecialCalls: - case DebugDbgBreakPoint: - break; - case DebugDbgLoadSymbols: - KDB_LOADUSERMODULE_HOOK((PLDR_MODULE) InputBuffer); - break; - default: - break; - } - return STATUS_SUCCESS; -} _____ Deleted: trunk/reactos/ntoskrnl/kdbg/errinfo.c --- trunk/reactos/ntoskrnl/kdbg/errinfo.c 2005-04-23 06:41:25 UTC (rev 14760) +++ trunk/reactos/ntoskrnl/kdbg/errinfo.c 2005-04-23 06:43:39 UTC (rev 14761) @@ -1,268 +0,0 @@ -/* $Id:$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/errinfo.c - * PURPOSE: Print information descriptions of error messages - * - * PROGRAMMERS: No programmer listed. - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - -/* GLOBALS *******************************************************************/ - -static PCHAR SeverityCodes[] = {"SUC", "INF", "ERR", "WRN"}; - -static struct _FACLIST -{ - ULONG Code; - PCHAR Name; -} FacList[] = -{ - {0, "KERNEL"}, - {0, NULL} -}; - -static struct _ERRLIST -{ - NTSTATUS Code; - PCHAR Name; - PCHAR Text; -} ErrList[] = -{ - {STATUS_SUCCESS, "SUCCESS", NULL}, - {STATUS_INSUFFICIENT_RESOURCES, "INSUFFICIENT_RESOURCES", NULL}, - {STATUS_OBJECT_NAME_EXISTS, "OBJECT_NAME_EXISTS", NULL}, - {STATUS_OBJECT_NAME_COLLISION, "OBJECT_NAME_COLLISION", NULL}, - {STATUS_CTL_FILE_NOT_SUPPORTED, "CTL_FILE_NOT_SUPPORTED", NULL}, - {STATUS_PORT_ALREADY_SET, "PORT_ALREADY_SET", NULL}, - {STATUS_SECTION_NOT_IMAGE, "SECTION_NOT_IMAGE", NULL}, - {STATUS_BAD_WORKING_SET_LIMIT, "BAD_WORKING_SET_LIMIT", NULL}, - {STATUS_INCOMPATIBLE_FILE_MAP, "INCOMPATIBLE_FILE_MAP", NULL}, - {STATUS_HANDLE_NOT_WAITABLE, "HANDLE_NOT_WAITABLE", NULL}, - {STATUS_PORT_DISCONNECTED, "PORT_DISCONNECTED", NULL}, - {STATUS_NOT_LOCKED, "NOT_LOCKED", NULL}, - {STATUS_NOT_MAPPED_VIEW, "NOT_MAPPED_VIEW", NULL}, - {STATUS_UNABLE_TO_FREE_VM, "UNABLE_TO_FREE_VM", NULL}, - {STATUS_UNABLE_TO_DELETE_SECTION, "UNABLE_TO_DELETE_SECTION", NULL}, - {STATUS_MORE_PROCESSING_REQUIRED, "MORE_PROCESSING_REQUIRED", NULL}, - {STATUS_INVALID_CID, "INVALID_CID", NULL}, - {STATUS_BAD_INITIAL_STACK, "BAD_INITIAL_STACK", NULL}, - {STATUS_INVALID_VOLUME_LABEL, "INVALID_VOLUME_LABEL", NULL}, - {STATUS_SECTION_NOT_EXTENDED, "SECTION_NOT_EXTENDED", NULL}, - {STATUS_NOT_MAPPED_DATA, "NOT_MAPPED_DATA", NULL}, - {STATUS_INFO_LENGTH_MISMATCH, "INFO_LENGTH_MISMATCH", NULL}, - {STATUS_INVALID_INFO_CLASS, "INVALID_INFO_CLASS", NULL}, - {STATUS_SUSPEND_COUNT_EXCEEDED, "SUSPEND_COUNT_EXCEEDED", NULL}, - {STATUS_NOTIFY_ENUM_DIR, "NOTIFY_ENUM_DIR", NULL}, - {STATUS_REGISTRY_RECOVERED, "REGISTRY_RECOVERED", NULL}, - {STATUS_REGISTRY_IO_FAILED, "REGISTRY_IO_FAILED", NULL}, - {STATUS_KEY_DELETED, "KEY_DELETED", NULL}, - {STATUS_NO_LOG_SPACE, "NO_LOG_SPACE", NULL}, - {STATUS_KEY_HAS_CHILDREN, "KEY_HAS_CHILDREN", NULL}, - {STATUS_CHILD_MUST_BE_VOLATILE, "CHILD_MUST_BE_VOLATILE", NULL}, - {STATUS_REGISTRY_CORRUPT, "REGISTRY_CORRUPT", NULL}, - {STATUS_DLL_NOT_FOUND, "DLL_NOT_FOUND", NULL}, - {STATUS_DLL_INIT_FAILED, "DLL_INIT_FAILED", NULL}, - {STATUS_ORDINAL_NOT_FOUND, "ORDINAL_NOT_FOUND", NULL}, - {STATUS_ENTRYPOINT_NOT_FOUND, "ENTRYPOINT_NOT_FOUND", NULL}, - {STATUS_MORE_ENTRIES, "MORE_ENTRIES", NULL}, - {STATUS_BUFFER_OVERFLOW, "BUFFER_OVERFLOW", NULL}, - {STATUS_NO_MORE_FILES, "NO_MORE_FILES", NULL}, - {STATUS_NO_INHERITANCE, "NO_INHERITANCE", NULL}, - {STATUS_NO_MORE_EAS, "NO_MORE_EAS", NULL}, - {STATUS_NO_MORE_ENTRIES, "NO_MORE_ENTRIES", NULL}, - {STATUS_GUIDS_EXHAUSTED, "GUIDS_EXHAUSTED", NULL}, - {STATUS_AGENTS_EXHAUSTED, "AGENTS_EXHAUSTED", NULL}, - {STATUS_UNSUCCESSFUL, "UNSUCCESSFUL", NULL}, - {STATUS_NOT_IMPLEMENTED, "NOT_IMPLEMENTED", NULL}, - {STATUS_ILLEGAL_FUNCTION, "ILLEGAL_FUNCTION", NULL}, - {STATUS_PAGEFILE_QUOTA, "PAGEFILE_QUOTA", NULL}, - {STATUS_COMMITMENT_LIMIT, "COMMITMENT_LIMIT", NULL}, - {STATUS_SECTION_TOO_BIG, "SECTION_TOO_BIG", NULL}, - {RPC_NT_SS_IN_NULL_CONTEXT, "RPC_NT_SS_IN_NULL_CONTEXT", NULL}, - {RPC_NT_INVALID_BINDING, "RPC_NT_INVALID_BINDING", NULL}, - {STATUS_OBJECT_FILE_MISMATCH, "OBJECT_FILE_MISMATCH", NULL}, - {STATUS_FILE_CLOSED, "FILE_CLOSED", NULL}, - {STATUS_INVALID_PORT_HANDLE, "INVALID_PORT_HANDLE", NULL}, - {STATUS_NOT_COMMITTED, "NOT_COMMITTED", NULL}, - {STATUS_INVALID_PARAMETER, "INVALID_PARAMETER", NULL}, - {STATUS_INVALID_PARAMETER_1, "INVALID_PARAMETER_1", NULL}, - {STATUS_INVALID_PARAMETER_2, "INVALID_PARAMETER_2", NULL}, - {STATUS_INVALID_PARAMETER_3, "INVALID_PARAMETER_3", NULL}, - {STATUS_INVALID_PARAMETER_4, "INVALID_PARAMETER_4", NULL}, - {STATUS_INVALID_PARAMETER_5, "INVALID_PARAMETER_5", NULL}, - {STATUS_INVALID_PARAMETER_6, "INVALID_PARAMETER_6", NULL}, - {STATUS_INVALID_PARAMETER_7, "INVALID_PARAMETER_7", NULL}, - {STATUS_INVALID_PARAMETER_8, "INVALID_PARAMETER_8", NULL}, - {STATUS_INVALID_PARAMETER_9, "INVALID_PARAMETER_9", NULL}, - {STATUS_INVALID_PARAMETER_10, "INVALID_PARAMETER_10", NULL}, - {STATUS_INVALID_PARAMETER_11, "INVALID_PARAMETER_11", NULL}, - {STATUS_INVALID_PARAMETER_12, "INVALID_PARAMETER_12", NULL}, - {STATUS_INVALID_PARAMETER_MAX, "INVALID_PARAMETER_MAX", NULL}, - {STATUS_INVALID_PAGE_PROTECTION, "INVALID_PAGE_PROTECTION", NULL}, - {STATUS_RESOURCE_DATA_NOT_FOUND, "RESOURCE_DATA_NOT_FOUND", NULL}, - {STATUS_RESOURCE_TYPE_NOT_FOUND, "RESOURCE_TYPE_NOT_FOUND", NULL}, - {STATUS_RESOURCE_NAME_NOT_FOUND, "RESOURCE_NAME_NOT_FOUND", NULL}, - {STATUS_RESOURCE_LANG_NOT_FOUND, "RESOURCE_LANG_NOT_FOUND", NULL}, - {STATUS_NO_SUCH_DEVICE, "NO_SUCH_DEVICE", NULL}, - {STATUS_NO_SUCH_FILE, "NO_SUCH_FILE", NULL}, - {STATUS_INVALID_DEVICE_REQUEST, "INVALID_DEVICE_REQUEST", NULL}, - {STATUS_END_OF_FILE, "END_OF_FILE", NULL}, - {STATUS_FILE_FORCED_CLOSED, "FILE_FORCED_CLOSED", NULL}, - {STATUS_WRONG_VOLUME, "WRONG_VOLUME", NULL}, - {STATUS_NO_MEDIA, "NO_MEDIA", NULL}, - {STATUS_NO_MEDIA_IN_DEVICE, "NO_MEDIA_IN_DEVICE", NULL}, - {STATUS_NONEXISTENT_SECTOR, "NONEXISTENT_SECTOR", NULL}, - {STATUS_WORKING_SET_QUOTA, "WORKING_SET_QUOTA", NULL}, - {STATUS_CONFLICTING_ADDRESS, "CONFLICTING_ADDRESS", NULL}, - {STATUS_INVALID_SYSTEM_SERVICE, "INVALID_SYSTEM_SERVICE", NULL}, - {STATUS_THREAD_IS_TERMINATING, "THREAD_IS_TERMINATING", NULL}, - {STATUS_PROCESS_IS_TERMINATING, "PROCESS_IS_TERMINATING", NULL}, - {STATUS_INVALID_LOCK_SEQUENCE, "INVALID_LOCK_SEQUENCE", NULL}, - {STATUS_INVALID_VIEW_SIZE, "INVALID_VIEW_SIZE", NULL}, - {STATUS_ALREADY_COMMITTED, "ALREADY_COMMITTED", NULL}, - {STATUS_ACCESS_DENIED, "ACCESS_DENIED", NULL}, - {STATUS_FILE_IS_A_DIRECTORY, "FILE_IS_A_DIRECTORY", NULL}, - {STATUS_CANNOT_DELETE, "CANNOT_DELETE", NULL}, - {STATUS_INVALID_COMPUTER_NAME, "INVALID_COMPUTER_NAME", NULL}, - {STATUS_FILE_DELETED, "FILE_DELETED", NULL}, - {STATUS_DELETE_PENDING, "DELETE_PENDING", NULL}, - {STATUS_PORT_CONNECTION_REFUSED, "PORT_CONNECTION_REFUSED", NULL}, - {STATUS_NO_SUCH_PRIVILEGE, "NO_SUCH_PRIVILEGE", NULL}, - {STATUS_PRIVILEGE_NOT_HELD, "PRIVILEGE_NOT_HELD", NULL}, - {STATUS_CANNOT_IMPERSONATE, "CANNOT_IMPERSONATE", NULL}, - {STATUS_LOGON_FAILURE, "LOGON_FAILURE", NULL}, - {STATUS_ACCOUNT_RESTRICTION, "ACCOUNT_RESTRICTION", NULL}, - {STATUS_INVALID_LOGON_HOURS, "INVALID_LOGON_HOURS", NULL}, - {STATUS_INVALID_WORKSTATION, "INVALID_WORKSTATION", NULL}, - {STATUS_BUFFER_TOO_SMALL, "BUFFER_TOO_SMALL", NULL}, - {STATUS_UNABLE_TO_DECOMMIT_VM, "UNABLE_TO_DECOMMIT_VM", NULL}, - {STATUS_DISK_CORRUPT_ERROR, "DISK_CORRUPT_ERROR", NULL}, - {STATUS_OBJECT_NAME_INVALID, "OBJECT_NAME_INVALID", NULL}, - {STATUS_OBJECT_NAME_NOT_FOUND, "OBJECT_NAME_NOT_FOUND", NULL}, - {STATUS_OBJECT_PATH_INVALID, "OBJECT_PATH_INVALID", NULL}, - {STATUS_OBJECT_PATH_NOT_FOUND, "OBJECT_PATH_NOT_FOUND", NULL}, - {STATUS_DFS_EXIT_PATH_FOUND, "DFS_EXIT_PATH_FOUND", NULL}, - {STATUS_OBJECT_PATH_SYNTAX_BAD, "OBJECT_PATH_SYNTAX_BAD", NULL}, - {STATUS_DATA_OVERRUN, "DATA_OVERRUN", NULL}, - {STATUS_DATA_LATE_ERROR, "DATA_LATE_ERROR", NULL}, - {STATUS_DATA_ERROR, "DATA_ERROR", NULL}, - {STATUS_CRC_ERROR, "CRC_ERROR", NULL}, - {STATUS_SHARING_VIOLATION, "SHARING_VIOLATION", NULL}, - {STATUS_QUOTA_EXCEEDED, "QUOTA_EXCEEDED", NULL}, - {STATUS_MUTANT_NOT_OWNED, "MUTANT_NOT_OWNED", NULL}, - {STATUS_SEMAPHORE_LIMIT_EXCEEDED, "SEMAPHORE_LIMIT_EXCEEDED", NULL}, - {STATUS_DISK_FULL, "DISK_FULL", NULL}, - {STATUS_LOCK_NOT_GRANTED, "LOCK_NOT_GRANTED", NULL}, - {STATUS_DEVICE_NOT_READY, "DEVICE_NOT_READY", NULL}, - {STATUS_IO_TIMEOUT, "IO_TIMEOUT", NULL}, - {STATUS_MEDIA_WRITE_PROTECTED, "MEDIA_WRITE_PROTECTED", NULL}, - {STATUS_NO_MEDIA_IN_DRIVE, "NO_MEDIA_IN_DRIVE", NULL}, - {STATUS_VERIFY_REQUIRED, "VERIFY_REQUIRED", NULL}, - {STATUS_UNRECOGNIZED_MEDIA, "UNRECOGNIZED_MEDIA", NULL}, - {STATUS_UNRECOGNIZED_VOLUME, "UNRECOGNIZED_VOLUME", NULL}, - {STATUS_FS_DRIVER_REQUIRED, "FS_DRIVER_REQUIRED", NULL}, - {STATUS_NOT_SUPPORTED, "NOT_SUPPORTED", NULL}, - {STATUS_DISK_OPERATION_FAILED, "DISK_OPERATION_FAILED", NULL}, - {STATUS_FS_QUERY_REQUIRED, "FS_QUERY_REQUIRED", NULL}, - {0, NULL, NULL} -}; - -/* FUNCTIONS *****************************************************************/ - -VOID -DbgGetErrorText(NTSTATUS ErrorCode, PUNICODE_STRING ErrorText, ULONG Flags) -{ - int i; - char TempBuf[255], NumBuf[32]; - ANSI_STRING AnsiString; - - TempBuf[0] = '\0'; - if (Flags & DBG_GET_SHOW_FACILITY) - { - if (NT_CUSTOMER(ErrorCode)) - { - _snprintf(TempBuf, sizeof(TempBuf)-1, - "%%CUST-%s-", - SeverityCodes[NT_SEVERITY(ErrorCode)]); - TempBuf[sizeof(TempBuf)-1] = '\0'; - } - else - { - for (i = 0; FacList[i].Name != NULL; i++) - { - if (FacList[i].Code == (ULONG) NT_FACILITY(ErrorCode)) - { - break; - } - } - if (FacList[i].Name != NULL) - { - _snprintf(TempBuf, sizeof(TempBuf)-1, "%%%s-%s-", - FacList[i].Name, - SeverityCodes[NT_SEVERITY(ErrorCode)]); - TempBuf[sizeof(TempBuf)-1] = '\0'; - } - else - { - _snprintf(TempBuf, sizeof(TempBuf)-1, "%%UNKNOWN-%s-", - SeverityCodes[NT_SEVERITY(ErrorCode)]); - TempBuf[sizeof(TempBuf)-1] = '\0'; - } - } - } - for (i = 0; ErrList[i].Name != NULL; i++) - { - if (ErrorCode == ErrList[i].Code) - { - break; - } - } - if (ErrList[i].Name != NULL) - { - if (Flags & DBG_GET_SHOW_FACILITY) - { - strcat(TempBuf, ErrList[i].Name); - strcat(TempBuf, " "); - } - if (ErrList[i].Text != NULL) - { - strcat(TempBuf, ErrList[i].Text); - } - else - { - strcat(TempBuf, ErrList[i].Name); - } - } - else - { - if (Flags & DBG_GET_SHOW_FACILITY) - { - _snprintf(NumBuf, sizeof(NumBuf)-1, "%08lx", ErrorCode); - NumBuf[sizeof(NumBuf)-1] = '\0'; - strcat(TempBuf, NumBuf); - strcat(TempBuf, " "); - } - sprintf(NumBuf, "Unknown Message #%08lx", ErrorCode); - strcat(TempBuf, NumBuf); - } - RtlInitAnsiString(&AnsiString, TempBuf); - RtlAnsiStringToUnicodeString(ErrorText, &AnsiString, TRUE); -} - -VOID -DbgPrintErrorMessage(NTSTATUS ErrorCode) -{ - UNICODE_STRING ErrorText; - - DbgGetErrorText(ErrorCode, &ErrorText, 0xf); - DbgPrint("%wZ\n", &ErrorText); - RtlFreeUnicodeString(&ErrorText); -} - - _____ Deleted: trunk/reactos/ntoskrnl/kdbg/print.c --- trunk/reactos/ntoskrnl/kdbg/print.c 2005-04-23 06:41:25 UTC (rev 14760) +++ trunk/reactos/ntoskrnl/kdbg/print.c 2005-04-23 06:43:39 UTC (rev 14761) @@ -1,198 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/print.c - * PURPOSE: Debug output - * - * PROGRAMMERS: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - -/* FUNCTIONS ****************************************************************/ - -#if 0 -ULONG DbgService (ULONG Service, PVOID Context1, PVOID Context2); -__asm__ ("\n\t.global _DbgService\n\t" - "_DbgService:\n\t" - "mov 4(%esp), %eax\n\t" - "mov 8(%esp), %ecx\n\t" - "mov 12(%esp), %edx\n\t" - "int $0x2D\n\t" - "ret\n\t"); -#endif - -/* - * Note: DON'T CHANGE THIS FUNCTION!!! - * DON'T CALL HalDisplayString OR SOMETING ELSE!!! - * You'll only break the serial/bochs debugging feature!!! - */ - -/* - * @implemented - */ -ULONG -DbgPrint(PCH Format, ...) -{ - ANSI_STRING DebugString; - CHAR Buffer[1024]; - va_list ap; -#ifdef SERIALIZE_DBGPRINT -# define MESSAGETABLE_SIZE 16 - LONG MyTableIndex; - static LONG Lock = 0; - static LONG TableWriteIndex = 0, TableReadIndex = 0; - static CHAR MessageTable[MESSAGETABLE_SIZE][sizeof(Buffer)] = { { '\0' } }; -#endif /* SERIALIZE_DBGPRINT */ - - /* init ansi string */ - DebugString.Buffer = Buffer; - DebugString.MaximumLength = sizeof(Buffer); - - va_start (ap, Format); - DebugString.Length = _vsnprintf (Buffer, sizeof( Buffer ), Format, ap); - va_end (ap); - -#ifdef SERIALIZE_DBGPRINT - /* check if we are already running */ - if (InterlockedCompareExchange(&Lock, 1, 0) == 1) - { - MyTableIndex = InterlockedIncrement(&TableWriteIndex) - 1; - InterlockedCompareExchange(&TableWriteIndex, 0, MESSAGETABLE_SIZE); - MyTableIndex %= MESSAGETABLE_SIZE; - - if (MessageTable[MyTableIndex][0] != '\0') /* table is full */ - { - DebugString.Buffer = "CRITICAL ERROR: DbgPrint Table is FULL!"; - DebugString.Length = 39; - KdpPrintString(&DebugString); - for (;;); - } - else - { - /*DebugString.Buffer = "ÁÁÁ"; - DebugString.Length = 3; - KdpPrintString(&DebugString);*/ - memcpy(MessageTable[MyTableIndex], DebugString.Buffer, DebugString.Length); - MessageTable[MyTableIndex][DebugString.Length] = '\0'; - } - } - else - { -#endif /* SERIALIZE_DBGPRINT */ - KdpPrintString (&DebugString); -#ifdef SERIALIZE_DBGPRINT - MyTableIndex = TableReadIndex; - while (MessageTable[MyTableIndex][0] != '\0') - { - /*DebugString.Buffer = "$$$"; - DebugString.Length = 3; - KdpPrintString(&DebugString);*/ - - DebugString.Buffer = MessageTable[MyTableIndex]; - DebugString.Length = strlen(DebugString.Buffer); - DebugString.MaximumLength = DebugString.Length + 1; - - KdpPrintString(&DebugString); - MessageTable[MyTableIndex][0] = '\0'; - - MyTableIndex = InterlockedIncrement(&TableReadIndex); - InterlockedCompareExchange(&TableReadIndex, 0, MESSAGETABLE_SIZE); - MyTableIndex %= MESSAGETABLE_SIZE; - } - InterlockedDecrement(&Lock); - } -# undef MESSAGETABLE_SIZE -#endif /* SERIALIZE_DBGPRINT */ - - return (ULONG)DebugString.Length; -} - -/* - * @unimplemented - */ -ULONG -__cdecl -DbgPrintEx( - IN ULONG ComponentId, - IN ULONG Level, - IN PCH Format, - ... - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -ULONG -__cdecl -DbgPrintReturnControlC( - PCH Format, - ... - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -VOID STDCALL -DbgPrompt (PCH OutputString, - PCH InputString, - USHORT InputSize) -{ - ANSI_STRING Output; - ANSI_STRING Input; - - Input.Length = 0; - Input.MaximumLength = InputSize; - Input.Buffer = InputString; - - Output.Length = strlen (OutputString); - Output.MaximumLength = Output.Length + 1; - Output.Buffer = OutputString; - - /* FIXME: Not implemented yet! */ - // KdpPromptString (&Output, - // &Input); -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -DbgQueryDebugFilterState( - IN ULONG ComponentId, - IN ULONG Level - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -DbgSetDebugFilterState( - IN ULONG ComponentId, - IN ULONG Level, - IN BOOLEAN State - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* EOF */ _____ Deleted: trunk/reactos/ntoskrnl/kdbg/rdebug.c --- trunk/reactos/ntoskrnl/kdbg/rdebug.c 2005-04-23 06:41:25 UTC (rev 14760) +++ trunk/reactos/ntoskrnl/kdbg/rdebug.c 2005-04-23 06:43:39 UTC (rev 14761) @@ -1,134 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/rdebug.c - * PURPOSE: Runtime debugging support - * - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* GLOBALS ******************************************************************/ - -typedef struct _RDEBUG_ENTRY { - LIST_ENTRY ListEntry; - CHAR Filename[MAX_PATH]; -} RDEBUG_ENTRY, *PRDEBUG_ENTRY; - -LIST_ENTRY RDebugListHead; -BOOLEAN RDebugInitialized = FALSE; - -/* FUNCTIONS ****************************************************************/ - -PRDEBUG_ENTRY -DbgpFind(PCH Filename) -{ - PLIST_ENTRY Current; - PRDEBUG_ENTRY Entry; - - Current = RDebugListHead.Flink; - while (Current != &RDebugListHead) - { - Entry = CONTAINING_RECORD(Current, RDEBUG_ENTRY, ListEntry); - - if (strcmp(Filename, Entry->Filename) == 0) - { - return Entry; - } - Current = Current->Flink; - } - - return(NULL); -} - -VOID INIT_FUNCTION -DbgRDebugInit(VOID) -{ - if (RDebugInitialized) - return; - - InitializeListHead(&RDebugListHead); - RDebugInitialized = TRUE; -} - -VOID -DbgShowFiles(VOID) -{ - PLIST_ENTRY Current; - PRDEBUG_ENTRY Entry; - ULONG Count; - - if (!RDebugInitialized) - return; - - Count = 0; - Current = RDebugListHead.Flink; - while (Current != &RDebugListHead) - { - Entry = CONTAINING_RECORD(Current, RDEBUG_ENTRY, ListEntry); - - DbgPrint(" %s\n", Entry->Filename); - Count++; - - Current = Current->Flink; - } - - if (Count == 1) - { - DbgPrint(" 1 file listed\n"); - } - else - { - DbgPrint(" %d files listed\n", Count); - } -} - -VOID -DbgEnableFile(PCH Filename) -{ - PRDEBUG_ENTRY Entry; - - if (!RDebugInitialized) - return; - - if (!DbgpFind(Filename)) - { - Entry = ExAllocatePool(NonPagedPool, sizeof(RDEBUG_ENTRY)); - ASSERT(Entry); - RtlMoveMemory(Entry->Filename, Filename, strlen(Filename) + 1); - InsertTailList(&RDebugListHead, &Entry->ListEntry); - } -} - -VOID -DbgDisableFile(PCH Filename) -{ - PRDEBUG_ENTRY Entry; - - if (!RDebugInitialized) - return; - - Entry = DbgpFind(Filename); - - if (Entry) - { - RemoveEntryList(&Entry->ListEntry); - } -} - -BOOLEAN -DbgShouldPrint(PCH Filename) -{ - if (!RDebugInitialized) - return FALSE; - - return(DbgpFind(Filename) != NULL); -} - -/* EOF */ _____ Deleted: trunk/reactos/ntoskrnl/kdbg/user.c --- trunk/reactos/ntoskrnl/kdbg/user.c 2005-04-23 06:41:25 UTC (rev 14760) +++ trunk/reactos/ntoskrnl/kdbg/user.c 2005-04-23 06:43:39 UTC (rev 14761) @@ -1,90 +0,0 @@ -/* $Id:$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/user.c - * PURPOSE: User mode debugging - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - -/* FUNCTIONS *****************************************************************/ - -VOID -DbgkCreateThread(PVOID StartAddress) -{ - LPC_DBG_MESSAGE Message; - LPC_DBG_MESSAGE Reply; - NTSTATUS Status; - - if (PsGetCurrentThread()->ThreadsProcess->DebugPort == NULL) - { - return; - } - - Message.Header.MessageSize = sizeof(LPC_DBG_MESSAGE); - Message.Header.DataSize = sizeof(LPC_DBG_MESSAGE) - - sizeof(LPC_MESSAGE); - Message.Type = DBG_EVENT_CREATE_THREAD; - Message.Status = STATUS_SUCCESS; - Message.Data.CreateThread.Reserved = 0; - Message.Data.CreateThread.StartAddress = StartAddress; - - /* FIXME: Freeze all threads in process */ - - /* Send the message to the process's debug port and wait for a reply */ - Status = - LpcSendDebugMessagePort(PsGetCurrentThread()->ThreadsProcess->DebugPort, - &Message, - &Reply); - if (!NT_SUCCESS(Status)) - { - return; - } - - /* FIXME: Examine reply */ - return; -} - -ULONG -DbgkForwardException(EXCEPTION_RECORD Er, ULONG FirstChance) -{ - LPC_DBG_MESSAGE Message; - LPC_DBG_MESSAGE Reply; - NTSTATUS Status; - - if (PsGetCurrentThread()->ThreadsProcess->DebugPort == NULL) - { - return(0); - } - - Message.Header.MessageSize = sizeof(LPC_DBG_MESSAGE); - Message.Header.DataSize = sizeof(LPC_DBG_MESSAGE) - - sizeof(LPC_MESSAGE); - Message.Type = DBG_EVENT_EXCEPTION; - Message.Status = STATUS_SUCCESS; - Message.Data.Exception.ExceptionRecord = Er; - Message.Data.Exception.FirstChance = FirstChance; - - /* FIXME: Freeze all threads in process */ - - /* Send the message to the process's debug port and wait for a reply */ - Status = - LpcSendDebugMessagePort(PsGetCurrentThread()->ThreadsProcess->DebugPort, - &Message, - &Reply); - if (!NT_SUCCESS(Status)) - { - return(0); - } - - /* FIXME: Examine reply */ - return(0); -} - -/* EOF */

1 0

[ion] 14760: Small Debugging Services re-arrangement. /dbgk created for User-Mode debugging and Native Debug Objects (implemented an experimental NtCreateDebugObject. Untested and doesn't work since the DbgkObjectType isn't created yet. Added dbgk.h with the basic structures for now. Removed /dbg and split up code in ex/debug.c for executive and rtl/debug.c for RunTime Library Debug calls. Kdbg now dedicated in /kdbg.
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Small Debugging Services re-arrangement. /dbgk created for User-Mode debugging and Native Debug Objects (implemented an experimental NtCreateDebugObject. Untested and doesn't work since the DbgkObjectType isn't created yet. Added dbgk.h with the basic structures for now. Removed /dbg and split up code in ex/debug.c for executive and rtl/debug.c for RunTime Library Debug calls. Kdbg now dedicated in /kdbg. Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/Makefile.i386 Deleted: trunk/reactos/ntoskrnl/dbg/ Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/include/internal/dbg.h Modified: trunk/reactos/ntoskrnl/include/internal/debug.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/kd/kdebug.c Modified: trunk/reactos/ntoskrnl/kd/mda.c Added: trunk/reactos/ntoskrnl/kdbg/ Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/lpc/send.c _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/Makefile 2005-04-23 06:41:25 UTC (rev 14760) @@ -24,18 +24,6 @@ LINKER_SCRIPT := ntoskrnl.lnk STRIP_FLAGS := -Wl,-s -ifeq ($(KDBG), 1) -OBJECTS_KDBG := dbg/kdb.o dbg/kdb_cli.o dbg/kdb_expr.o dbg/kdb_keyboard.o \ - dbg/kdb_serial.o dbg/kdb_string.o dbg/rdebug.o dbg/i386/kdb_help.o \ - dbg/i386/i386-dis.o dbg/i386/longjmp.o dbg/i386/setjmp.o -preall: all -else -OBJECTS_KDBG := -endif -ifeq ($(DBG_OR_KDBG), 1) -OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_symbols.o -endif - TARGET_ASFLAGS = -I./include TARGET_CFLAGS = -I./include $(CFLAGS_KDBG) -Wall -Werror $(CFLAGS_OPT) @@ -74,6 +62,7 @@ rtl/atom.o \ rtl/capture.o \ rtl/ctype.o \ + rtl/debug.o \ rtl/handle.o \ rtl/message.o \ rtl/misc.o \ @@ -240,6 +229,7 @@ # Executive Subsystem (Ex) OBJECTS_EX = \ ex/callback.o \ + ex/dbgctrl.o \ ex/error.o \ ex/event.o \ ex/evtpair.o \ @@ -301,14 +291,6 @@ cm/registry.o \ cm/regobj.o \ -# Debugger Support (Dbg) -OBJECTS_DBG = \ - dbg/dbgctrl.o \ - dbg/errinfo.o \ - dbg/print.o \ - dbg/user.o \ - $(OBJECTS_KDBG) - # Loader OBJECTS_LDR = \ ldr/init.o \ @@ -352,7 +334,30 @@ kd/kdebug.o \ kd/mda.o \ kd/service.o + +# User-Mode Debugging (Dbgk) +OBJECTS_DBGK = \ + dbgk/dbgkutil.o \ + dbgk/debug.o +ifeq ($(KDBG), 1) +OBJECTS_KDBG := \ + kdbg/kdb.o \ + kdbg/kdb_cli.o \ + kdbg/kdb_expr.o \ + kdbg/kdb_keyboard.o \ + kdbg/kdb_serial.o \ + kdbg/kdb_string.o +preall: all +else +OBJECTS_KDBG := +endif +ifeq ($(DBG_OR_KDBG), 1) +OBJECTS_KDBG := \ + $(OBJECTS_KDBG) \ + kdbg/kdb_symbols.o +endif + # Boot video (Inbv) OBJECTS_INBV = \ inbv/inbv.o @@ -360,7 +365,7 @@ DEP_OBJECTS := $(OBJECTS_MM) $(OBJECTS_ARCH) \ $(OBJECTS_IO) $(OBJECTS_KE) $(OBJECTS_OB) \ $(OBJECTS_PS) $(OBJECTS_EX) $(OBJECTS_CC) $(OBJECTS_FS) $(OBJECTS_SE) \ - $(OBJECTS_DBG) $(OBJECTS_CM) $(OBJECTS_LDR) $(OBJECTS_LPC) \ + $(OBJECTS_KDBG) $(OBJECTS_DBGK) $(OBJECTS_CM) $(OBJECTS_LDR) $(OBJECTS_LPC) \ $(OBJECTS_PO) $(OBJECTS_KD) $(OBJECTS_RTL) $(OBJECTS_INBV) TAG_OBJECTS := $(join $(dir $(DEP_OBJECTS)),$(patsubst %.o, .%.TAG, $(notdir $(DEP_OBJECTS)))) @@ -383,12 +388,12 @@ $(OBJECTS_KE) \ $(OBJECTS_CC) \ $(OBJECTS_CM) \ - $(OBJECTS_DBG) \ $(OBJECTS_EX) \ $(OBJECTS_LPC) \ $(OBJECTS_FS) \ $(OBJECTS_IO) \ $(OBJECTS_KD) \ + $(OBJECTS_DBGK) \ $(OBJECTS_LDR) \ $(OBJECTS_MM) \ $(OBJECTS_OB) \ @@ -396,6 +401,7 @@ $(OBJECTS_PS) \ $(OBJECTS_RTL) \ $(OBJECTS_SE) \ + $(OBJECTS_KDBG) \ $(OBJECTS_INBV) \ $(OBJECTS_RESOURCE) _____ Modified: trunk/reactos/ntoskrnl/Makefile.i386 --- trunk/reactos/ntoskrnl/Makefile.i386 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/Makefile.i386 2005-04-23 06:41:25 UTC (rev 14760) @@ -52,10 +52,21 @@ rtl/i386/exception.o \ rtl/i386/seh.o +ifeq ($(KDBG), 1) +OBJECTS_KDBG_I386 := \ + kdbg/i386/kdb_help.o \ + kdbg/i386/i386-dis.o \ + kdbg/i386/longjmp.o \ + kdbg/i386/setjmp.o +preall: all +else +OBJECTS_KDBG_I386 := +endif + OBJECTS_PS_I386 := \ ps/i386/continue.o RTL_EXCLUDE_FILTER := OBJECTS_ARCH = $(OBJECTS_BOOT) $(OBJECTS_EX_I386) $(OBJECTS_KE_I386) $(OBJECTS_MM_I386) \ - $(OBJECTS_RTL_I386) $(OBJECTS_PS_I386) + $(OBJECTS_RTL_I386) $(OBJECTS_KDBG_I386) $(OBJECTS_PS_I386) _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-04-23 06:41:25 UTC (rev 14760) @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #include <ntos/bootvid.h> -#include "../dbg/kdb.h" +#include <internal/kdb.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/include/internal/dbg.h --- trunk/reactos/ntoskrnl/include/internal/dbg.h 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/include/internal/dbg.h 2005-04-23 06:41:25 UTC (rev 14760) @@ -10,11 +10,5 @@ LpcSendDebugMessagePort(PEPORT Port, PLPC_DBG_MESSAGE Message, PLPC_DBG_MESSAGE Reply); -VOID -DbgkCreateThread(PVOID StartAddress); -ULONG -DbgkForwardException(EXCEPTION_RECORD Er, ULONG FirstChance); -BOOLEAN -DbgShouldPrint(PCH Filename); #endif /* __INCLUDE_INTERNAL_DBG_H */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/debug.h --- trunk/reactos/ntoskrnl/include/internal/debug.h 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/include/internal/debug.h 2005-04-23 06:41:25 UTC (rev 14760) @@ -93,19 +93,6 @@ #define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) -#if defined(KDBG) && defined(NDEBUG) && defined(__NTOSKRNL__) - -#define DPRINT(args...) do { \ - if (DbgShouldPrint(__FILE__)) { \ - DbgPrint("(%s:%d) ",__FILE__,__LINE__); \ - DbgPrint(args); \ - } \ -} while(0) - -#define CHECKPOINT - -#else /* KDBG && NDEBUG && __NTOSKRNL__ */ - #ifndef NDEBUG #ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ #define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) @@ -122,7 +109,6 @@ #define CHECKPOINT #endif /* NDEBUG */ -#endif /* KDBG && NDEBUG */ /* * FUNCTION: Assert a maximum value for the current irql _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-04-23 06:41:25 UTC (rev 14760) @@ -54,6 +54,7 @@ #include <internal/port.h> #include <internal/nls.h> #include <internal/dbg.h> +#include <internal/dbgk.h> #include <internal/trap.h> #include <internal/safe.h> #include <internal/test.h> _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-04-23 06:41:25 UTC (rev 14760) @@ -11,7 +11,7 @@ /* INCLUDES ****************************************************************/ #include <ntoskrnl.h> -#include "../dbg/kdb.h" +#include <internal/kdb.h> #define NDEBUG #include <internal/debug.h> @@ -642,7 +642,6 @@ Status = IoCreateSystemRootLink((PCHAR)KeLoaderBlock.CommandLine); if (!NT_SUCCESS(Status)) { DbgPrint("IoCreateSystemRootLink FAILED: (0x%x) - ", Status); - DbgPrintErrorMessage (Status); KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE); } _____ Modified: trunk/reactos/ntoskrnl/kd/kdebug.c --- trunk/reactos/ntoskrnl/kd/kdebug.c 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/kd/kdebug.c 2005-04-23 06:41:25 UTC (rev 14760) @@ -9,7 +9,7 @@ */ #include <ntoskrnl.h> -#include "../dbg/kdb.h" +#include <internal/kdb.h> #include <internal/debug.h> /* serial debug connection */ @@ -79,11 +79,6 @@ if (BootPhase > 0) { #ifdef KDBG - /* Initialize runtime debugging if available */ - DbgRDebugInit(); -#endif - -#ifdef KDBG /* Initialize the local kernel debugger. */ KdDebuggerEnabled = TRUE; KdDebugState |= KD_DEBUG_KDB; _____ Modified: trunk/reactos/ntoskrnl/kd/mda.c --- trunk/reactos/ntoskrnl/kd/mda.c 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/kd/mda.c 2005-04-23 06:41:25 UTC (rev 14760) @@ -11,7 +11,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include "../dbg/kdb.h" +#include <internal/kdb.h> /* VARIABLES ***************************************************************/ _____ Copied: trunk/reactos/ntoskrnl/kdbg (from rev 14742, trunk/reactos/ntoskrnl/dbg) _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c --- trunk/reactos/ntoskrnl/dbg/kdb.c 2005-04-22 12:52:25 UTC (rev 14742) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-04-23 06:41:25 UTC (rev 14760) @@ -11,7 +11,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include "kdb.h" +#include <internal/kdb.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/dbg/kdb_cli.c 2005-04-22 12:52:25 UTC (rev 14742) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-04-23 06:41:25 UTC (rev 14760) @@ -30,7 +30,7 @@ #include <ntoskrnl.h> #include <ctype.h> -#include "kdb.h" +#include <internal/kdb.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c --- trunk/reactos/ntoskrnl/dbg/kdb_expr.c 2005-04-22 12:52:25 UTC (rev 14742) +++ trunk/reactos/ntoskrnl/kdbg/kdb_expr.c 2005-04-23 06:41:25 UTC (rev 14760) @@ -35,7 +35,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include "kdb.h" +#include <internal/kdb.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/dbg/kdb_symbols.c 2005-04-22 12:52:25 UTC (rev 14742) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-04-23 06:41:25 UTC (rev 14760) @@ -28,7 +28,7 @@ #define NDEBUG #include <internal/debug.h> -#include "kdb.h" +#include <internal/kdb.h> /* GLOBALS ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-04-23 06:41:25 UTC (rev 14760) @@ -20,7 +20,7 @@ #include <ntoskrnl.h> #if defined(KDBG) || defined(DBG) -#include <../dbg/kdb.h> +#include <internal/kdb.h> #endif /* KDBG */ #include <../hal/halx86/include/halirq.h> _____ Modified: trunk/reactos/ntoskrnl/lpc/send.c --- trunk/reactos/ntoskrnl/lpc/send.c 2005-04-23 05:43:35 UTC (rev 14759) +++ trunk/reactos/ntoskrnl/lpc/send.c 2005-04-23 06:41:25 UTC (rev 14760) @@ -11,6 +11,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> + #define NDEBUG #include <internal/debug.h>

1 0

[arty] 14759: Fixes a problem reported by WaxDragon when acquiring the nameserver address
by arty＠svn.reactos.com 23 Apr '05

23 Apr '05

Fixes a problem reported by WaxDragon when acquiring the nameserver address from DHCP. This needs to be rechecked but seems harmless. Modified: trunk/reactos/subsys/system/dhcp/dhclient.c _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-23 05:00:10 UTC (rev 14758) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-23 05:43:35 UTC (rev 14759) @@ -465,9 +465,14 @@ } DH_DbgPrint(MID_TRACE,("Setting Nameservers: %s\n", nsbuf)); - + + /* XXX Fixme: I think this may be wrong and that we might have + * a problem somewhere else (in iphlpapi for example). + * + * Recheck the +1 below. + */ RegSetValueEx( RegKey, "NameServer", 0, REG_SZ, - nsbuf, strlen(nsbuf) ); + nsbuf, strlen(nsbuf) + 1 ); free( nsbuf ); }

1 0

[ion] 14758: Implement KiServiceExit2 which restores debug registers and exits with IRET, used during user-mode return without a syscall
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Implement KiServiceExit2 which restores debug registers and exits with IRET, used during user-mode return without a syscall Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-04-23 04:31:11 UTC (rev 14757) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-04-23 05:00:10 UTC (rev 14758) @@ -88,7 +88,7 @@ mov ebp, esp /* Exit back to user-mode */ - jmp _KiServiceExit + jmp _KiServiceExit2 BadThread: _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-04-23 04:31:11 UTC (rev 14757) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-04-23 05:00:10 UTC (rev 14758) @@ -22,6 +22,7 @@ .globl KeReturnFromSystemCallWithHook .globl _KiServiceExit +.globl _KiServiceExit2 .globl _KiFastCallEntry .globl _KiSystemService @@ -317,3 +318,82 @@ movl $STATUS_INVALID_SYSTEM_SERVICE, %eax movl %eax, KTRAP_FRAME_EAX(%ebp) jmp _KiServiceExit + +_KiServiceExit2: + + /* Get the Current Thread */ + cli + movl %fs:KPCR_CURRENT_THREAD, %esi + + /* Deliver APCs only if we were called from user mode */ + testb $1, KTRAP_FRAME_CS(%esp) + je KiRosTrapReturn + + /* And only if any are actually pending */ + cmpb $0, KTHREAD_PENDING_USER_APC(%esi) + je KiRosTrapReturn + + /* Save pointer to Trap Frame */ + movl %esp, %ebx + + /* Raise IRQL to APC_LEVEL */ + movl $1, %ecx + call @KfRaiseIrql@4 + + /* Save old IRQL */ + pushl %eax + + /* Deliver APCs */ + sti + pushl %ebx + pushl $0 + pushl $UserMode + call _KiDeliverApc@12 + cli + + /* Return to old IRQL */ + popl %ecx + call @KfLowerIrql@4 + + /* Skip useless Debug Data */ + addl $0x18, %esp // + 0x74 + + /* Restore Debug Registers */ + popl %eax // + 0x5C + movl %eax, %dr0 + popl %eax // + 0x58 + movl %eax, %dr1 + popl %eax // + 0x54 + movl %eax, %dr2 + popl %eax // + 0x50 + movl %eax, %dr3 + popl %eax // + 0x4C + movl %eax, %dr6 + popl %eax // + 0x48 + movl %eax, %dr7 + + /* Restore Registers */ + popl %gs // + 0x44 + popl %es // + 0x40 + popl %ds // + 0x3C + popl %edx // + 0x38 + popl %ecx // + 0x34 + popl %eax // + 0x30 + + /* Restore the old previous mode */ + popl %ebx // + 0x2C + movb %bl, %ss:KTHREAD_PREVIOUS_MODE(%esi) + + /* Restore the old exception handler list */ + popl %fs:KPCR_EXCEPTION_LIST // + 0x28 + + /* Restore final registers from trap frame */ + popl %fs // + 0x24 + popl %edi // + 0x20 + popl %esi // + 0x1C + popl %ebx // + 0x18 + popl %ebp // + 0x14 + add $4, %esp // + 0x10 + + /* Return to user-mode */ + iret

1 0

[arty] 14757: Simple jmpbuf for powerpc.
by arty＠svn.reactos.com 23 Apr '05

23 Apr '05

Simple jmpbuf for powerpc. Added: branches/powerpc/reactos/include/wine/ppc_jmpbuf.h _____ Added: branches/powerpc/reactos/include/wine/ppc_jmpbuf.h --- branches/powerpc/reactos/include/wine/ppc_jmpbuf.h 2005-04-23 04:19:35 UTC (rev 14756) +++ branches/powerpc/reactos/include/wine/ppc_jmpbuf.h 2005-04-23 04:31:11 UTC (rev 14757) @@ -0,0 +1,11 @@ +#ifndef PPC_JMPBUF_H +#define PPC_JMPBUF_H + +/* Derived from ppc grub */ +typedef struct sigjmp_buf { + unsigned long r1; + unsigned long locals[32-14]; + unsigned long LR, CR; +} sigjmp_buf; + +#endif/*PPC_JMPBUF_H*/

1 0

[ion] 14756: Terminate System Thread after execution...forgot to add this for some reason.Thanks to WaxDragon for reporting it
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Terminate System Thread after execution...forgot to add this for some reason.Thanks to WaxDragon for reporting it Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-04-23 04:12:49 UTC (rev 14755) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-04-23 04:19:35 UTC (rev 14756) @@ -87,6 +87,9 @@ /* Call it */ (StartRoutine)(StartContext); } + + /* Exit the thread */ + PspExitThread(STATUS_SUCCESS); } NTSTATUS

1 0

[arty] 14755: Branching PowerPC branch from the right place.
by arty＠svn.reactos.com 23 Apr '05

23 Apr '05

Branching PowerPC branch from the right place. Added: branches/powerpc/ _____ Copied: branches/powerpc (from rev 14754, trunk)

1 0

[ion] 14754: Add KDBG debugging hack from old code and convert it to fit new one. Not enabled yet because it underflows the stack after a while (researching why). Also complete KeContextToTrapFrame and have Ke386InitThreadWithContext call it to handle creating the Initial Trap Frame
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Add KDBG debugging hack from old code and convert it to fit new one. Not enabled yet because it underflows the stack after a while (researching why). Also complete KeContextToTrapFrame and have Ke386InitThreadWithContext call it to handle creating the Initial Trap Frame Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-23 04:11:56 UTC (rev 14753) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-23 04:12:26 UTC (rev 14754) @@ -310,7 +310,7 @@ VOID FASTCALL KiWaitTest(PDISPATCHER_HEADER Object, KPRIORITY Increment); PULONG KeGetStackTopThread(struct _ETHREAD* Thread); -VOID KeContextToTrapFrame(PCONTEXT Context, PKTRAP_FRAME TrapFrame); +BOOLEAN STDCALL KeContextToTrapFrame(PCONTEXT Context, PKTRAP_FRAME TrapFrame); VOID STDCALL KiDeliverApc(KPROCESSOR_MODE PreviousMode, PVOID Reserved, PKTRAP_FRAME TrapFrame); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-04-23 04:11:56 UTC (rev 14753) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-04-23 04:12:26 UTC (rev 14754) @@ -115,9 +115,13 @@ *--*/ .globl @KiSwapContextInternal@0 @KiSwapContextInternal@0: - +#ifdef KDBG + //jmp SaveTrapFrameForKDB +SaveTrapFrameForKDB_Return: +#endif + /* Get the PCR. It's faster to use ebx+offset then fs:offset */ - mov ebx, [fs:0x1C] + mov ebx, [fs:KPCR_SELF] /* Set the Thread to running */ mov byte ptr [esi+KTHREAD_STATE], Running @@ -224,10 +228,9 @@ /* Restore exception list */ pop [ebx+KPCR_EXCEPTION_LIST] - - call @KeReleaseDispatcherDatabaseLockFromDpcLevel@0 /* Return */ + call @KeReleaseDispatcherDatabaseLockFromDpcLevel@0 ret /*++ @@ -253,7 +256,6 @@ *--*/ .globl @KiSwapContext@4 @KiSwapContext@4: - /* Note, we CANNOT touch ebp */ /* Save 4 registers */ @@ -285,6 +287,92 @@ /* Clean stack */ add esp, 4 * 4 + ret - ret +#ifdef KDBG +SaveTrapFrameForKDB: + /* Set up a trap frame */ + + /* Fake Interrupt Stack */ + push esp // 0x74 + pushf // 0x70 + push cs // 0x6C + push [esp+12] /* EIP */ // 0x68 + mov [esp+16], ss // 0x78 + + /* Trap Frame */ + push 0 /* Error Code */ // 0x64 + push ebp // 0x60 + push ebx + push esi + push edi + push fs + push -1 /* Exception List */ // 0x4C + push 0 /* Previous Mode */ // 0x48 + push eax + push ecx + push edx + push ds + push es + push gs // 0x30 + sub esp, 0x28 /* Debug Registers */ // 0x8 + push [esp+60] /* Debug EIP */ // 0x4 + push ebp /* Debug EBP */ // 0x0 + + /* Set Stack */ + mov ebp, esp + + /* Push old Trap Frame */ + push [edi+KTHREAD_TRAP_FRAME] + + /* Save new one */ + mov [edi+KTHREAD_TRAP_FRAME], ebp + + /* Return EIP */ + push offset RestoreTrapFrameForKDB + + /* Restore EBP */ + mov ebp, [ebp+KTRAP_FRAME_EBP] + + /* Jump to normal code */ + jmp SaveTrapFrameForKDB_Return + +RestoreTrapFrameForKDB: + + /* Restore the old trapframe */ + pop [edi+KTHREAD_TRAP_FRAME] + + /* Pop unused portions of the trap frame */ + add esp, 0x30 + + /* Restore registers from Trap frame */ + pop gs + pop es + pop ds + pop edx + pop ecx + pop eax + add esp, 8 + pop fs + pop edi + pop esi + pop ebx + + /* Remove SS:ESP from the stack */ + mov ebp, [esp+16] + mov [esp+24], ebp + mov ebp, [esp+12] + mov [esp+20], ebp + mov ebp, [esp+8] + mov [esp+16], ebp + + /* Restore Fake INT Stack */ + pop ebp + add esp, 12 + + /* Return to the caller. */ + iret +#endif /* KDBG */ + + _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-04-23 04:11:56 UTC (rev 14753) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-04-23 04:12:26 UTC (rev 14754) @@ -589,50 +589,55 @@ } } -VOID +BOOLEAN +STDCALL KeContextToTrapFrame(PCONTEXT Context, - PKTRAP_FRAME TrapFrame) + PKTRAP_FRAME TrapFrame) { - if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) - { - TrapFrame->Esp = Context->Esp; - TrapFrame->Ss = Context->SegSs; - TrapFrame->Cs = Context->SegCs; - TrapFrame->Eip = Context->Eip; - TrapFrame->Eflags = Context->EFlags; - TrapFrame->Ebp = Context->Ebp; - } - if ((Context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) - { - TrapFrame->Eax = Context->Eax; - TrapFrame->Ebx = Context->Ebx; - TrapFrame->Ecx = Context->Ecx; - TrapFrame->Edx = Context->Edx; - TrapFrame->Esi = Context->Esi; - TrapFrame->Edi = Context->Edi; - } - if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) - { - TrapFrame->Ds = Context->SegDs; - TrapFrame->Es = Context->SegEs; - TrapFrame->Fs = Context->SegFs; - TrapFrame->Gs = Context->SegGs; - } - if ((Context->ContextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT) - { - /* - * Not handled - * - * This should be handled separately I think. - * - blight - */ - } - if ((Context->ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS) - { - /* - * Not handled - */ - } + /* Start with the basic Registers */ + if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) + { + TrapFrame->Esp = Context->Esp; + TrapFrame->Ss = Context->SegSs; + TrapFrame->Cs = Context->SegCs; + TrapFrame->Eip = Context->Eip; + TrapFrame->Eflags = Context->EFlags; + TrapFrame->Ebp = Context->Ebp; + } + + /* Process the Integer Registers */ + if ((Context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + { + TrapFrame->Eax = Context->Eax; + TrapFrame->Ebx = Context->Ebx; + TrapFrame->Ecx = Context->Ecx; + TrapFrame->Edx = Context->Edx; + TrapFrame->Esi = Context->Esi; + TrapFrame->Edi = Context->Edi; + } + + /* Process the Context Segments */ + if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) + { + TrapFrame->Ds = Context->SegDs; + TrapFrame->Es = Context->SegEs; + TrapFrame->Fs = Context->SegFs; + TrapFrame->Gs = Context->SegGs; + } + + /* Handle the Debug Registers */ + if ((Context->ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS) + { + TrapFrame->Dr0 = Context->Dr0; + TrapFrame->Dr1 = Context->Dr1; + TrapFrame->Dr2 = Context->Dr2; + TrapFrame->Dr3 = Context->Dr3; + TrapFrame->Dr6 = Context->Dr6; + TrapFrame->Dr7 = Context->Dr7; + } + + /* Handle FPU and Extended Registers */ + return KiContextToFxSaveArea((PFX_SAVE_AREA)(TrapFrame + 1), Context); } VOID _____ Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c --- trunk/reactos/ntoskrnl/ke/i386/thread.c 2005-04-23 04:11:56 UTC (rev 14753) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c 2005-04-23 04:12:26 UTC (rev 14754) @@ -74,73 +74,48 @@ /* Check if this is a With-Context Thread */ DPRINT("Ke386InitThreadContext\n"); - if (Context) { - + if (Context) + { /* Set up the Initial Frame */ PKUINIT_FRAME InitFrame; InitFrame = (PKUINIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KUINIT_FRAME)); DPRINT("Setting up a user-mode thread with the Frame at: %x\n", InitFrame); - - /* Setup the Fx Area */ - FxSaveArea = &InitFrame->FxSaveArea; - DPRINT("Fx Save Area: %x\n", FxSaveArea); - - /* Setup the Initial Fx State */ - if (KiContextToFxSaveArea(FxSaveArea, Context)) { - - Thread->NpxState = NPX_STATE_VALID; - } else { - - Thread->NpxState = NPX_STATE_INVALID; - } - /* Setup the Trap Frame */ TrapFrame = &InitFrame->TrapFrame; - DPRINT("TrapFrame: %x\n", TrapFrame); /* Set up a trap frame from the context. */ - TrapFrame->DebugEbp = (PVOID)Context->Ebp; - TrapFrame->DebugEip = (PVOID)Context->Eip; - TrapFrame->DebugArgMark = 0; - TrapFrame->DebugPointer = 0; - TrapFrame->TempCs = 0; - TrapFrame->TempEip = 0; - TrapFrame->Gs = (USHORT)Context->SegGs; - TrapFrame->Es = (USHORT)Context->SegEs; - TrapFrame->Ds = (USHORT)Context->SegDs; - TrapFrame->Edx = Context->Edx; - TrapFrame->Ecx = Context->Ecx; - TrapFrame->Eax = Context->Eax; - TrapFrame->PreviousMode = UserMode; - TrapFrame->ExceptionList = (PVOID)0xFFFFFFFF; - TrapFrame->Fs = TEB_SELECTOR; - TrapFrame->Edi = Context->Edi; - TrapFrame->Esi = Context->Esi; - TrapFrame->Ebx = Context->Ebx; - TrapFrame->Ebp = Context->Ebp; - TrapFrame->ErrorCode = 0; - TrapFrame->Cs = Context->SegCs; - TrapFrame->Eip = Context->Eip; + if (KeContextToTrapFrame(Context, TrapFrame)) + { + Thread->NpxState = NPX_STATE_VALID; + } + else + { + Thread->NpxState = NPX_STATE_INVALID; + } + + /* Enable Interrupts and disable some unsupported flags right now */ TrapFrame->Eflags = Context->EFlags | X86_EFLAGS_IF; TrapFrame->Eflags &= ~(X86_EFLAGS_VM | X86_EFLAGS_NT | X86_EFLAGS_IOPL); - TrapFrame->Esp = Context->Esp; - TrapFrame->Ss = (USHORT)Context->SegSs; + /* Set the previous mode as user */ + TrapFrame->PreviousMode = UserMode; + + /* Terminate the Exception Handler List */ + TrapFrame->ExceptionList = (PVOID)0xFFFFFFFF; + /* Setup the Stack for KiThreadStartup and Context Switching */ StartFrame = &InitFrame->StartFrame; CtxSwitchFrame = &InitFrame->CtxSwitchFrame; - DPRINT("StartFrame: %x\n", StartFrame); - DPRINT("CtxSwitchFrame: %x\n", CtxSwitchFrame); /* Tell the thread it will run in User Mode */ Thread->PreviousMode = UserMode; /* Tell KiThreadStartup of that too */ StartFrame->UserThread = TRUE; - - } else { - + } + else + { /* No context Thread, meaning System Thread */ /* Set up the Initial Frame */ @@ -150,15 +125,12 @@ /* Setup the Fx Area */ FxSaveArea = &InitFrame->FxSaveArea; - DPRINT("Fx Save Area: %x\n", FxSaveArea); RtlZeroMemory(FxSaveArea, sizeof(FX_SAVE_AREA)); Thread->NpxState = NPX_STATE_INVALID; /* Setup the Stack for KiThreadStartup and Context Switching */ StartFrame = &InitFrame->StartFrame; CtxSwitchFrame = &InitFrame->CtxSwitchFrame; - DPRINT("StartFrame: %x\n", StartFrame); - DPRINT("CtxSwitchFrame: %x\n", CtxSwitchFrame); /* Tell the thread it will run in Kernel Mode */ Thread->PreviousMode = KernelMode; @@ -168,7 +140,6 @@ } /* Now setup the remaining data for KiThreadStartup */ - DPRINT("Settingup the Start and Context Frames\n"); StartFrame->StartContext = StartContext; StartFrame->StartRoutine = StartRoutine; StartFrame->SystemRoutine = SystemRoutine; @@ -179,8 +150,8 @@ CtxSwitchFrame->ExceptionList = (PVOID)0xFFFFFFFF; /* Save back the new value of the kernel stack. */ - Thread->KernelStack = (PVOID)CtxSwitchFrame; DPRINT("Final Kernel Stack: %x \n", CtxSwitchFrame); + Thread->KernelStack = (PVOID)CtxSwitchFrame; return; }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
48
Older →

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 April 2005