https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d3dac324e3d34c6315eb1bce69d328540081956
commit 7d3dac324e3d34c6315eb1bce69d328540081956 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Sat Jul 18 17:43:29 2020 +0200 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Sat Jul 18 17:45:40 2020 +0200 [NTOS][KDBG] Use macros to simplify initializing the debug filter tables. --- ntoskrnl/config/cmdata.c | 1263 +++++++--------------------------------------- ntoskrnl/kdbg/kdb_cli.c | 316 ++++++------ 2 files changed, 331 insertions(+), 1248 deletions(-) diff --git a/ntoskrnl/config/cmdata.c b/ntoskrnl/config/cmdata.c index ca9d9175a43..922b7f847d6 100644 --- a/ntoskrnl/config/cmdata.c +++ b/ntoskrnl/config/cmdata.c @@ -718,1107 +718,186 @@ INIT_SECTION CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = // // Debug Filter Masks - See kd64/kddata.c // - { - L"Session Manager\\Debug Print Filter", - L"WIN2000", - &Kd_WIN2000_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SYSTEM", - &Kd_SYSTEM_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SMSS", - &Kd_SMSS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SETUP", - &Kd_SETUP_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"NTFS", - &Kd_NTFS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FSTUB", - &Kd_FSTUB_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"CRASHDUMP", - &Kd_CRASHDUMP_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"CDAUDIO", - &Kd_CDAUDIO_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"CDROM", - &Kd_CDROM_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"CLASSPNP", - &Kd_CLASSPNP_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DISK", - &Kd_DISK_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"REDBOOK", - &Kd_REDBOOK_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"STORPROP", - &Kd_STORPROP_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SCSIPORT", - &Kd_SCSIPORT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SCSIMINIPORT", - &Kd_SCSIMINIPORT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"CONFIG", - &Kd_CONFIG_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"I8042PRT", - &Kd_I8042PRT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SERMOUSE", - &Kd_SERMOUSE_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"LSERMOUS", - &Kd_LSERMOUS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"KBDHID", - &Kd_KBDHID_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"MOUHID", - &Kd_MOUHID_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"KBDCLASS", - &Kd_KBDCLASS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"MOUCLASS", - &Kd_MOUCLASS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"TWOTRACK", - &Kd_TWOTRACK_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"WMILIB", - &Kd_WMILIB_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"ACPI", - &Kd_ACPI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"AMLI", - &Kd_AMLI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"HALIA64", - &Kd_HALIA64_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VIDEO", - &Kd_VIDEO_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SVCHOST", - &Kd_SVCHOST_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VIDEOPRT", - &Kd_VIDEOPRT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"TCPIP", - &Kd_TCPIP_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DMSYNTH", - &Kd_DMSYNTH_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"NTOSPNP", - &Kd_NTOSPNP_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FASTFAT", - &Kd_FASTFAT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SAMSS", - &Kd_SAMSS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"PNPMGR", - &Kd_PNPMGR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"NETAPI", - &Kd_NETAPI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SCSERVER", - &Kd_SCSERVER_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SCCLIENT", - &Kd_SCCLIENT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SERIAL", - &Kd_SERIAL_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SERENUM", - &Kd_SERENUM_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"UHCD", - &Kd_UHCD_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"RPCPROXY", - &Kd_RPCPROXY_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"AUTOCHK", - &Kd_AUTOCHK_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DCOMSS", - &Kd_DCOMSS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"UNIMODEM", - &Kd_UNIMODEM_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SIS", - &Kd_SIS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FLTMGR", - &Kd_FLTMGR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"WMICORE", - &Kd_WMICORE_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"BURNENG", - &Kd_BURNENG_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"IMAPI", - &Kd_IMAPI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SXS", - &Kd_SXS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FUSION", - &Kd_FUSION_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"IDLETASK", - &Kd_IDLETASK_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SOFTPCI", - &Kd_SOFTPCI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"TAPE", - &Kd_TAPE_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"MCHGR", - &Kd_MCHGR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"IDEP", - &Kd_IDEP_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"PCIIDE", - &Kd_PCIIDE_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FLOPPY", - &Kd_FLOPPY_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FDC", - &Kd_FDC_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"TERMSRV", - &Kd_TERMSRV_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"W32TIME", - &Kd_W32TIME_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"PREFETCHER", - &Kd_PREFETCHER_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"RSFILTER", - &Kd_RSFILTER_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FCPORT", - &Kd_FCPORT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"PCI", - &Kd_PCI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DMIO", - &Kd_DMIO_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DMCONFIG", - &Kd_DMCONFIG_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DMADMIN", - &Kd_DMADMIN_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"WSOCKTRANSPORT", - &Kd_WSOCKTRANSPORT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VSS", - &Kd_VSS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"PNPMEM", - &Kd_PNPMEM_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"PROCESSOR", - &Kd_PROCESSOR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DMSERVER", - &Kd_DMSERVER_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SR", - &Kd_SR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"INFINIBAND", - &Kd_INFINIBAND_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"IHVDRIVER", - &Kd_IHVDRIVER_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"IHVVIDEO", - &Kd_IHVVIDEO_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"IHVAUDIO", - &Kd_IHVAUDIO_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"IHVNETWORK", - &Kd_IHVNETWORK_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"IHVSTREAMING", - &Kd_IHVSTREAMING_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"IHVBUS", - &Kd_IHVBUS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"HPS", - &Kd_HPS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"RTLTHREADPOOL", - &Kd_RTLTHREADPOOL_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"LDR", - &Kd_LDR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"TCPIP6", - &Kd_TCPIP6_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"ISAPNP", - &Kd_ISAPNP_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SHPC", - &Kd_SHPC_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"STORPORT", - &Kd_STORPORT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"STORMINIPORT", - &Kd_STORMINIPORT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"PRINTSPOOLER", - &Kd_PRINTSPOOLER_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VSSDYNDISK", - &Kd_VSSDYNDISK_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VERIFIER", - &Kd_VERIFIER_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VDS", - &Kd_VDS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VDSBAS", - &Kd_VDSBAS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VDSDYN", - &Kd_VDSDYN_Mask, // Specified in Vista+ - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VDSDYNDR", - &Kd_VDSDYNDR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VDSLDR", - &Kd_VDSLDR_Mask, // Specified in Vista+ - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VDSUTIL", - &Kd_VDSUTIL_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DFRGIFC", - &Kd_DFRGIFC_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DEFAULT", - &Kd_DEFAULT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"MM", - &Kd_MM_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DFSC", - &Kd_DFSC_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"WOW64", - &Kd_WOW64_Mask, - NULL, - NULL - }, + +#define WTEXT(s) L##s +#define CM_DEBUG_PRINT_FILTER(Name) \ + { \ + L"Session Manager\\Debug Print Filter", \ + WTEXT(#Name), \ + &Kd_##Name##_Mask, \ + NULL, \ + NULL \ + } + + CM_DEBUG_PRINT_FILTER(WIN2000), + CM_DEBUG_PRINT_FILTER(SYSTEM), + CM_DEBUG_PRINT_FILTER(SMSS), + CM_DEBUG_PRINT_FILTER(SETUP), + CM_DEBUG_PRINT_FILTER(NTFS), + CM_DEBUG_PRINT_FILTER(FSTUB), + CM_DEBUG_PRINT_FILTER(CRASHDUMP), + CM_DEBUG_PRINT_FILTER(CDAUDIO), + CM_DEBUG_PRINT_FILTER(CDROM), + CM_DEBUG_PRINT_FILTER(CLASSPNP), + CM_DEBUG_PRINT_FILTER(DISK), + CM_DEBUG_PRINT_FILTER(REDBOOK), + CM_DEBUG_PRINT_FILTER(STORPROP), + CM_DEBUG_PRINT_FILTER(SCSIPORT), + CM_DEBUG_PRINT_FILTER(SCSIMINIPORT), + CM_DEBUG_PRINT_FILTER(CONFIG), + CM_DEBUG_PRINT_FILTER(I8042PRT), + CM_DEBUG_PRINT_FILTER(SERMOUSE), + CM_DEBUG_PRINT_FILTER(LSERMOUS), + CM_DEBUG_PRINT_FILTER(KBDHID), + CM_DEBUG_PRINT_FILTER(MOUHID), + CM_DEBUG_PRINT_FILTER(KBDCLASS), + CM_DEBUG_PRINT_FILTER(MOUCLASS), + CM_DEBUG_PRINT_FILTER(TWOTRACK), + CM_DEBUG_PRINT_FILTER(WMILIB), + CM_DEBUG_PRINT_FILTER(ACPI), + CM_DEBUG_PRINT_FILTER(AMLI), + CM_DEBUG_PRINT_FILTER(HALIA64), + CM_DEBUG_PRINT_FILTER(VIDEO), + CM_DEBUG_PRINT_FILTER(SVCHOST), + CM_DEBUG_PRINT_FILTER(VIDEOPRT), + CM_DEBUG_PRINT_FILTER(TCPIP), + CM_DEBUG_PRINT_FILTER(DMSYNTH), + CM_DEBUG_PRINT_FILTER(NTOSPNP), + CM_DEBUG_PRINT_FILTER(FASTFAT), + CM_DEBUG_PRINT_FILTER(SAMSS), + CM_DEBUG_PRINT_FILTER(PNPMGR), + CM_DEBUG_PRINT_FILTER(NETAPI), + CM_DEBUG_PRINT_FILTER(SCSERVER), + CM_DEBUG_PRINT_FILTER(SCCLIENT), + CM_DEBUG_PRINT_FILTER(SERIAL), + CM_DEBUG_PRINT_FILTER(SERENUM), + CM_DEBUG_PRINT_FILTER(UHCD), + CM_DEBUG_PRINT_FILTER(RPCPROXY), + CM_DEBUG_PRINT_FILTER(AUTOCHK), + CM_DEBUG_PRINT_FILTER(DCOMSS), + CM_DEBUG_PRINT_FILTER(UNIMODEM), + CM_DEBUG_PRINT_FILTER(SIS), + CM_DEBUG_PRINT_FILTER(FLTMGR), + CM_DEBUG_PRINT_FILTER(WMICORE), + CM_DEBUG_PRINT_FILTER(BURNENG), + CM_DEBUG_PRINT_FILTER(IMAPI), + CM_DEBUG_PRINT_FILTER(SXS), + CM_DEBUG_PRINT_FILTER(FUSION), + CM_DEBUG_PRINT_FILTER(IDLETASK), + CM_DEBUG_PRINT_FILTER(SOFTPCI), + CM_DEBUG_PRINT_FILTER(TAPE), + CM_DEBUG_PRINT_FILTER(MCHGR), + CM_DEBUG_PRINT_FILTER(IDEP), + CM_DEBUG_PRINT_FILTER(PCIIDE), + CM_DEBUG_PRINT_FILTER(FLOPPY), + CM_DEBUG_PRINT_FILTER(FDC), + CM_DEBUG_PRINT_FILTER(TERMSRV), + CM_DEBUG_PRINT_FILTER(W32TIME), + CM_DEBUG_PRINT_FILTER(PREFETCHER), + CM_DEBUG_PRINT_FILTER(RSFILTER), + CM_DEBUG_PRINT_FILTER(FCPORT), + CM_DEBUG_PRINT_FILTER(PCI), + CM_DEBUG_PRINT_FILTER(DMIO), + CM_DEBUG_PRINT_FILTER(DMCONFIG), + CM_DEBUG_PRINT_FILTER(DMADMIN), + CM_DEBUG_PRINT_FILTER(WSOCKTRANSPORT), + CM_DEBUG_PRINT_FILTER(VSS), + CM_DEBUG_PRINT_FILTER(PNPMEM), + CM_DEBUG_PRINT_FILTER(PROCESSOR), + CM_DEBUG_PRINT_FILTER(DMSERVER), + CM_DEBUG_PRINT_FILTER(SR), + CM_DEBUG_PRINT_FILTER(INFINIBAND), + CM_DEBUG_PRINT_FILTER(IHVDRIVER), + CM_DEBUG_PRINT_FILTER(IHVVIDEO), + CM_DEBUG_PRINT_FILTER(IHVAUDIO), + CM_DEBUG_PRINT_FILTER(IHVNETWORK), + CM_DEBUG_PRINT_FILTER(IHVSTREAMING), + CM_DEBUG_PRINT_FILTER(IHVBUS), + CM_DEBUG_PRINT_FILTER(HPS), + CM_DEBUG_PRINT_FILTER(RTLTHREADPOOL), + CM_DEBUG_PRINT_FILTER(LDR), + CM_DEBUG_PRINT_FILTER(TCPIP6), + CM_DEBUG_PRINT_FILTER(ISAPNP), + CM_DEBUG_PRINT_FILTER(SHPC), + CM_DEBUG_PRINT_FILTER(STORPORT), + CM_DEBUG_PRINT_FILTER(STORMINIPORT), + CM_DEBUG_PRINT_FILTER(PRINTSPOOLER), + CM_DEBUG_PRINT_FILTER(VSSDYNDISK), + CM_DEBUG_PRINT_FILTER(VERIFIER), + CM_DEBUG_PRINT_FILTER(VDS), + CM_DEBUG_PRINT_FILTER(VDSBAS), + CM_DEBUG_PRINT_FILTER(VDSDYN), // Specified in Vista+ + CM_DEBUG_PRINT_FILTER(VDSDYNDR), + CM_DEBUG_PRINT_FILTER(VDSLDR), // Specified in Vista+ + CM_DEBUG_PRINT_FILTER(VDSUTIL), + CM_DEBUG_PRINT_FILTER(DFRGIFC), + CM_DEBUG_PRINT_FILTER(DEFAULT), + CM_DEBUG_PRINT_FILTER(MM), + CM_DEBUG_PRINT_FILTER(DFSC), + CM_DEBUG_PRINT_FILTER(WOW64), // // Components specified in Vista+, some of which we also use in ReactOS // - { - L"Session Manager\\Debug Print Filter", - L"ALPC", - &Kd_ALPC_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"WDI", - &Kd_WDI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"PERFLIB", - &Kd_PERFLIB_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"KTM", - &Kd_KTM_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"IOSTRESS", - &Kd_IOSTRESS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"HEAP", - &Kd_HEAP_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"WHEA", - &Kd_WHEA_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"USERGDI", - &Kd_USERGDI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"MMCSS", - &Kd_MMCSS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"TPM", - &Kd_TPM_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"THREADORDER", - &Kd_THREADORDER_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"ENVIRON", - &Kd_ENVIRON_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"EMS", - &Kd_EMS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"WDT", - &Kd_WDT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FVEVOL", - &Kd_FVEVOL_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"NDIS", - &Kd_NDIS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"NVCTRACE", - &Kd_NVCTRACE_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"LUAFV", - &Kd_LUAFV_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"APPCOMPAT", - &Kd_APPCOMPAT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"USBSTOR", - &Kd_USBSTOR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SBP2PORT", - &Kd_SBP2PORT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"COVERAGE", - &Kd_COVERAGE_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"CACHEMGR", - &Kd_CACHEMGR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"MOUNTMGR", - &Kd_MOUNTMGR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"CFR", - &Kd_CFR_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"TXF", - &Kd_TXF_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"KSECDD", - &Kd_KSECDD_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FLTREGRESS", - &Kd_FLTREGRESS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"MPIO", - &Kd_MPIO_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"MSDSM", - &Kd_MSDSM_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"UDFS", - &Kd_UDFS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"PSHED", - &Kd_PSHED_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"STORVSP", - &Kd_STORVSP_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"LSASS", - &Kd_LSASS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SSPICLI", - &Kd_SSPICLI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"CNG", - &Kd_CNG_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"EXFAT", - &Kd_EXFAT_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FILETRACE", - &Kd_FILETRACE_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"XSAVE", - &Kd_XSAVE_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"SE", - &Kd_SE_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"DRIVEEXTENDER", - &Kd_DRIVEEXTENDER_Mask, - NULL, - NULL - }, + CM_DEBUG_PRINT_FILTER(ALPC), + CM_DEBUG_PRINT_FILTER(WDI), + CM_DEBUG_PRINT_FILTER(PERFLIB), + CM_DEBUG_PRINT_FILTER(KTM), + CM_DEBUG_PRINT_FILTER(IOSTRESS), + CM_DEBUG_PRINT_FILTER(HEAP), + CM_DEBUG_PRINT_FILTER(WHEA), + CM_DEBUG_PRINT_FILTER(USERGDI), + CM_DEBUG_PRINT_FILTER(MMCSS), + CM_DEBUG_PRINT_FILTER(TPM), + CM_DEBUG_PRINT_FILTER(THREADORDER), + CM_DEBUG_PRINT_FILTER(ENVIRON), + CM_DEBUG_PRINT_FILTER(EMS), + CM_DEBUG_PRINT_FILTER(WDT), + CM_DEBUG_PRINT_FILTER(FVEVOL), + CM_DEBUG_PRINT_FILTER(NDIS), + CM_DEBUG_PRINT_FILTER(NVCTRACE), + CM_DEBUG_PRINT_FILTER(LUAFV), + CM_DEBUG_PRINT_FILTER(APPCOMPAT), + CM_DEBUG_PRINT_FILTER(USBSTOR), + CM_DEBUG_PRINT_FILTER(SBP2PORT), + CM_DEBUG_PRINT_FILTER(COVERAGE), + CM_DEBUG_PRINT_FILTER(CACHEMGR), + CM_DEBUG_PRINT_FILTER(MOUNTMGR), + CM_DEBUG_PRINT_FILTER(CFR), + CM_DEBUG_PRINT_FILTER(TXF), + CM_DEBUG_PRINT_FILTER(KSECDD), + CM_DEBUG_PRINT_FILTER(FLTREGRESS), + CM_DEBUG_PRINT_FILTER(MPIO), + CM_DEBUG_PRINT_FILTER(MSDSM), + CM_DEBUG_PRINT_FILTER(UDFS), + CM_DEBUG_PRINT_FILTER(PSHED), + CM_DEBUG_PRINT_FILTER(STORVSP), + CM_DEBUG_PRINT_FILTER(LSASS), + CM_DEBUG_PRINT_FILTER(SSPICLI), + CM_DEBUG_PRINT_FILTER(CNG), + CM_DEBUG_PRINT_FILTER(EXFAT), + CM_DEBUG_PRINT_FILTER(FILETRACE), + CM_DEBUG_PRINT_FILTER(XSAVE), + CM_DEBUG_PRINT_FILTER(SE), + CM_DEBUG_PRINT_FILTER(DRIVEEXTENDER), // // Components specified in Windows 8 // - { - L"Session Manager\\Debug Print Filter", - L"POWER", - &Kd_POWER_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"CRASHDUMPXHCI", - &Kd_CRASHDUMPXHCI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"GPIO", - &Kd_GPIO_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"REFS", - &Kd_REFS_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"WER", - &Kd_WER_Mask, - NULL, - NULL - }, + CM_DEBUG_PRINT_FILTER(POWER), + CM_DEBUG_PRINT_FILTER(CRASHDUMPXHCI), + CM_DEBUG_PRINT_FILTER(GPIO), + CM_DEBUG_PRINT_FILTER(REFS), + CM_DEBUG_PRINT_FILTER(WER), // // Components specified in Windows 10 // - { - L"Session Manager\\Debug Print Filter", - L"CAPIMG", - &Kd_CAPIMG_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"VPCI", - &Kd_VPCI_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"STORAGECLASSMEMORY", - &Kd_STORAGECLASSMEMORY_Mask, - NULL, - NULL - }, - { - L"Session Manager\\Debug Print Filter", - L"FSLIB", - &Kd_FSLIB_Mask, - NULL, - NULL - }, + CM_DEBUG_PRINT_FILTER(CAPIMG), + CM_DEBUG_PRINT_FILTER(VPCI), + CM_DEBUG_PRINT_FILTER(STORAGECLASSMEMORY), + CM_DEBUG_PRINT_FILTER(FSLIB), + +#undef WTEXT +#undef CM_DEBUG_PRINT_FILTER + // // END OF Debug Filter Masks // diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 08dcff4d29b..03fd82447c4 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -138,6 +138,9 @@ STRING KdbPromptString = RTL_CONSTANT_STRING("kdb:> "); // // Debug Filter Component Table // +#define KD_DEBUG_PRINT_FILTER(Name) \ + { #Name, DPFLTR_##Name##_ID } + static struct { PCSTR Name; @@ -148,175 +151,176 @@ ComponentTable[] = // // Default components // - { "WIN2000", MAXULONG }, - { "DEFAULT", DPFLTR_DEFAULT_ID }, + { "WIN2000", MAXULONG }, + KD_DEBUG_PRINT_FILTER(DEFAULT), // // Standard components // - { "SYSTEM", DPFLTR_SYSTEM_ID }, - { "SMSS", DPFLTR_SMSS_ID }, - { "SETUP", DPFLTR_SETUP_ID }, - { "NTFS", DPFLTR_NTFS_ID }, - { "FSTUB", DPFLTR_FSTUB_ID }, - { "CRASHDUMP", DPFLTR_CRASHDUMP_ID }, - { "CDAUDIO", DPFLTR_CDAUDIO_ID }, - { "CDROM", DPFLTR_CDROM_ID }, - { "CLASSPNP", DPFLTR_CLASSPNP_ID }, - { "DISK", DPFLTR_DISK_ID }, - { "REDBOOK", DPFLTR_REDBOOK_ID }, - { "STORPROP", DPFLTR_STORPROP_ID }, - { "SCSIPORT", DPFLTR_SCSIPORT_ID }, - { "SCSIMINIPORT", DPFLTR_SCSIMINIPORT_ID }, - { "CONFIG", DPFLTR_CONFIG_ID }, - { "I8042PRT", DPFLTR_I8042PRT_ID }, - { "SERMOUSE", DPFLTR_SERMOUSE_ID }, - { "LSERMOUS", DPFLTR_LSERMOUS_ID }, - { "KBDHID", DPFLTR_KBDHID_ID }, - { "MOUHID", DPFLTR_MOUHID_ID }, - { "KBDCLASS", DPFLTR_KBDCLASS_ID }, - { "MOUCLASS", DPFLTR_MOUCLASS_ID }, - { "TWOTRACK", DPFLTR_TWOTRACK_ID }, - { "WMILIB", DPFLTR_WMILIB_ID }, - { "ACPI", DPFLTR_ACPI_ID }, - { "AMLI", DPFLTR_AMLI_ID }, - { "HALIA64", DPFLTR_HALIA64_ID }, - { "VIDEO", DPFLTR_VIDEO_ID }, - { "SVCHOST", DPFLTR_SVCHOST_ID }, - { "VIDEOPRT", DPFLTR_VIDEOPRT_ID }, - { "TCPIP", DPFLTR_TCPIP_ID }, - { "DMSYNTH", DPFLTR_DMSYNTH_ID }, - { "NTOSPNP", DPFLTR_NTOSPNP_ID }, - { "FASTFAT", DPFLTR_FASTFAT_ID }, - { "SAMSS", DPFLTR_SAMSS_ID }, - { "PNPMGR", DPFLTR_PNPMGR_ID }, - { "NETAPI", DPFLTR_NETAPI_ID }, - { "SCSERVER", DPFLTR_SCSERVER_ID }, - { "SCCLIENT", DPFLTR_SCCLIENT_ID }, - { "SERIAL", DPFLTR_SERIAL_ID }, - { "SERENUM", DPFLTR_SERENUM_ID }, - { "UHCD", DPFLTR_UHCD_ID }, - { "RPCPROXY", DPFLTR_RPCPROXY_ID }, - { "AUTOCHK", DPFLTR_AUTOCHK_ID }, - { "DCOMSS", DPFLTR_DCOMSS_ID }, - { "UNIMODEM", DPFLTR_UNIMODEM_ID }, - { "SIS", DPFLTR_SIS_ID }, - { "FLTMGR", DPFLTR_FLTMGR_ID }, - { "WMICORE", DPFLTR_WMICORE_ID }, - { "BURNENG", DPFLTR_BURNENG_ID }, - { "IMAPI", DPFLTR_IMAPI_ID }, - { "SXS", DPFLTR_SXS_ID }, - { "FUSION", DPFLTR_FUSION_ID }, - { "IDLETASK", DPFLTR_IDLETASK_ID }, - { "SOFTPCI", DPFLTR_SOFTPCI_ID }, - { "TAPE", DPFLTR_TAPE_ID }, - { "MCHGR", DPFLTR_MCHGR_ID }, - { "IDEP", DPFLTR_IDEP_ID }, - { "PCIIDE", DPFLTR_PCIIDE_ID }, - { "FLOPPY", DPFLTR_FLOPPY_ID }, - { "FDC", DPFLTR_FDC_ID }, - { "TERMSRV", DPFLTR_TERMSRV_ID }, - { "W32TIME", DPFLTR_W32TIME_ID }, - { "PREFETCHER", DPFLTR_PREFETCHER_ID }, - { "RSFILTER", DPFLTR_RSFILTER_ID }, - { "FCPORT", DPFLTR_FCPORT_ID }, - { "PCI", DPFLTR_PCI_ID }, - { "DMIO", DPFLTR_DMIO_ID }, - { "DMCONFIG", DPFLTR_DMCONFIG_ID }, - { "DMADMIN", DPFLTR_DMADMIN_ID }, - { "WSOCKTRANSPORT", DPFLTR_WSOCKTRANSPORT_ID }, - { "VSS", DPFLTR_VSS_ID }, - { "PNPMEM", DPFLTR_PNPMEM_ID }, - { "PROCESSOR", DPFLTR_PROCESSOR_ID }, - { "DMSERVER", DPFLTR_DMSERVER_ID }, - { "SR", DPFLTR_SR_ID }, - { "INFINIBAND", DPFLTR_INFINIBAND_ID }, - { "IHVDRIVER", DPFLTR_IHVDRIVER_ID }, - { "IHVVIDEO", DPFLTR_IHVVIDEO_ID }, - { "IHVAUDIO", DPFLTR_IHVAUDIO_ID }, - { "IHVNETWORK", DPFLTR_IHVNETWORK_ID }, - { "IHVSTREAMING", DPFLTR_IHVSTREAMING_ID }, - { "IHVBUS", DPFLTR_IHVBUS_ID }, - { "HPS", DPFLTR_HPS_ID }, - { "RTLTHREADPOOL", DPFLTR_RTLTHREADPOOL_ID }, - { "LDR", DPFLTR_LDR_ID }, - { "TCPIP6", DPFLTR_TCPIP6_ID }, - { "ISAPNP", DPFLTR_ISAPNP_ID }, - { "SHPC", DPFLTR_SHPC_ID }, - { "STORPORT", DPFLTR_STORPORT_ID }, - { "STORMINIPORT", DPFLTR_STORMINIPORT_ID }, - { "PRINTSPOOLER", DPFLTR_PRINTSPOOLER_ID }, - { "VSSDYNDISK", DPFLTR_VSSDYNDISK_ID }, - { "VERIFIER", DPFLTR_VERIFIER_ID }, - { "VDS", DPFLTR_VDS_ID }, - { "VDSBAS", DPFLTR_VDSBAS_ID }, - { "VDSDYN", DPFLTR_VDSDYN_ID }, // Specified in Vista+ - { "VDSDYNDR", DPFLTR_VDSDYNDR_ID }, - { "VDSLDR", DPFLTR_VDSLDR_ID }, // Specified in Vista+ - { "VDSUTIL", DPFLTR_VDSUTIL_ID }, - { "DFRGIFC", DPFLTR_DFRGIFC_ID }, - { "MM", DPFLTR_MM_ID }, - { "DFSC", DPFLTR_DFSC_ID }, - { "WOW64", DPFLTR_WOW64_ID }, + KD_DEBUG_PRINT_FILTER(SYSTEM), + KD_DEBUG_PRINT_FILTER(SMSS), + KD_DEBUG_PRINT_FILTER(SETUP), + KD_DEBUG_PRINT_FILTER(NTFS), + KD_DEBUG_PRINT_FILTER(FSTUB), + KD_DEBUG_PRINT_FILTER(CRASHDUMP), + KD_DEBUG_PRINT_FILTER(CDAUDIO), + KD_DEBUG_PRINT_FILTER(CDROM), + KD_DEBUG_PRINT_FILTER(CLASSPNP), + KD_DEBUG_PRINT_FILTER(DISK), + KD_DEBUG_PRINT_FILTER(REDBOOK), + KD_DEBUG_PRINT_FILTER(STORPROP), + KD_DEBUG_PRINT_FILTER(SCSIPORT), + KD_DEBUG_PRINT_FILTER(SCSIMINIPORT), + KD_DEBUG_PRINT_FILTER(CONFIG), + KD_DEBUG_PRINT_FILTER(I8042PRT), + KD_DEBUG_PRINT_FILTER(SERMOUSE), + KD_DEBUG_PRINT_FILTER(LSERMOUS), + KD_DEBUG_PRINT_FILTER(KBDHID), + KD_DEBUG_PRINT_FILTER(MOUHID), + KD_DEBUG_PRINT_FILTER(KBDCLASS), + KD_DEBUG_PRINT_FILTER(MOUCLASS), + KD_DEBUG_PRINT_FILTER(TWOTRACK), + KD_DEBUG_PRINT_FILTER(WMILIB), + KD_DEBUG_PRINT_FILTER(ACPI), + KD_DEBUG_PRINT_FILTER(AMLI), + KD_DEBUG_PRINT_FILTER(HALIA64), + KD_DEBUG_PRINT_FILTER(VIDEO), + KD_DEBUG_PRINT_FILTER(SVCHOST), + KD_DEBUG_PRINT_FILTER(VIDEOPRT), + KD_DEBUG_PRINT_FILTER(TCPIP), + KD_DEBUG_PRINT_FILTER(DMSYNTH), + KD_DEBUG_PRINT_FILTER(NTOSPNP), + KD_DEBUG_PRINT_FILTER(FASTFAT), + KD_DEBUG_PRINT_FILTER(SAMSS), + KD_DEBUG_PRINT_FILTER(PNPMGR), + KD_DEBUG_PRINT_FILTER(NETAPI), + KD_DEBUG_PRINT_FILTER(SCSERVER), + KD_DEBUG_PRINT_FILTER(SCCLIENT), + KD_DEBUG_PRINT_FILTER(SERIAL), + KD_DEBUG_PRINT_FILTER(SERENUM), + KD_DEBUG_PRINT_FILTER(UHCD), + KD_DEBUG_PRINT_FILTER(RPCPROXY), + KD_DEBUG_PRINT_FILTER(AUTOCHK), + KD_DEBUG_PRINT_FILTER(DCOMSS), + KD_DEBUG_PRINT_FILTER(UNIMODEM), + KD_DEBUG_PRINT_FILTER(SIS), + KD_DEBUG_PRINT_FILTER(FLTMGR), + KD_DEBUG_PRINT_FILTER(WMICORE), + KD_DEBUG_PRINT_FILTER(BURNENG), + KD_DEBUG_PRINT_FILTER(IMAPI), + KD_DEBUG_PRINT_FILTER(SXS), + KD_DEBUG_PRINT_FILTER(FUSION), + KD_DEBUG_PRINT_FILTER(IDLETASK), + KD_DEBUG_PRINT_FILTER(SOFTPCI), + KD_DEBUG_PRINT_FILTER(TAPE), + KD_DEBUG_PRINT_FILTER(MCHGR), + KD_DEBUG_PRINT_FILTER(IDEP), + KD_DEBUG_PRINT_FILTER(PCIIDE), + KD_DEBUG_PRINT_FILTER(FLOPPY), + KD_DEBUG_PRINT_FILTER(FDC), + KD_DEBUG_PRINT_FILTER(TERMSRV), + KD_DEBUG_PRINT_FILTER(W32TIME), + KD_DEBUG_PRINT_FILTER(PREFETCHER), + KD_DEBUG_PRINT_FILTER(RSFILTER), + KD_DEBUG_PRINT_FILTER(FCPORT), + KD_DEBUG_PRINT_FILTER(PCI), + KD_DEBUG_PRINT_FILTER(DMIO), + KD_DEBUG_PRINT_FILTER(DMCONFIG), + KD_DEBUG_PRINT_FILTER(DMADMIN), + KD_DEBUG_PRINT_FILTER(WSOCKTRANSPORT), + KD_DEBUG_PRINT_FILTER(VSS), + KD_DEBUG_PRINT_FILTER(PNPMEM), + KD_DEBUG_PRINT_FILTER(PROCESSOR), + KD_DEBUG_PRINT_FILTER(DMSERVER), + KD_DEBUG_PRINT_FILTER(SR), + KD_DEBUG_PRINT_FILTER(INFINIBAND), + KD_DEBUG_PRINT_FILTER(IHVDRIVER), + KD_DEBUG_PRINT_FILTER(IHVVIDEO), + KD_DEBUG_PRINT_FILTER(IHVAUDIO), + KD_DEBUG_PRINT_FILTER(IHVNETWORK), + KD_DEBUG_PRINT_FILTER(IHVSTREAMING), + KD_DEBUG_PRINT_FILTER(IHVBUS), + KD_DEBUG_PRINT_FILTER(HPS), + KD_DEBUG_PRINT_FILTER(RTLTHREADPOOL), + KD_DEBUG_PRINT_FILTER(LDR), + KD_DEBUG_PRINT_FILTER(TCPIP6), + KD_DEBUG_PRINT_FILTER(ISAPNP), + KD_DEBUG_PRINT_FILTER(SHPC), + KD_DEBUG_PRINT_FILTER(STORPORT), + KD_DEBUG_PRINT_FILTER(STORMINIPORT), + KD_DEBUG_PRINT_FILTER(PRINTSPOOLER), + KD_DEBUG_PRINT_FILTER(VSSDYNDISK), + KD_DEBUG_PRINT_FILTER(VERIFIER), + KD_DEBUG_PRINT_FILTER(VDS), + KD_DEBUG_PRINT_FILTER(VDSBAS), + KD_DEBUG_PRINT_FILTER(VDSDYN), // Specified in Vista+ + KD_DEBUG_PRINT_FILTER(VDSDYNDR), + KD_DEBUG_PRINT_FILTER(VDSLDR), // Specified in Vista+ + KD_DEBUG_PRINT_FILTER(VDSUTIL), + KD_DEBUG_PRINT_FILTER(DFRGIFC), + KD_DEBUG_PRINT_FILTER(MM), + KD_DEBUG_PRINT_FILTER(DFSC), + KD_DEBUG_PRINT_FILTER(WOW64), // // Components specified in Vista+, some of which we also use in ReactOS // - { "ALPC", DPFLTR_ALPC_ID }, - { "WDI", DPFLTR_WDI_ID }, - { "PERFLIB", DPFLTR_PERFLIB_ID }, - { "KTM", DPFLTR_KTM_ID }, - { "IOSTRESS", DPFLTR_IOSTRESS_ID }, - { "HEAP", DPFLTR_HEAP_ID }, - { "WHEA", DPFLTR_WHEA_ID }, - { "USERGDI", DPFLTR_USERGDI_ID }, - { "MMCSS", DPFLTR_MMCSS_ID }, - { "TPM", DPFLTR_TPM_ID }, - { "THREADORDER", DPFLTR_THREADORDER_ID }, - { "ENVIRON", DPFLTR_ENVIRON_ID }, - { "EMS", DPFLTR_EMS_ID }, - { "WDT", DPFLTR_WDT_ID }, - { "FVEVOL", DPFLTR_FVEVOL_ID }, - { "NDIS", DPFLTR_NDIS_ID }, - { "NVCTRACE", DPFLTR_NVCTRACE_ID }, - { "LUAFV", DPFLTR_LUAFV_ID }, - { "APPCOMPAT", DPFLTR_APPCOMPAT_ID }, - { "USBSTOR", DPFLTR_USBSTOR_ID }, - { "SBP2PORT", DPFLTR_SBP2PORT_ID }, - { "COVERAGE", DPFLTR_COVERAGE_ID }, - { "CACHEMGR", DPFLTR_CACHEMGR_ID }, - { "MOUNTMGR", DPFLTR_MOUNTMGR_ID }, - { "CFR", DPFLTR_CFR_ID }, - { "TXF", DPFLTR_TXF_ID }, - { "KSECDD", DPFLTR_KSECDD_ID }, - { "FLTREGRESS", DPFLTR_FLTREGRESS_ID }, - { "MPIO", DPFLTR_MPIO_ID }, - { "MSDSM", DPFLTR_MSDSM_ID }, - { "UDFS", DPFLTR_UDFS_ID }, - { "PSHED", DPFLTR_PSHED_ID }, - { "STORVSP", DPFLTR_STORVSP_ID }, - { "LSASS", DPFLTR_LSASS_ID }, - { "SSPICLI", DPFLTR_SSPICLI_ID }, - { "CNG", DPFLTR_CNG_ID }, - { "EXFAT", DPFLTR_EXFAT_ID }, - { "FILETRACE", DPFLTR_FILETRACE_ID }, - { "XSAVE", DPFLTR_XSAVE_ID }, - { "SE", DPFLTR_SE_ID }, - { "DRIVEEXTENDER", DPFLTR_DRIVEEXTENDER_ID }, + KD_DEBUG_PRINT_FILTER(ALPC), + KD_DEBUG_PRINT_FILTER(WDI), + KD_DEBUG_PRINT_FILTER(PERFLIB), + KD_DEBUG_PRINT_FILTER(KTM), + KD_DEBUG_PRINT_FILTER(IOSTRESS), + KD_DEBUG_PRINT_FILTER(HEAP), + KD_DEBUG_PRINT_FILTER(WHEA), + KD_DEBUG_PRINT_FILTER(USERGDI), + KD_DEBUG_PRINT_FILTER(MMCSS), + KD_DEBUG_PRINT_FILTER(TPM), + KD_DEBUG_PRINT_FILTER(THREADORDER), + KD_DEBUG_PRINT_FILTER(ENVIRON), + KD_DEBUG_PRINT_FILTER(EMS), + KD_DEBUG_PRINT_FILTER(WDT), + KD_DEBUG_PRINT_FILTER(FVEVOL), + KD_DEBUG_PRINT_FILTER(NDIS), + KD_DEBUG_PRINT_FILTER(NVCTRACE), + KD_DEBUG_PRINT_FILTER(LUAFV), + KD_DEBUG_PRINT_FILTER(APPCOMPAT), + KD_DEBUG_PRINT_FILTER(USBSTOR), + KD_DEBUG_PRINT_FILTER(SBP2PORT), + KD_DEBUG_PRINT_FILTER(COVERAGE), + KD_DEBUG_PRINT_FILTER(CACHEMGR), + KD_DEBUG_PRINT_FILTER(MOUNTMGR), + KD_DEBUG_PRINT_FILTER(CFR), + KD_DEBUG_PRINT_FILTER(TXF), + KD_DEBUG_PRINT_FILTER(KSECDD), + KD_DEBUG_PRINT_FILTER(FLTREGRESS), + KD_DEBUG_PRINT_FILTER(MPIO), + KD_DEBUG_PRINT_FILTER(MSDSM), + KD_DEBUG_PRINT_FILTER(UDFS), + KD_DEBUG_PRINT_FILTER(PSHED), + KD_DEBUG_PRINT_FILTER(STORVSP), + KD_DEBUG_PRINT_FILTER(LSASS), + KD_DEBUG_PRINT_FILTER(SSPICLI), + KD_DEBUG_PRINT_FILTER(CNG), + KD_DEBUG_PRINT_FILTER(EXFAT), + KD_DEBUG_PRINT_FILTER(FILETRACE), + KD_DEBUG_PRINT_FILTER(XSAVE), + KD_DEBUG_PRINT_FILTER(SE), + KD_DEBUG_PRINT_FILTER(DRIVEEXTENDER), // // Components specified in Windows 8 // - { "POWER", DPFLTR_POWER_ID }, - { "CRASHDUMPXHCI", DPFLTR_CRASHDUMPXHCI_ID }, - { "GPIO", DPFLTR_GPIO_ID }, - { "REFS", DPFLTR_REFS_ID }, - { "WER", DPFLTR_WER_ID }, + KD_DEBUG_PRINT_FILTER(POWER), + KD_DEBUG_PRINT_FILTER(CRASHDUMPXHCI), + KD_DEBUG_PRINT_FILTER(GPIO), + KD_DEBUG_PRINT_FILTER(REFS), + KD_DEBUG_PRINT_FILTER(WER), // // Components specified in Windows 10 // - { "CAPIMG", DPFLTR_CAPIMG_ID }, - { "VPCI", DPFLTR_VPCI_ID }, - { "STORAGECLASSMEMORY", DPFLTR_STORAGECLASSMEMORY_ID }, - { "FSLIB", DPFLTR_FSLIB_ID }, + KD_DEBUG_PRINT_FILTER(CAPIMG), + KD_DEBUG_PRINT_FILTER(VPCI), + KD_DEBUG_PRINT_FILTER(STORAGECLASSMEMORY), + KD_DEBUG_PRINT_FILTER(FSLIB), }; +#undef KD_DEBUG_PRINT_FILTER // // Command Table
