[NTOS:KD] Remove some now useless tests on _WINKD_

This commit is contained in:
Hervé Poussineau 2020-03-07 19:30:15 +01:00
parent 660948ce6f
commit c2946ced92
6 changed files with 1 additions and 19 deletions

View file

@ -14,7 +14,6 @@
/* DATA **********************************************************************/ /* DATA **********************************************************************/
// #ifdef _WINKD_
/* /*
* WinDBG Debugger Worker State Machine data * WinDBG Debugger Worker State Machine data
*/ */
@ -27,11 +26,9 @@ WINKD_WORKER_STATE ExpDebuggerWork;
PEPROCESS ExpDebuggerProcessAttach; PEPROCESS ExpDebuggerProcessAttach;
PEPROCESS ExpDebuggerProcessKill; PEPROCESS ExpDebuggerProcessKill;
ULONG_PTR ExpDebuggerPageIn; ULONG_PTR ExpDebuggerPageIn;
// #endif /* _WINKD_ */
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
// #ifdef _WINKD_
/* /*
* WinDBG Debugger Worker State Machine * WinDBG Debugger Worker State Machine
* *
@ -142,7 +139,6 @@ ExpDebuggerWorker(IN PVOID Context)
ObDereferenceObject(Process); ObDereferenceObject(Process);
} }
} }
// #endif /* _WINKD_ */
/*++ /*++
* @name NtSystemDebugControl * @name NtSystemDebugControl

View file

@ -483,7 +483,6 @@ ExpWorkerThreadBalanceManager(IN PVOID Context)
PsTerminateSystemThread(STATUS_SYSTEM_SHUTDOWN); PsTerminateSystemThread(STATUS_SYSTEM_SHUTDOWN);
} }
// #ifdef _WINKD_
/* /*
* If WinDBG wants to attach or kill a user-mode process, and/or * If WinDBG wants to attach or kill a user-mode process, and/or
* page-in an address region, queue a debugger worker thread. * page-in an address region, queue a debugger worker thread.
@ -494,7 +493,6 @@ ExpWorkerThreadBalanceManager(IN PVOID Context)
ExpDebuggerWork = WinKdWorkerInitialized; ExpDebuggerWork = WinKdWorkerInitialized;
ExQueueWorkItem(&ExpDebuggerWorkItem, DelayedWorkQueue); ExQueueWorkItem(&ExpDebuggerWorkItem, DelayedWorkQueue);
} }
// #endif /* _WINKD_ */
} }
} }

View file

@ -47,7 +47,6 @@ extern UNICODE_STRING CmVersionString;
extern UNICODE_STRING CmCSDVersionString; extern UNICODE_STRING CmCSDVersionString;
extern CHAR NtBuildLab[]; extern CHAR NtBuildLab[];
// #ifdef _WINKD_
/* /*
* WinDBG Debugger Worker State Machine data (see dbgctrl.c) * WinDBG Debugger Worker State Machine data (see dbgctrl.c)
*/ */
@ -65,7 +64,6 @@ extern PEPROCESS ExpDebuggerProcessKill;
extern ULONG_PTR ExpDebuggerPageIn; extern ULONG_PTR ExpDebuggerPageIn;
VOID NTAPI ExpDebuggerWorker(IN PVOID Context); VOID NTAPI ExpDebuggerWorker(IN PVOID Context);
// #endif /* _WINKD_ */
#ifdef _WIN64 #ifdef _WIN64
#define HANDLE_LOW_BITS (PAGE_SHIFT - 4) #define HANDLE_LOW_BITS (PAGE_SHIFT - 4)

View file

@ -24,9 +24,7 @@ EXTERN PsConvertToGuiThread:PROC
EXTERN MmCreateKernelStack:PROC EXTERN MmCreateKernelStack:PROC
EXTERN MmDeleteKernelStack:PROC EXTERN MmDeleteKernelStack:PROC
#ifdef _WINKD_
EXTERN KdSetOwedBreakpoints:PROC EXTERN KdSetOwedBreakpoints:PROC
#endif
/* Helper Macros *************************************************************/ /* Helper Macros *************************************************************/
@ -430,9 +428,6 @@ FUNC KiPageFault
/* Check for success */ /* Check for success */
test eax, eax test eax, eax
#ifndef _WINKD_
jge PageFaultReturn
#else
jl PageFaultError jl PageFaultError
/* Check whether the kernel debugger has owed breakpoints to be inserted */ /* Check whether the kernel debugger has owed breakpoints to be inserted */
@ -441,7 +436,6 @@ FUNC KiPageFault
jmp PageFaultReturn jmp PageFaultReturn
PageFaultError: PageFaultError:
#endif
/* Disable interrupts again for the debugger */ /* Disable interrupts again for the debugger */
cli cli

View file

@ -1376,10 +1376,8 @@ KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame)
TrapFrame); TrapFrame);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
#ifdef _WINKD_
/* Check whether the kernel debugger has owed breakpoints to be inserted */ /* Check whether the kernel debugger has owed breakpoints to be inserted */
KdSetOwedBreakpoints(); KdSetOwedBreakpoints();
#endif
/* We succeeded, return */ /* We succeeded, return */
KiEoiHelper(TrapFrame); KiEoiHelper(TrapFrame);
} }

View file

@ -15,9 +15,7 @@
#define MODULE_INVOLVED_IN_ARM3 #define MODULE_INVOLVED_IN_ARM3
#include <mm/ARM3/miarm.h> #include <mm/ARM3/miarm.h>
#ifndef _WINKD_ #ifdef NDEBUG
#define KdpDprintf DPRINT
#elif defined(NDEBUG)
#define KdpDprintf(...) #define KdpDprintf(...)
#endif #endif