Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:EX] Minor enhancements to ExpDebuggerWorker()

Browse source 
- Add some DbgPrints.
- Use SAL2 annotations.
This commit is contained in:
Hermès Bélusca-Maïto 2024-12-07 16:31:15 +01:00
parent ec4c169e3e
commit da59d797d1
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ntoskrnl/ex/dbgctrl.c
View file

@ -49,7 +49,8 @@ ULONG_PTR ExpDebuggerPageIn;
*/ */
VOID VOID
NTAPI NTAPI
ExpDebuggerWorker(IN PVOID Context) ExpDebuggerWorker(
_In_ PVOID Context)
{ {
PEPROCESS ProcessToAttach, ProcessToKill; PEPROCESS ProcessToAttach, ProcessToKill;
ULONG_PTR PageInAddress; ULONG_PTR PageInAddress;
@ -83,11 +84,10 @@ ExpDebuggerWorker(IN PVOID Context)
Process = NULL; Process = NULL;
/* Check if we need to attach or kill some process */ /* Check if we need to attach or kill some process */
if (ProcessToAttach != NULL || ProcessToKill != NULL) if (ProcessToAttach || ProcessToKill)
{ {
/* Find the process in the list */ /* Find the process in the list */
Process = PsGetNextProcess(Process); while ((Process = PsGetNextProcess(Process)))
while (Process)
{ {
/* Is this the process we want to attach to? */ /* Is this the process we want to attach to? */
if (Process == ProcessToAttach) if (Process == ProcessToAttach)
@ -104,12 +104,16 @@ ExpDebuggerWorker(IN PVOID Context)
ObDereferenceObject(Process); ObDereferenceObject(Process);
return; return;
} }
/* Get the next process */
Process = PsGetNextProcess(Process);
} }
/* We either have found a process, or we default to the current process */ if (!Process)
{
DbgPrintEx(DPFLTR_SYSTEM_ID, DPFLTR_ERROR_LEVEL,
"EX debug work: Unable to find process %p\n",
ProcessToAttach ? ProcessToAttach : ProcessToKill);
}
/* We either have found a process, or we default to the current one */
} }
/* If we have an address to page in... */ /* If we have an address to page in... */
@ -122,7 +126,9 @@ ExpDebuggerWorker(IN PVOID Context)
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
DPRINT1("Failed to page in address 0x%p, Status 0x%08lx\n", PageInAddress, _SEH2_GetExceptionCode()); DbgPrintEx(DPFLTR_SYSTEM_ID, DPFLTR_ERROR_LEVEL,
"EX page in: Failed to page-in address 0x%p, Status 0x%08lx\n",
PageInAddress, _SEH2_GetExceptionCode());
} }
_SEH2_END; _SEH2_END;
} }
@ -135,7 +141,7 @@ ExpDebuggerWorker(IN PVOID Context)
{ {
/* ... we can detach from the process */ /* ... we can detach from the process */
KeUnstackDetachProcess(&ApcState); KeUnstackDetachProcess(&ApcState);
/* Dereference the process which was referenced for us by PsGetNextProcess */ /* Dereference the process referenced by PsGetNextProcess() */
ObDereferenceObject(Process); ObDereferenceObject(Process);
} }
} }

5
ntoskrnl/include/internal/ex.h
View file

@ -70,7 +70,10 @@ extern PEPROCESS ExpDebuggerProcessAttach;
extern PEPROCESS ExpDebuggerProcessKill; extern PEPROCESS ExpDebuggerProcessKill;
extern ULONG_PTR ExpDebuggerPageIn; extern ULONG_PTR ExpDebuggerPageIn;
VOID NTAPI ExpDebuggerWorker(IN PVOID Context); VOID
NTAPI
ExpDebuggerWorker(
_In_ PVOID Context);
#ifdef _WIN64 #ifdef _WIN64
#define HANDLE_LOW_BITS (PAGE_SHIFT - 4) #define HANDLE_LOW_BITS (PAGE_SHIFT - 4)