Ros-diffs July 2020

ros-diffs@reactos.org

14 participants
55 discussions

[reactos] 01/01: [EXPLORER] Fix auto startup behavior

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fe704b0f0bdd8b2351d5… commit 6fe704b0f0bdd8b2351d5ca94f6502232f067024 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jul 21 17:04:17 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jul 21 17:28:48 2020 +0300 [EXPLORER] Fix auto startup behavior Command line should be expanded only for REG_EXPAND_SZ values. CORE-17168 --- base/shell/explorer/startup.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/base/shell/explorer/startup.cpp b/base/shell/explorer/startup.cpp index f4f064e266a..5153deb9f13 100644 --- a/base/shell/explorer/startup.cpp +++ b/base/shell/explorer/startup.cpp @@ -62,9 +62,6 @@ static int runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized) STARTUPINFOW si; PROCESS_INFORMATION info; DWORD exit_code = 0; - WCHAR szCmdLineExp[MAX_PATH+1] = L"\0"; - - ExpandEnvironmentStringsW(cmdline, szCmdLineExp, _countof(szCmdLineExp)); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); @@ -75,7 +72,7 @@ static int runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized) } memset(&info, 0, sizeof(info)); - if (!CreateProcessW(NULL, szCmdLineExp, NULL, NULL, FALSE, 0, NULL, dir, &si, &info)) + if (!CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, dir, &si, &info)) { TRACE("Failed to run command (%lu)\n", GetLastError()); @@ -260,13 +257,21 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, TRACE("Couldn't delete value - %lu, %ld. Running command anyways.\n", i, res); } - if (type != REG_SZ) + if (type != REG_SZ && type != REG_EXPAND_SZ) { TRACE("Incorrect type of value #%lu (%lu)\n", i, type); continue; } + if (type == REG_EXPAND_SZ) + { + WCHAR szCmdLineExp[MAX_PATH + 1] = L"\0"; + + if (ExpandEnvironmentStringsW(szCmdLine, szCmdLineExp, _countof(szCmdLineExp))) + StringCbCopyW(szCmdLine, cbMaxCmdLine, szCmdLineExp); + } + res = runCmd(szCmdLine, NULL, bSynchronous, FALSE); if (res == INVALID_RUNCMD_RETURN) {

4 years, 6 months

[reactos] 01/01: [REACTOS] Fix GetTokenInformation() usage (#2997)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98bbe8358caceeacfb069… commit 98bbe8358caceeacfb069d8f6daef51b5476e93b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Jul 21 14:39:11 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 21 15:39:11 2020 +0300 [REACTOS] Fix GetTokenInformation() usage (#2997) The first call to GetTokenInformation is used to determine the size of a TokenInformation buffer. It should fail and return ERROR_INSUFFICIENT_BUFFER --- base/services/rpcss/setup.c | 2 +- base/services/svchost/security.cxx | 4 ++-- dll/cpl/sysdm/userprofile.c | 6 ++++-- dll/win32/netid/netid.c | 11 ++++------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/base/services/rpcss/setup.c b/base/services/rpcss/setup.c index e51831efc41..e94a05c9264 100644 --- a/base/services/rpcss/setup.c +++ b/base/services/rpcss/setup.c @@ -65,7 +65,7 @@ RunningAsSYSTEM(VOID) return FALSE; /* Retrieve token's information */ - if (!GetTokenInformation(hToken, TokenUser, NULL, 0, &cbTokenBuffer) && + if (GetTokenInformation(hToken, TokenUser, NULL, 0, &cbTokenBuffer) || GetLastError() != ERROR_INSUFFICIENT_BUFFER) { goto Quit; diff --git a/base/services/svchost/security.cxx b/base/services/svchost/security.cxx index 0dfb9adf222..451d6c2929a 100644 --- a/base/services/svchost/security.cxx +++ b/base/services/svchost/security.cxx @@ -53,14 +53,14 @@ DwInitializeSdFromThreadToken ( } /* Get the size of the token's user */ - if ((GetTokenInformation(hToken, TokenUser, NULL, 0, &dwUserLength) == FALSE) || + if ((GetTokenInformation(hToken, TokenUser, NULL, 0, &dwUserLength) != FALSE) || (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) { return GetLastError(); } /* Get the size of the token's primary group */ - if ((GetTokenInformation(hToken, TokenPrimaryGroup, NULL, 0, &dwGroupLength) == FALSE) || + if ((GetTokenInformation(hToken, TokenPrimaryGroup, NULL, 0, &dwGroupLength) != FALSE) || (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) { return GetLastError(); diff --git a/dll/cpl/sysdm/userprofile.c b/dll/cpl/sysdm/userprofile.c index 58e35f964bd..79f76b76225 100644 --- a/dll/cpl/sysdm/userprofile.c +++ b/dll/cpl/sysdm/userprofile.c @@ -695,9 +695,11 @@ AddUserProfiles( if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) return; - GetTokenInformation(hToken, TokenUser, NULL, 0, &dwSize); - if (dwSize == 0) + if (GetTokenInformation(hToken, TokenUser, NULL, 0, &dwSize) || + GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { goto done; + } pTokenUser = HeapAlloc(GetProcessHeap(), 0, dwSize); if (pTokenUser == NULL) diff --git a/dll/win32/netid/netid.c b/dll/win32/netid/netid.c index 2e2a1294525..ce3dfb6f417 100644 --- a/dll/win32/netid/netid.c +++ b/dll/win32/netid/netid.c @@ -179,14 +179,11 @@ IsUserAdmin(VOID) &hToken)) goto done; - dwSize = 0; - GetTokenInformation(hToken, - TokenGroups, - NULL, - 0, - &dwSize); - if (dwSize == 0) + if (GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize) || + GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { goto done; + } pGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); if (pGroups == NULL)

4 years, 6 months

[reactos] 01/01: [CLASS2]: Set DiskSize member of deviceExtension->DiskGeometry in ScsiClassReadDriveCapacity(). Consolidate code and comment for setting media capacity in bytes. CORE-17166

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b338fb7beb36cd99c4cf8… commit b338fb7beb36cd99c4cf8a54303827be57d1e427 Author: Trevor Thompson <codertrevor(a)gmail.com> AuthorDate: Mon Jul 20 14:55:24 2020 -0400 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Jul 21 01:21:16 2020 +0300 [CLASS2]: Set DiskSize member of deviceExtension->DiskGeometry in ScsiClassReadDriveCapacity(). Consolidate code and comment for setting media capacity in bytes. CORE-17166 --- drivers/storage/class/class2/class2.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/storage/class/class2/class2.c b/drivers/storage/class/class2/class2.c index 5639f072949..f3ca8b5045f 100644 --- a/drivers/storage/class/class2/class2.c +++ b/drivers/storage/class/class2/class2.c @@ -828,19 +828,19 @@ Retry: lastSector + 1)); // - // Calculate media capacity in bytes. + // Calculate number of cylinders. // - deviceExtension->PartitionLength.QuadPart = (LONGLONG)(lastSector + 1); + deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(DEFAULT_SECTORS_PER_TRACK * DEFAULT_TRACKS_PER_CYLINDER)); // - // Calculate number of cylinders. + // Calculate media capacity in bytes. // - deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(DEFAULT_SECTORS_PER_TRACK * DEFAULT_TRACKS_PER_CYLINDER)); - + deviceExtension->PartitionLength.QuadPart = (LONGLONG)(lastSector + 1); deviceExtension->PartitionLength.QuadPart = (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); + deviceExtension->DiskGeometry->DiskSize.QuadPart = deviceExtension->PartitionLength.QuadPart; if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { @@ -903,6 +903,7 @@ Retry: deviceExtension->DiskGeometry->Geometry.BytesPerSector = 512; deviceExtension->SectorShift = 9; deviceExtension->PartitionLength.QuadPart = (LONGLONG) 0; + deviceExtension->DiskGeometry->DiskSize.QuadPart = (LONGLONG) 0; if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) {

