Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:53:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- DBGK: Use flags instead of magic values for Debug Events -- names taken from http://neitsabes.online.fr/dc/index.php?2007/12/04/7-ntqueryinformationprocess-processinfoclass-30

Browse source 
svn path=/trunk/; revision=38761
This commit is contained in:
Stefan Ginsberg 2009-01-14 14:55:46 +00:00
parent d62fc8535e
commit be69d2aa50
2 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/include/ndk/dbgktypes.h
View file

@ -33,6 +33,16 @@ Author:
#define DEBUG_OBJECT_SET_INFORMATION 0x0004 #define DEBUG_OBJECT_SET_INFORMATION 0x0004
#define DEBUG_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x0F) #define DEBUG_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x0F)
//
// Debug Event Flags
//
#define DEBUG_EVENT_READ (0x01)
#define DEBUG_EVENT_NOWAIT (0x02)
#define DEBUG_EVENT_INACTIVE (0x04)
#define DEBUG_EVENT_RELEASE (0x08)
#define DEBUG_EVENT_PROTECT_FAILED (0x10)
#define DEBUG_EVENT_SUSPEND (0x20)
// //
// Debug Object Information Classes for NtQueryDebugObject // Debug Object Information Classes for NtQueryDebugObject
// //

42
reactos/ntoskrnl/dbgk/dbgkobj.c
View file

