From e31be4ec25007c40f422b15b30a6830d95e225c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 9 Mar 2020 23:48:55 +0100 Subject: [PATCH] [NTOS:KD] Merge KdEnableDebuggerWithLock()/KdDisableDebuggerWithLock() with kd64 version --- ntoskrnl/kd64/kdapi.c | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c index 5aeb7dc6750..f844e972b48 100644 --- a/ntoskrnl/kd64/kdapi.c +++ b/ntoskrnl/kd64/kdapi.c @@ -1964,7 +1964,6 @@ NTSTATUS NTAPI KdEnableDebuggerWithLock(IN BOOLEAN NeedLock) { -#ifdef _WINKD_ KIRQL OldIrql; #if defined(__GNUC__) @@ -2035,31 +2034,12 @@ KdEnableDebuggerWithLock(IN BOOLEAN NeedLock) /* We're done */ return STATUS_SUCCESS; -#else - KIRQL OldIrql; - - /* Raise IRQL */ - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - /* TODO: Re-enable any breakpoints */ - - /* Enable the Debugger */ - KdDebuggerEnabled = TRUE; - SharedUserData->KdDebuggerEnabled = TRUE; - - /* Lower the IRQL */ - KeLowerIrql(OldIrql); - - /* Return success */ - return STATUS_SUCCESS; -#endif } NTSTATUS NTAPI KdDisableDebuggerWithLock(IN BOOLEAN NeedLock) { -#ifdef _WINKD_ KIRQL OldIrql; NTSTATUS Status; @@ -2144,29 +2124,6 @@ KdDisableDebuggerWithLock(IN BOOLEAN NeedLock) /* We're done */ return STATUS_SUCCESS; -#else - KIRQL OldIrql; - - if (!NeedLock) - { - return STATUS_ACCESS_DENIED; - } - - /* Raise IRQL */ - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - /* TODO: Disable any breakpoints */ - - /* Disable the Debugger */ - KdDebuggerEnabled = FALSE; - SharedUserData->KdDebuggerEnabled = FALSE; - - /* Lower the IRQL */ - KeLowerIrql(OldIrql); - - /* Return success */ - return STATUS_SUCCESS; -#endif } /* PUBLIC FUNCTIONS **********************************************************/