4 years, 6 months

[reactos] 01/01: [NTOS:KD64] Fix 'MAX_KD_COMPONENT_TABLE_ENTRIES' value (#2992)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3669fdef7766edc649bc… commit a3669fdef7766edc649bc92ddd02072e619965dc Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 18 19:42:30 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 18 19:42:30 2020 +0200 [NTOS:KD64] Fix 'MAX_KD_COMPONENT_TABLE_ENTRIES' value (#2992) Addendum to ceb58c8. --- ntoskrnl/include/internal/kd64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/kd64.h b/ntoskrnl/include/internal/kd64.h index 76742c8f0eb..4802c9c9f60 100644 --- a/ntoskrnl/include/internal/kd64.h +++ b/ntoskrnl/include/internal/kd64.h @@ -561,7 +561,7 @@ extern ULONG TraceDataBufferPosition; // // Debug Filter Component Table // -#define MAX_KD_COMPONENT_TABLE_ENTRIES (DPFLTR_ENDOFTABLE_ID + 2) +#define MAX_KD_COMPONENT_TABLE_ENTRIES (DPFLTR_ENDOFTABLE_ID + 1) extern ULONG KdComponentTableSize; extern PULONG KdComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES];

4 years, 6 months

[reactos] 01/01: [NTOS:KDBG] Adapt the formatting of the debug filter table display output to suit longer component names.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46416a62380d74ce820eb… commit 46416a62380d74ce820eb6d2aacfac6e4e7ed27c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 18 18:16:21 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jul 18 18:16:21 2020 +0200 [NTOS:KDBG] Adapt the formatting of the debug filter table display output to suit longer component names. --- ntoskrnl/kdbg/kdb_cli.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 03fd82447c4..53d874c3e2f 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -706,11 +706,11 @@ KdbpCmdFilter( "- The 'DEFAULT' debug filter component is used for DbgPrint() messages with\n" " an unknown Component ID.\n\n"); KdbpPrint("The list of debug filter components currently available on your system is:\n\n"); - KdbpPrint(" Component Name Component ID\n" - "================ ==============\n"); + KdbpPrint(" Component Name Component ID\n" + " ================== ================\n"); for (i = 0; i < RTL_NUMBER_OF(ComponentTable); i++) { - KdbpPrint("%16s 0x%08lx\n", ComponentTable[i].Name, ComponentTable[i].Id); + KdbpPrint("%20s 0x%08lx\n", ComponentTable[i].Name, ComponentTable[i].Id); } return TRUE; }