@ -53,7 +53,7 @@ DbgkpQueueMessage(IN PEPROCESS Process,
Process, Thread, Message, Flags); Process, Thread, Message, Flags);
/* Check if we have to allocate a debug event */ /* Check if we have to allocate a debug event */
NewEvent = (Flags & 2) ? TRUE : FALSE; NewEvent = (Flags & DEBUG_EVENT_NOWAIT) ? TRUE : FALSE;
if (NewEvent) if (NewEvent)
{ {
/* Allocate it */ /* Allocate it */
@ -63,7 +63,7 @@ DbgkpQueueMessage(IN PEPROCESS Process,
if (!DebugEvent) return STATUS_INSUFFICIENT_RESOURCES; if (!DebugEvent) return STATUS_INSUFFICIENT_RESOURCES;
/* Set flags */ /* Set flags */
DebugEvent->Flags = Flags | 4; DebugEvent->Flags = Flags | DEBUG_EVENT_INACTIVE;
/* Reference the thread and process */ /* Reference the thread and process */
ObReferenceObject(Thread); ObReferenceObject(Thread);
@ -428,17 +428,17 @@ DbgkpWakeTarget(IN PDEBUG_EVENT DebugEvent)
DBGKTRACE(DBGK_OBJECT_DEBUG, "DebugEvent: %p\n", DebugEvent); DBGKTRACE(DBGK_OBJECT_DEBUG, "DebugEvent: %p\n", DebugEvent);
/* Check if we have to wake the thread */ /* Check if we have to wake the thread */
if (DebugEvent->Flags & 0x20) PsResumeThread(Thread, NULL); if (DebugEvent->Flags & DEBUG_EVENT_SUSPEND) PsResumeThread(Thread, NULL);
/* Check if we had locked the thread */ /* Check if we had locked the thread */
if (DebugEvent->Flags & 8) if (DebugEvent->Flags & DEBUG_EVENT_RELEASE)
{ {
/* Unlock it */ /* Unlock it */
ExReleaseRundownProtection(&Thread->RundownProtect); ExReleaseRundownProtection(&Thread->RundownProtect);
} }
/* Check if we have to wake up the event */ /* Check if we have to wake up the event */
if (DebugEvent->Flags & 2) if (DebugEvent->Flags & DEBUG_EVENT_NOWAIT)
{ {
/* Otherwise, free the debug event */ /* Otherwise, free the debug event */
DbgkpFreeDebugEvent(DebugEvent); DbgkpFreeDebugEvent(DebugEvent);
@ -552,7 +552,7 @@ DbgkpPostFakeModuleMessages(IN PEPROCESS Process,
Status = DbgkpQueueMessage(Process, Status = DbgkpQueueMessage(Process,
Thread, Thread,
&ApiMessage, &ApiMessage,
2, DEBUG_EVENT_NOWAIT,
DebugObject); DebugObject);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
@ -621,7 +621,7 @@ DbgkpPostFakeThreadMessages(IN PEPROCESS Process,
if (ExAcquireRundownProtection(&ThisThread->RundownProtect)) if (ExAcquireRundownProtection(&ThisThread->RundownProtect))
{ {
/* Acquire worked, set flags */ /* Acquire worked, set flags */
Flags = 0x8 | 0x2; Flags = DEBUG_EVENT_RELEASE | DEBUG_EVENT_NOWAIT;
/* Check if this is a user thread */ /* Check if this is a user thread */
if (!ThisThread->SystemThread) if (!ThisThread->SystemThread)
@ -630,14 +630,14 @@ DbgkpPostFakeThreadMessages(IN PEPROCESS Process,
if (NT_SUCCESS(PsSuspendThread(ThisThread, NULL))) if (NT_SUCCESS(PsSuspendThread(ThisThread, NULL)))
{ {
/* Remember this */ /* Remember this */
Flags = 0x8 | 0x2 | 0x20; Flags |= DEBUG_EVENT_SUSPEND;
} }
} }
} }
else else
{ {
/* Couldn't acquire rundown */ /* Couldn't acquire rundown */
Flags = 0x10 | 0x2; Flags = DEBUG_EVENT_PROTECT_FAILED | DEBUG_EVENT_NOWAIT;
} }
/* Clear the API Message */ /* Clear the API Message */
@ -645,7 +645,7 @@ DbgkpPostFakeThreadMessages(IN PEPROCESS Process,
/* Check if this is the first thread */ /* Check if this is the first thread */
if ((IsFirstThread) && if ((IsFirstThread) &&
!(Flags & 0x10) && !(Flags & DEBUG_EVENT_PROTECT_FAILED) &&
!(ThisThread->SystemThread) && !(ThisThread->SystemThread) &&
(ThisThread->GrantedAccess)) (ThisThread->GrantedAccess))
{ {
@ -1279,7 +1279,7 @@ ThreadScan:
DebugEvent->BackoutThread, PsGetCurrentThread()); DebugEvent->BackoutThread, PsGetCurrentThread());
/* Check for if the debug event queue needs flushing */ /* Check for if the debug event queue needs flushing */
if ((DebugEvent->Flags & 4) && if ((DebugEvent->Flags & DEBUG_EVENT_INACTIVE) &&
(DebugEvent->BackoutThread == PsGetCurrentThread())) (DebugEvent->BackoutThread == PsGetCurrentThread()))
{ {
/* Get the event's thread */ /* Get the event's thread */
@ -1293,7 +1293,7 @@ ThreadScan:
(!EventThread->SystemThread)) (!EventThread->SystemThread))
{ {
/* Check if we couldn't acquire rundown for it */ /* Check if we couldn't acquire rundown for it */
if (DebugEvent->Flags & 0x10) if (DebugEvent->Flags & DEBUG_EVENT_PROTECT_FAILED)
{ {
/* Set the skip termination flag */ /* Set the skip termination flag */
PspSetCrossThreadFlag(EventThread, CT_SKIP_CREATION_MSG_BIT); PspSetCrossThreadFlag(EventThread, CT_SKIP_CREATION_MSG_BIT);
@ -1308,7 +1308,7 @@ ThreadScan:
if (DoSetEvent) if (DoSetEvent)
{ {
/* Do it */ /* Do it */
DebugEvent->Flags &= ~4; DebugEvent->Flags &= ~DEBUG_EVENT_INACTIVE;
KeSetEvent(&DebugObject->EventsPresent, KeSetEvent(&DebugObject->EventsPresent,
IO_NO_INCREMENT, IO_NO_INCREMENT,
FALSE); FALSE);
@ -1330,10 +1330,10 @@ ThreadScan:
} }
/* Check if the lock is held */ /* Check if the lock is held */
if (DebugEvent->Flags & 8) if (DebugEvent->Flags & DEBUG_EVENT_RELEASE)
{ {
/* Release it */ /* Release it */
DebugEvent->Flags &= ~8; DebugEvent->Flags &= ~DEBUG_EVENT_RELEASE;
ExReleaseRundownProtection(&EventThread->RundownProtect); ExReleaseRundownProtection(&EventThread->RundownProtect);
} }
} }
@ -1569,7 +1569,7 @@ NtDebugContinue(IN HANDLE DebugHandle,
if (NeedsWake) if (NeedsWake)
{ {
/* Wake it up and break out */ /* Wake it up and break out */
DebugEvent->Flags &= ~4; DebugEvent->Flags &= ~DEBUG_EVENT_INACTIVE;
KeSetEvent(&DebugEvent->ContinueEvent, KeSetEvent(&DebugEvent->ContinueEvent,
IO_NO_INCREMENT, IO_NO_INCREMENT,
FALSE); FALSE);
@ -1578,7 +1578,7 @@ NtDebugContinue(IN HANDLE DebugHandle,
/* Compare thread ID and flag */ /* Compare thread ID and flag */
if ((DebugEvent->ClientId.UniqueThread == if ((DebugEvent->ClientId.UniqueThread ==
AppClientId->UniqueThread) && (DebugEvent->Flags & 1)) AppClientId->UniqueThread) && (DebugEvent->Flags & DEBUG_EVENT_READ))
{ {
/* Remove the event from the list */ /* Remove the event from the list */
RemoveEntryList(NextEntry); RemoveEntryList(NextEntry);
@ -1931,7 +1931,7 @@ NtWaitForDebugEvent(IN HANDLE DebugHandle,
DebugEvent, DebugEvent->Flags); DebugEvent, DebugEvent->Flags);
/* Check flags */ /* Check flags */
if (!(DebugEvent->Flags & (4 | 1))) if (!(DebugEvent->Flags & (DEBUG_EVENT_INACTIVE | DEBUG_EVENT_READ)))
{ {
/* We got an event */ /* We got an event */
GotEvent = TRUE; GotEvent = TRUE;
@ -1950,7 +1950,7 @@ NtWaitForDebugEvent(IN HANDLE DebugHandle,
DebugEvent->ClientId.UniqueProcess) DebugEvent->ClientId.UniqueProcess)
{ {
/* Found it, break out */ /* Found it, break out */
DebugEvent->Flags |= 4; DebugEvent->Flags |= DEBUG_EVENT_INACTIVE;
DebugEvent->BackoutThread = NULL; DebugEvent->BackoutThread = NULL;
GotEvent = FALSE; GotEvent = FALSE;
break; break;
@ -1982,7 +1982,7 @@ NtWaitForDebugEvent(IN HANDLE DebugHandle,
DebugEvent); DebugEvent);
/* Set flag */ /* Set flag */
DebugEvent->Flags |= 1; DebugEvent->Flags |= DEBUG_EVENT_READ;
} }
else else
{ {
@ -2049,5 +2049,3 @@ NtWaitForDebugEvent(IN HANDLE DebugHandle,
/* Return status */ /* Return status */
return Status; return Status;
} }
/* EOF */