15 Jan
2009
15 Jan
'09
1:14 p.m.
Author: sginsberg
Date: Thu Jan 15 07:14:37 2009
New Revision: 38768
URL: http://svn.reactos.org/svn/reactos?rev=38768&view=rev
Log:
- DbgkpSendApiMessage/Lpc: Modification of EPROCESS flags must be interlocked, use
PspSetProcessFlag.
- DbgkMap/UnmapViewOfSection: Don't check for the DeadThread flag, doing so is only
necessary during early thread creation.
- DbgkCreateThread: Set the StartAddress pointer in the case where we only send the Create
Thread message. Also, we should receive the target thread as the first parameter.
- NtDebugActiveProcess: Don't allow debugging the current process.
- NtDebugContinue: We should signal the Debug Object, not the Debug Event. Also make sure
we pass the correct event to DbgkpWakeTarget.
- NtWaitForDebugEvent: Cleanup probe and capture of the input timeout.
Modified:
trunk/reactos/ntoskrnl/dbgk/dbgkobj.c
trunk/reactos/ntoskrnl/dbgk/dbgkutil.c
trunk/reactos/ntoskrnl/include/internal/dbgk.h
trunk/reactos/ntoskrnl/ps/thread.c
Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re…
==============================================================================
--- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Thu Jan 15 07:14:37 2009
@@ -219,7 +219,7 @@
Message->ReturnedStatus = STATUS_PENDING;
/* Set create process reported state */
- PsGetCurrentProcess()->CreateReported = TRUE;
+ PspSetProcessFlag(PsGetCurrentProcess(), PSF_CREATE_REPORTED_BIT);
/* Send the LPC command */
Status = LpcRequestWaitReplyPort(Port,
@@ -254,7 +254,7 @@
ApiMsg->ReturnedStatus = STATUS_PENDING;
/* Set create process reported state */
- PsGetCurrentProcess()->CreateReported = TRUE;
+ PspSetProcessFlag(PsGetCurrentProcess(), PSF_CREATE_REPORTED_BIT);
/* Send the LPC command */
Status = DbgkpQueueMessage(PsGetCurrentProcess(),
@@ -1081,6 +1081,7 @@
BOOLEAN DebugPortCleared = FALSE;
PLIST_ENTRY DebugEventList;
PDEBUG_EVENT DebugEvent;
+ PAGED_CODE();
DBGKTRACE(DBGK_OBJECT_DEBUG, "OwnerProcess: %p DebugObject: %p\n",
OwnerProcess, DebugObject);
@@ -1260,8 +1261,9 @@
else
{
/* Set the process flags */
- InterlockedOr((PLONG)&Process->Flags,
- PSF_NO_DEBUG_INHERIT_BIT | PSF_CREATE_REPORTED_BIT);
+ PspSetProcessFlag(Process,
+ PSF_NO_DEBUG_INHERIT_BIT |
+ PSF_CREATE_REPORTED_BIT);
/* Reference the debug object */
ObReferenceObject(DebugObject);
@@ -1474,12 +1476,15 @@
&hDebug);
if (NT_SUCCESS(Status))
{
+ /* Enter SEH to protect the write */
_SEH2_TRY
{
+ /* Return the handle */
*DebugHandle = hDebug;
}
- _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
- {
+ _SEH2_EXCEPT(ExSystemExceptionFilter())
+ {
+ /* Get the exception code */
Status = _SEH2_GetExceptionCode();
} _SEH2_END;
}
@@ -1570,7 +1575,7 @@
{
/* Wake it up and break out */
DebugEvent->Flags &= ~DEBUG_EVENT_INACTIVE;
- KeSetEvent(&DebugEvent->ContinueEvent,
+ KeSetEvent(&DebugObject->EventsPresent,
IO_NO_INCREMENT,
FALSE);
break;
@@ -1603,11 +1608,11 @@
if (NeedsWake)
{
/* Set the continue status */
- DebugEvent->ApiMsg.ReturnedStatus = ContinueStatus;
- DebugEvent->Status = STATUS_SUCCESS;
+ DebugEventToWake->ApiMsg.ReturnedStatus = ContinueStatus;
+ DebugEventToWake->Status = STATUS_SUCCESS;
/* Wake the target */
- DbgkpWakeTarget(DebugEvent);
+ DbgkpWakeTarget(DebugEventToWake);
}
else
{
@@ -1628,7 +1633,7 @@
{
PEPROCESS Process;
PDEBUG_OBJECT DebugObject;
- KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
+ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
PETHREAD LastThread;
NTSTATUS Status;
PAGED_CODE();
@@ -1644,8 +1649,9 @@
NULL);
if (!NT_SUCCESS(Status)) return Status;
- /* Don't allow debugging the initial system process */
- if (Process == PsInitialSystemProcess)
+ /* Don't allow debugging the current process or the system process */
+ if ((Process == PsGetCurrentProcess()) ||
+ (Process == PsInitialSystemProcess))
{
/* Dereference and fail */
ObDereferenceObject(Process);
@@ -1700,7 +1706,7 @@
{
PEPROCESS Process;
PDEBUG_OBJECT DebugObject;
- KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
+ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
NTSTATUS Status;
PAGED_CODE();
DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p Handle: %p\n",
@@ -1823,7 +1829,7 @@
OUT PDBGUI_WAIT_STATE_CHANGE StateChange)
{
KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
- LARGE_INTEGER SafeTimeOut;
+ LARGE_INTEGER LocalTimeOut;
PEPROCESS Process;
LARGE_INTEGER StartTime;
PETHREAD Thread;
@@ -1837,44 +1843,46 @@
PAGED_CODE();
DBGKTRACE(DBGK_OBJECT_DEBUG, "Handle: %p\n", DebugHandle);
- /* Clear the initial wait state change structure */
+ /* Clear the initial wait state change structure and the timeout */
RtlZeroMemory(&WaitStateChange, sizeof(WaitStateChange));
-
- /* Protect probe in SEH */
- _SEH2_TRY
- {
- /* Check if we came with a timeout */
- if (Timeout)
- {
- /* Check if the call was from user mode */
- if (PreviousMode != KernelMode)
+ LocalTimeOut.QuadPart = 0;
+
+ /* Check if we were called from user mode */
+ if (PreviousMode != KernelMode)
+ {
+ /* Protect probe in SEH */
+ _SEH2_TRY
+ {
+ /* Check if we came with a timeout */
+ if (Timeout)
{
/* Probe it */
ProbeForReadLargeInteger(Timeout);
- }
-
- /* Make a local copy */
- SafeTimeOut = *Timeout;
- Timeout = &SafeTimeOut;
-
- /* Query the current time */
- KeQuerySystemTime(&StartTime);
- }
-
- /* Check if the call was from user mode */
- if (PreviousMode != KernelMode)
- {
+
+ /* Make a local copy */
+ LocalTimeOut = *Timeout;
+ Timeout = &LocalTimeOut;
+ }
+
/* Probe the state change structure */
ProbeForWrite(StateChange, sizeof(*StateChange), sizeof(ULONG));
}
- }
- _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
- {
- /* Get the exception code */
- Status = _SEH2_GetExceptionCode();
- }
- _SEH2_END;
- if (!NT_SUCCESS(Status)) return Status;
+ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+ {
+ /* Get the exception code */
+ Status = _SEH2_GetExceptionCode();
+ }
+ _SEH2_END;
+ if (!NT_SUCCESS(Status)) return Status;
+ }
+ else
+ {
+ /* Copy directly */
+ if (Timeout) LocalTimeOut = *Timeout;
+ }
+
+ /* If we were passed a timeout, query the current time */
+ if (Timeout) KeQuerySystemTime(&StartTime);
/* Get the debug object */
Status = ObReferenceObjectByHandle(DebugHandle,
@@ -1892,7 +1900,7 @@
/* Wait on the debug object given to us */
while (TRUE)
{
- Status = KeWaitForSingleObject(DebugObject,
+ Status = KeWaitForSingleObject(&DebugObject->EventsPresent,
Executive,
PreviousMode,
Alertable,
@@ -2002,17 +2010,17 @@
if (!GotEvent)
{
/* Check if we can wait again */
- if (SafeTimeOut.QuadPart < 0)
+ if (LocalTimeOut.QuadPart < 0)
{
/* Query the new time */
KeQuerySystemTime(&NewTime);
/* Substract times */
- SafeTimeOut.QuadPart += (NewTime.QuadPart - StartTime.QuadPart);
+ LocalTimeOut.QuadPart += (NewTime.QuadPart - StartTime.QuadPart);
StartTime = NewTime;
/* Check if we've timed out */
- if (SafeTimeOut.QuadPart >= 0)
+ if (LocalTimeOut.QuadPart >= 0)
{
/* We have, break out of the loop */
Status = STATUS_TIMEOUT;
Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r…
==============================================================================
--- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c [iso-8859-1] Thu Jan 15 07:14:37 2009
@@ -11,8 +11,6 @@
#include <ntoskrnl.h>
#define NDEBUG
#include <debug.h>
-
-extern ULONG DbgkpTraceLevel;
/* FUNCTIONS *****************************************************************/
@@ -86,9 +84,9 @@
VOID
NTAPI
-DbgkCreateThread(PVOID StartAddress)
-{
- PETHREAD Thread = PsGetCurrentThread();
+DbgkCreateThread(IN PETHREAD Thread,
+ IN PVOID StartAddress)
+{
PEPROCESS Process = PsGetCurrentProcess();
ULONG ProcessFlags;
IMAGE_INFO ImageInfo;
@@ -106,10 +104,13 @@
PTEB Teb;
PAGED_CODE();
+ /* Sanity check */
+ ASSERT(Thread == PsGetCurrentThread());
+
/* Try ORing in the create reported and image notify flags */
- ProcessFlags = InterlockedOr((PLONG)&Process->Flags,
- PSF_CREATE_REPORTED_BIT |
- PSF_IMAGE_NOTIFY_DONE_BIT);
+ ProcessFlags = PspSetProcessFlag(Process,
+ PSF_CREATE_REPORTED_BIT |
+ PSF_IMAGE_NOTIFY_DONE_BIT);
/* Check if we were the first to set them or if another thread raced us */
if (!(ProcessFlags & PSF_IMAGE_NOTIFY_DONE_BIT) &&
(PsImageNotifyEnabled))
@@ -282,7 +283,7 @@
{
/* Otherwise, do it just for the thread */
CreateThread->SubSystemKey = 0;
- CreateThread->StartAddress = NULL;
+ CreateThread->StartAddress = StartAddress;
/* Setup the API Message */
ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 |
@@ -385,11 +386,10 @@
DBGKTRACE(DBGK_PROCESS_DEBUG,
"Section: %p. Base: %p\n", Section, BaseAddress);
- /* Check if this thread is hidden, doesn't have a debug port, or died */
- if ((Thread->HideFromDebugger) ||
- !(Process->DebugPort) ||
- (Thread->DeadThread) ||
- (KeGetPreviousMode() == KernelMode))
+ /* Check if this thread is kernel, hidden or doesn't have a debug port */
+ if ((ExGetPreviousMode() == KernelMode) ||
+ (Thread->HideFromDebugger) ||
+ !(Process->DebugPort))
{
/* Don't notify the debugger */
return;
@@ -434,11 +434,10 @@
PETHREAD Thread = PsGetCurrentThread();
PAGED_CODE();
- /* Check if this thread is hidden, doesn't have a debug port, or died */
- if ((Thread->HideFromDebugger) ||
- !(Process->DebugPort) ||
- (Thread->DeadThread) ||
- (KeGetPreviousMode() == KernelMode))
+ /* Check if this thread is kernel, hidden or doesn't have a debug port */
+ if ((ExGetPreviousMode() == KernelMode) ||
+ (Thread->HideFromDebugger) ||
+ !(Process->DebugPort))
{
/* Don't notify the debugger */
return;
@@ -456,5 +455,3 @@
/* Send the message */
DbgkpSendApiMessage(&ApiMessage, TRUE);
}
-
-/* EOF */
Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] Thu Jan 15 07:14:37 2009
@@ -56,6 +56,7 @@
VOID
NTAPI
DbgkCreateThread(
+ IN PETHREAD Thread,
IN PVOID StartAddress
);
@@ -133,6 +134,7 @@
IN PDEBUG_OBJECT SourceDebugObject
);
+extern ULONG DbgkpTraceLevel;
extern POBJECT_TYPE DbgkDebugObjectType;
/* EOF */
Modified: trunk/reactos/ntoskrnl/ps/thread.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3…
==============================================================================
--- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Thu Jan 15 07:14:37 2009
@@ -56,7 +56,7 @@
if (!(Thread->DeadThread) && !(Thread->HideFromDebugger))
{
/* We're not, so notify the debugger */
- DbgkCreateThread(StartContext);
+ DbgkCreateThread(Thread, StartContext);
}
/* Make sure we're not already dead */