4 years, 6 months

[reactos] 03/03: [NTOS][KDBG] Use macros to simplify initializing the debug filter tables.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d3dac324e3d34c6315eb… commit 7d3dac324e3d34c6315eb1bce69d328540081956 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 18 17:43:29 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> 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

4 years, 6 months

[reactos] 02/03: [NTOS][SDK] Add new kernel debug filters that have been added in Win8 and Win10; they can be useful for us.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ceb58c821a0b86f5de51b… commit ceb58c821a0b86f5de51b577e314162708669d17 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 18 16:25:45 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jul 18 17:45:40 2020 +0200 [NTOS][SDK] Add new kernel debug filters that have been added in Win8 and Win10; they can be useful for us. --- ntoskrnl/config/cmdata.c | 69 ++++++++++++++++++++++++++++++++++++++++ ntoskrnl/include/internal/kd64.h | 17 +++++++++- ntoskrnl/kd64/kddata.c | 35 ++++++++++++++++++-- ntoskrnl/kdbg/kdb_cli.c | 15 +++++++++ sdk/include/psdk/dpfilter.h | 9 ++++++ 5 files changed, 141 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/config/cmdata.c b/ntoskrnl/config/cmdata.c index 7b34fc936cb..ca9d9175a43 100644 --- a/ntoskrnl/config/cmdata.c +++ b/ntoskrnl/config/cmdata.c @@ -1751,6 +1751,75 @@ INIT_SECTION CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = NULL }, // +// 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 + }, +// +// 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 + }, +// // END OF Debug Filter Masks // diff --git a/ntoskrnl/include/internal/kd64.h b/ntoskrnl/include/internal/kd64.h index bff0a3a872d..76742c8f0eb 100644 --- a/ntoskrnl/include/internal/kd64.h +++ b/ntoskrnl/include/internal/kd64.h @@ -561,7 +561,7 @@ extern ULONG TraceDataBufferPosition; // // Debug Filter Component Table // -#define MAX_KD_COMPONENT_TABLE_ENTRIES 147 +#define MAX_KD_COMPONENT_TABLE_ENTRIES (DPFLTR_ENDOFTABLE_ID + 2) extern ULONG KdComponentTableSize; extern PULONG KdComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES]; @@ -718,3 +718,18 @@ extern ULONG Kd_FILETRACE_Mask; extern ULONG Kd_XSAVE_Mask; extern ULONG Kd_SE_Mask; extern ULONG Kd_DRIVEEXTENDER_Mask; +// +// Components specified in Windows 8 +// +extern ULONG Kd_POWER_Mask; +extern ULONG Kd_CRASHDUMPXHCI_Mask; +extern ULONG Kd_GPIO_Mask; +extern ULONG Kd_REFS_Mask; +extern ULONG Kd_WER_Mask; +// +// Components specified in Windows 10 +// +extern ULONG Kd_CAPIMG_Mask; +extern ULONG Kd_VPCI_Mask; +extern ULONG Kd_STORAGECLASSMEMORY_Mask; +extern ULONG Kd_FSLIB_Mask; diff --git a/ntoskrnl/kd64/kddata.c b/ntoskrnl/kd64/kddata.c index 23887d165cf..dd8cef7a6aa 100644 --- a/ntoskrnl/kd64/kddata.c +++ b/ntoskrnl/kd64/kddata.c @@ -294,6 +294,21 @@ ULONG Kd_FILETRACE_Mask; ULONG Kd_XSAVE_Mask; ULONG Kd_SE_Mask; ULONG Kd_DRIVEEXTENDER_Mask; +// +// Components specified in Windows 8 +// +ULONG Kd_POWER_Mask; +ULONG Kd_CRASHDUMPXHCI_Mask; +ULONG Kd_GPIO_Mask; +ULONG Kd_REFS_Mask; +ULONG Kd_WER_Mask; +// +// Components specified in Windows 10 +// +ULONG Kd_CAPIMG_Mask; +ULONG Kd_VPCI_Mask; +ULONG Kd_STORAGECLASSMEMORY_Mask; +ULONG Kd_FSLIB_Mask; // End Mask ULONG Kd_ENDOFTABLE_Mask; @@ -407,7 +422,6 @@ PULONG KdComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES] = &Kd_MM_Mask, &Kd_DFSC_Mask, &Kd_WOW64_Mask, - // // Components specified in Vista+, some of which we also use in ReactOS // @@ -452,11 +466,26 @@ PULONG KdComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES] = &Kd_XSAVE_Mask, &Kd_SE_Mask, &Kd_DRIVEEXTENDER_Mask, - // End Mask +// +// Components specified in Windows 8 +// + &Kd_POWER_Mask, + &Kd_CRASHDUMPXHCI_Mask, + &Kd_GPIO_Mask, + &Kd_REFS_Mask, + &Kd_WER_Mask, +// +// Components specified in Windows 10 +// + &Kd_CAPIMG_Mask, + &Kd_VPCI_Mask, + &Kd_STORAGECLASSMEMORY_Mask, + &Kd_FSLIB_Mask, +// End Mask &Kd_ENDOFTABLE_Mask, }; -ULONG KdComponentTableSize = sizeof(KdComponentTable) / sizeof(KdComponentTable[0]); +ULONG KdComponentTableSize = RTL_NUMBER_OF(KdComponentTable); // // Debugger Data diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 5aa5ec99611..08dcff4d29b 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -301,6 +301,21 @@ ComponentTable[] = { "XSAVE", DPFLTR_XSAVE_ID }, { "SE", DPFLTR_SE_ID }, { "DRIVEEXTENDER", DPFLTR_DRIVEEXTENDER_ID }, +// +// 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 }, +// +// Components specified in Windows 10 +// + { "CAPIMG", DPFLTR_CAPIMG_ID }, + { "VPCI", DPFLTR_VPCI_ID }, + { "STORAGECLASSMEMORY", DPFLTR_STORAGECLASSMEMORY_ID }, + { "FSLIB", DPFLTR_FSLIB_ID }, }; // diff --git a/sdk/include/psdk/dpfilter.h b/sdk/include/psdk/dpfilter.h index e3965100335..5766f2ad62e 100644 --- a/sdk/include/psdk/dpfilter.h +++ b/sdk/include/psdk/dpfilter.h @@ -171,5 +171,14 @@ typedef enum _DPFLTR_TYPE { DPFLTR_XSAVE_ID = 143, DPFLTR_SE_ID = 144, DPFLTR_DRIVEEXTENDER_ID = 145, + DPFLTR_POWER_ID = 146, + DPFLTR_CRASHDUMPXHCI_ID = 147, + DPFLTR_GPIO_ID = 148, + DPFLTR_REFS_ID = 149, + DPFLTR_WER_ID = 150, + DPFLTR_CAPIMG_ID = 151, + DPFLTR_VPCI_ID = 152, + DPFLTR_STORAGECLASSMEMORY_ID = 153, + DPFLTR_FSLIB_ID = 154, DPFLTR_ENDOFTABLE_ID } DPFLTR_TYPE;

4 years, 6 months

[reactos] 01/03: [NTOS:KDBG] Minor code style fix.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2eaf905575c02f40b90c… commit b2eaf905575c02f40b90cdc221e67a5df70f441a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 18 17:39:42 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jul 18 17:45:40 2020 +0200 [NTOS:KDBG] Minor code style fix. --- ntoskrnl/kdbg/kdb_cli.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index daeccb9f2e8..5aa5ec99611 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -641,7 +641,7 @@ KdbpGetComponentId( { ULONG i; - for (i = 0; i < sizeof(ComponentTable) / sizeof(ComponentTable[0]); i++) + for (i = 0; i < RTL_NUMBER_OF(ComponentTable); i++) { if (_stricmp(ComponentName, ComponentTable[i].Name) == 0) { @@ -689,7 +689,7 @@ KdbpCmdFilter( KdbpPrint("The list of debug filter components currently available on your system is:\n\n"); KdbpPrint(" Component Name Component ID\n" "================ ==============\n"); - for (i = 0; i < sizeof(ComponentTable) / sizeof(ComponentTable[0]); i++) + for (i = 0; i < RTL_NUMBER_OF(ComponentTable); i++) { KdbpPrint("%16s 0x%08lx\n", ComponentTable[i].Name, ComponentTable[i].Id); } @@ -704,7 +704,7 @@ KdbpCmdFilter( if (p > opt) { - for (j = 0; j < sizeof(debug_classes) / sizeof(debug_classes[0]); j++) + for (j = 0; j < RTL_NUMBER_OF(debug_classes); j++) { SIZE_T len = strlen(debug_classes[j].Name); if (len != (p - opt)) @@ -718,7 +718,7 @@ KdbpCmdFilter( break; } } - if (j == sizeof(debug_classes) / sizeof(debug_classes[0])) + if (j == RTL_NUMBER_OF(debug_classes)) { Level = strtoul(opt, &pend, 0); if (pend != p) @@ -1702,7 +1702,7 @@ KdbpCmdThread( Eip = 0; if (Ebp) /* FIXME: Should we attach to the process to read Ebp[1]? */ - KdbpSafeReadMemory(&Eip, Ebp + 1, sizeof (Eip)); + KdbpSafeReadMemory(&Eip, Ebp + 1, sizeof(Eip)); } if (Thread->Tcb.State < (DeferredReady + 1)) @@ -2688,7 +2688,7 @@ KdbpPrint( break; Buffer[Length++] = c; - if (Length >= (sizeof (Buffer) - 1)) + if (Length >= (sizeof(Buffer) - 1)) break; } @@ -2723,7 +2723,7 @@ KdbpPrint( break; Buffer[Length++] = c; - if (isalpha(c) || Length >= (sizeof (Buffer) - 1)) + if (isalpha(c) || Length >= (sizeof(Buffer) - 1)) break; } @@ -2762,7 +2762,7 @@ KdbpPrint( /* Get the string */ va_start(ap, Format); - Length = _vsnprintf(Buffer, sizeof (Buffer) - 1, Format, ap); + Length = _vsnprintf(Buffer, sizeof(Buffer) - 1, Format, ap); Buffer[Length] = '\0'; va_end(ap); @@ -3005,7 +3005,7 @@ KdbpPager( break; InBuffer[Length++] = c; - if (Length >= (sizeof (InBuffer) - 1)) + if (Length >= (sizeof(InBuffer) - 1)) break; } @@ -3040,7 +3040,7 @@ KdbpPager( break; InBuffer[Length++] = c; - if (isalpha(c) || Length >= (sizeof (InBuffer) - 1)) + if (isalpha(c) || Length >= (sizeof(InBuffer) - 1)) break; } @@ -3680,7 +3680,7 @@ KdbpCliMainLoop( KdbpPrint(KdbPromptString.Buffer); /* Read a command and remember it */ - KdbpReadCommand(Command, sizeof (Command)); + KdbpReadCommand(Command, sizeof(Command)); KdbpCommandHistoryAppend(Command); /* Reset the number of rows/cols printed and output aborted state */ @@ -3793,7 +3793,7 @@ KdbpCliInit(VOID) } /* Get the size of the file */ - Status = ZwQueryInformationFile(hFile, &Iosb, &FileStdInfo, sizeof (FileStdInfo), + Status = ZwQueryInformationFile(hFile, &Iosb, &FileStdInfo, sizeof(FileStdInfo), FileStandardInformation); if (!NT_SUCCESS(Status)) {

4 years, 6 months

[reactos] 01/01: [CRYPT32] CRYPT_ExportKeyTrans(): Check 'CRYPT_ConstructBitBlob()' return value (#2983)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f8306b37f598c064b2f8… commit 0f8306b37f598c064b2f812da9f73ceb6cd9a5d8 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 18 15:40:05 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 18 15:40:05 2020 +0200 [CRYPT32] CRYPT_ExportKeyTrans(): Check 'CRYPT_ConstructBitBlob()' return value (#2983) Import https://source.winehq.org/git/wine.git/commit/3e8b07309c293d00e6b71164373e5… CORE-8156 Co-authored-by: Victor Martinez Calvo <vmartinez(a)reactos.org> --- dll/win32/crypt32/msg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/crypt32/msg.c b/dll/win32/crypt32/msg.c index 41323908557..9a0e4e899e1 100644 --- a/dll/win32/crypt32/msg.c +++ b/dll/win32/crypt32/msg.c @@ -1574,9 +1574,8 @@ static BOOL WINAPI CRYPT_ExportKeyTrans( ret = CRYPT_ConstructAlgorithmId(&keyInfo.Algorithm, &pKeyTransEncodeInfo->KeyEncryptionAlgorithm); if (ret) - CRYPT_ConstructBitBlob(&keyInfo.PublicKey, + ret = CRYPT_ConstructBitBlob(&keyInfo.PublicKey, &pKeyTransEncodeInfo->RecipientPublicKey); - if (ret) ret = CryptImportPublicKeyInfo(pKeyTransEncodeInfo->hCryptProv, X509_ASN_ENCODING, &keyInfo, &expKey);

4 years, 6 months

[reactos] 01/01: [CMAKE] Remove obsolete 'CMAKE_CXX_COMPILER_VERSION' checks (#2981)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b50965828002f6e916800… commit b50965828002f6e916800ffd06f139db93c685e4 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 18 15:37:29 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 18 15:37:29 2020 +0200 [CMAKE] Remove obsolete 'CMAKE_CXX_COMPILER_VERSION' checks (#2981) Following upgrade to RosBE 2.2.0 support and GCC 8.4. --- base/applications/network/telnet/CMakeLists.txt | 2 +- base/services/tftpd/CMakeLists.txt | 2 +- dll/3rdparty/libxslt/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/network/telnet/CMakeLists.txt b/base/applications/network/telnet/CMakeLists.txt index b0916c0a245..8e586fa363b 100644 --- a/base/applications/network/telnet/CMakeLists.txt +++ b/base/applications/network/telnet/CMakeLists.txt @@ -3,7 +3,7 @@ set_cpp(WITH_EXCEPTIONS WITH_STL) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) -if(NOT MSVC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) +if(NOT MSVC) add_compile_flags("-Wno-restrict") endif() diff --git a/base/services/tftpd/CMakeLists.txt b/base/services/tftpd/CMakeLists.txt index 0159e0e1a3c..f4bd0cb6d7d 100644 --- a/base/services/tftpd/CMakeLists.txt +++ b/base/services/tftpd/CMakeLists.txt @@ -1,5 +1,5 @@ -if(NOT MSVC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) +if(NOT MSVC) add_compile_flags("-Wno-format-overflow") endif() diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt index 8105fdde4a9..d5e2d3b9eb8 100644 --- a/dll/3rdparty/libxslt/CMakeLists.txt +++ b/dll/3rdparty/libxslt/CMakeLists.txt @@ -1,5 +1,5 @@ -if(NOT MSVC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) +if(NOT MSVC) add_compile_flags("-Wno-misleading-indentation") endif()

4 years, 6 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2020