Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 18 Jul '20

18 Jul '20

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; }

1 0

[reactos] 03/03: [NTOS][KDBG] Use macros to simplify initializing the debug filter tables.
by Hermès Bélusca-Maïto 18 Jul '20

18 Jul '20

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

1 0

[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 18 Jul '20

18 Jul '20

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;

1 0

[reactos] 01/03: [NTOS:KDBG] Minor code style fix.
by Hermès Bélusca-Maïto 18 Jul '20

18 Jul '20

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)) {

1 0

[reactos] 01/01: [CRYPT32] CRYPT_ExportKeyTrans(): Check 'CRYPT_ConstructBitBlob()' return value (#2983)
by Serge Gautherie 18 Jul '20

18 Jul '20

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);

1 0

[reactos] 01/01: [CMAKE] Remove obsolete 'CMAKE_CXX_COMPILER_VERSION' checks (#2981)
by Serge Gautherie 18 Jul '20

18 Jul '20

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()

1 0

[reactos] 01/01: [OSK] Meta key modifier behaviour added (#2973)
by Arjav Garg 18 Jul '20

18 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b983e57b02982f7f21ec… commit 3b983e57b02982f7f21eca35d3ca3745624df948 Author: Arjav Garg <arjavgarg(a)gmail.com> AuthorDate: Sat Jul 18 19:03:43 2020 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 18 15:33:43 2020 +0200 [OSK] Meta key modifier behaviour added (#2973) Make the meta key in the OSK have modifier key behaviour. Changed all the .rc files in the OSK so that the meta key doesn't release on it's own and needs a second click to release. CORE-17161 --- base/applications/osk/lang/ar-DZ.rc | 8 ++++---- base/applications/osk/lang/cs-CZ.rc | 8 ++++---- base/applications/osk/lang/de-DE.rc | 8 ++++---- base/applications/osk/lang/en-GB.rc | 8 ++++---- base/applications/osk/lang/en-US.rc | 8 ++++---- base/applications/osk/lang/es-ES.rc | 8 ++++---- base/applications/osk/lang/et-EE.rc | 8 ++++---- base/applications/osk/lang/fr-CA.rc | 8 ++++---- base/applications/osk/lang/fr-FR.rc | 8 ++++---- base/applications/osk/lang/he-IL.rc | 8 ++++---- base/applications/osk/lang/id-ID.rc | 8 ++++---- base/applications/osk/lang/it-IT.rc | 8 ++++---- base/applications/osk/lang/pl-PL.rc | 8 ++++---- base/applications/osk/lang/ro-RO.rc | 8 ++++---- base/applications/osk/lang/ru-RU.rc | 8 ++++---- base/applications/osk/lang/tr-TR.rc | 8 ++++---- base/applications/osk/lang/zh-CN.rc | 8 ++++---- base/applications/osk/lang/zh-TW.rc | 8 ++++---- 18 files changed, 72 insertions(+), 72 deletions(-) diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc index f9cda704bcf..dfbf6f60cb9 100644 --- a/base/applications/osk/lang/ar-DZ.rc +++ b/base/applications/osk/lang/ar-DZ.rc @@ -85,11 +85,11 @@ BEGIN PUSHBUTTON "ظ",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc index 2802a978f97..a873fce0264 100644 --- a/base/applications/osk/lang/cs-CZ.rc +++ b/base/applications/osk/lang/cs-CZ.rc @@ -85,11 +85,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc index de49bb98453..83c7b760e09 100644 --- a/base/applications/osk/lang/de-DE.rc +++ b/base/applications/osk/lang/de-DE.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "-",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "Umsch",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Strg",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "Alt Gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Menü",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "Strg",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Einfg",SCAN_CODE_75,411,35,23,22 @@ -206,11 +206,11 @@ BEGIN PUSHBUTTON "umsch",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "strg",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt gr",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menü",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "strg",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "einfg",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc index 8665669447e..dc0fc5b81c4 100644 --- a/base/applications/osk/lang/en-GB.rc +++ b/base/applications/osk/lang/en-GB.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "Shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -206,11 +206,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc index f852a7e6293..412ead788fb 100644 --- a/base/applications/osk/lang/en-US.rc +++ b/base/applications/osk/lang/en-US.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc index e09e8f88dbc..24e1e57c01b 100644 --- a/base/applications/osk/lang/es-ES.rc +++ b/base/applications/osk/lang/es-ES.rc @@ -87,11 +87,11 @@ BEGIN PUSHBUTTON "-",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "maj",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menú",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -207,11 +207,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc index c449c8ed4fc..d2dddd6599a 100644 --- a/base/applications/osk/lang/et-EE.rc +++ b/base/applications/osk/lang/et-EE.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc index c7857d406be..423868f2d85 100644 --- a/base/applications/osk/lang/fr-CA.rc +++ b/base/applications/osk/lang/fr-CA.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "maj",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -206,11 +206,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc index 2764cf9b57e..91cc7af35e4 100644 --- a/base/applications/osk/lang/fr-FR.rc +++ b/base/applications/osk/lang/fr-FR.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "!",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "maj",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -206,11 +206,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc index cadeb7037dd..0fe7d60e9a9 100644 --- a/base/applications/osk/lang/he-IL.rc +++ b/base/applications/osk/lang/he-IL.rc @@ -85,11 +85,11 @@ BEGIN PUSHBUTTON ".",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/id-ID.rc b/base/applications/osk/lang/id-ID.rc index f916f2932ef..4de8d491cfa 100644 --- a/base/applications/osk/lang/id-ID.rc +++ b/base/applications/osk/lang/id-ID.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index f2b3649fbf5..956d274c59a 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "-",SCAN_CODE_55,235,79,15,15 PUSHBUTTON "Shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 PUSHBUTTON "alt gr",SCAN_CODE_62,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -206,11 +206,11 @@ BEGIN PUSHBUTTON "-",SCAN_CODE_55,235,79,15,15 PUSHBUTTON "Shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 PUSHBUTTON "alt gr",SCAN_CODE_62,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc index 1844ff89514..c128976e309 100644 --- a/base/applications/osk/lang/pl-PL.rc +++ b/base/applications/osk/lang/pl-PL.rc @@ -85,11 +85,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index 21cae9a49d5..c45f0725ae3 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 PUSHBUTTON "schimb",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 PUSHBUTTON "alt gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "meniu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 PUSHBUTTON "schimb",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 PUSHBUTTON "alt gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "meniu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc index c2878b717ee..e4f6a4fa125 100644 --- a/base/applications/osk/lang/ru-RU.rc +++ b/base/applications/osk/lang/ru-RU.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc index 179545d9bb5..720e7137852 100644 --- a/base/applications/osk/lang/tr-TR.rc +++ b/base/applications/osk/lang/tr-TR.rc @@ -85,11 +85,11 @@ BEGIN PUSHBUTTON ".",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "Shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "Alt",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Menü",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "Ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Ins",SCAN_CODE_75,411,35,23,22 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc index 2ccaa37269b..69b88370bb7 100644 --- a/base/applications/osk/lang/zh-CN.rc +++ b/base/applications/osk/lang/zh-CN.rc @@ -88,11 +88,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -208,11 +208,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/zh-TW.rc b/base/applications/osk/lang/zh-TW.rc index 02d980a6cfc..19da7d034fc 100644 --- a/base/applications/osk/lang/zh-TW.rc +++ b/base/applications/osk/lang/zh-TW.rc @@ -87,11 +87,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -207,11 +207,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15

1 0

[reactos] 01/01: [CDFS][FLOPPY_NEW] Simplify unsupported NT6.2+ workarounds (#2956)
by Serge Gautherie 18 Jul '20

18 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89971a37577590899e044… commit 89971a37577590899e044cff39e4f857d5c54007 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 18 15:31:48 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 18 15:31:48 2020 +0200 [CDFS][FLOPPY_NEW] Simplify unsupported NT6.2+ workarounds (#2956) --- drivers/filesystems/cdfs/cdprocs.h | 26 ++++--------- drivers/storage/floppy_new/floppy.c | 73 +++---------------------------------- 2 files changed, 14 insertions(+), 85 deletions(-) diff --git a/drivers/filesystems/cdfs/cdprocs.h b/drivers/filesystems/cdfs/cdprocs.h index d90591772d2..442b8902c65 100644 --- a/drivers/filesystems/cdfs/cdprocs.h +++ b/drivers/filesystems/cdfs/cdprocs.h @@ -55,6 +55,14 @@ Abstract: #pragma warning( pop ) #endif +#ifdef __REACTOS__ +// Downgrade unsupported NT6.2+ features. +#undef MdlMappingNoExecute +#define MdlMappingNoExecute 0 +#define NonPagedPoolNx NonPagedPool +#define NonPagedPoolNxCacheAligned NonPagedPoolCacheAligned +#endif + //**** x86 compiler bug **** #if defined(_M_IX86) @@ -372,7 +380,6 @@ CdHijackIrpAndFlushDevice ( // ); // -#ifndef __REACTOS__ #define CdMapUserBuffer(IC, UB) { \ *(UB) = (PVOID) ( ((IC)->Irp->MdlAddress == NULL) ? \ (IC)->Irp->UserBuffer : \ @@ -382,18 +389,6 @@ CdHijackIrpAndFlushDevice ( } \ } -#else -#define CdMapUserBuffer(IC, UB) { \ - *(UB) = (PVOID) ( ((IC)->Irp->MdlAddress == NULL) ? \ - (IC)->Irp->UserBuffer : \ - (MmGetSystemAddressForMdlSafe( (IC)->Irp->MdlAddress, NormalPagePriority))); \ - if (NULL == *(UB)) { \ - CdRaiseStatus( (IC), STATUS_INSUFFICIENT_RESOURCES); \ - } \ - } - -#endif - #define CdLockUserBuffer(IC,BL,OP) { \ if ((IC)->Irp->MdlAddress == NULL) { \ @@ -1383,13 +1378,8 @@ CdProcessToc ( // #define CdPagedPool PagedPool -#ifndef __REACTOS__ #define CdNonPagedPool NonPagedPoolNx #define CdNonPagedPoolCacheAligned NonPagedPoolNxCacheAligned -#else -#define CdNonPagedPool NonPagedPool -#define CdNonPagedPoolCacheAligned NonPagedPoolCacheAligned -#endif // diff --git a/drivers/storage/floppy_new/floppy.c b/drivers/storage/floppy_new/floppy.c index 90f0615adfd..16c30dcb9ec 100644 --- a/drivers/storage/floppy_new/floppy.c +++ b/drivers/storage/floppy_new/floppy.c @@ -46,6 +46,12 @@ Revision History: #include <ntstrsafe.h> #include <intsafe.h> +#ifdef __REACTOS__ +// Downgrade unsupported NT6.2+ features. +#define NonPagedPoolNx NonPagedPool +#define NonPagedPoolNxCacheAligned NonPagedPoolCacheAligned +#endif + #define MODE_DATA_SIZE 192 #define SCSI_FLOPPY_TIMEOUT 20 #define SFLOPPY_SRB_LIST_SIZE 4 @@ -834,11 +840,7 @@ ScsiFlopInitDevice( // Allocate request sense buffer. // -#ifndef __REACTOS__ senseData = ExAllocatePool(NonPagedPoolNxCacheAligned, SENSE_BUFFER_SIZE); -#else - senseData = ExAllocatePool(NonPagedPoolCacheAligned, SENSE_BUFFER_SIZE); -#endif if (senseData == NULL) { @@ -1160,11 +1162,7 @@ Return Value: // Irp->IoStatus.Information = 0; -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { @@ -1530,11 +1528,7 @@ Return Value: // Determine if the device is writable. // -#ifndef __REACTOS__ modeData = ExAllocatePool(NonPagedPoolNxCacheAligned, MODE_DATA_SIZE); -#else - modeData = ExAllocatePool(NonPagedPoolCacheAligned, MODE_DATA_SIZE); -#endif if (modeData == NULL) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -1845,20 +1839,12 @@ Return Value: // Allocate a Srb for the read command. // -#ifndef __REACTOS__ readData = ExAllocatePool(NonPagedPoolNx, geometry->BytesPerSector); -#else - readData = ExAllocatePool(NonPagedPool, geometry->BytesPerSector); -#endif if (readData == NULL) { return STATUS_NO_MEMORY; } -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { @@ -1948,11 +1934,7 @@ Return Value: return(diskData->DriveType); } -#ifndef __REACTOS__ modeData = ExAllocatePool(NonPagedPoolNxCacheAligned, MODE_DATA_SIZE); -#else - modeData = ExAllocatePool(NonPagedPoolCacheAligned, MODE_DATA_SIZE); -#endif if (modeData == NULL) { return(DRIVE_TYPE_NONE); @@ -2217,11 +2199,7 @@ Return Value: PAGED_CODE(); -#ifndef __REACTOS__ modeData = ExAllocatePool(NonPagedPoolNxCacheAligned, MODE_DATA_SIZE); -#else - modeData = ExAllocatePool(NonPagedPoolCacheAligned, MODE_DATA_SIZE); -#endif if (modeData == NULL) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -2320,11 +2298,7 @@ Return Value: // Allocate a Srb for the format command. // -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { @@ -2384,11 +2358,7 @@ Return Value: // Allocate a Srb for the format command. // -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -2514,13 +2484,8 @@ Return Value: DebugPrint((2,"Sending SCSIOP_START_STOP_UNIT\n")); -#ifndef __REACTOS__ context = ExAllocatePool(NonPagedPoolNx, sizeof(COMPLETION_CONTEXT)); -#else - context = ExAllocatePool(NonPagedPool, - sizeof(COMPLETION_CONTEXT)); -#endif if (context == NULL) { @@ -2599,11 +2564,7 @@ Return Value: context = NULL; if (!overFlow) { -#ifndef __REACTOS__ context = ExAllocatePool(NonPagedPoolNx, sizeNeeded); -#else - context = ExAllocatePool(NonPagedPool, sizeNeeded); -#endif } if (context == NULL) { @@ -2765,11 +2726,7 @@ Return Value: driveMediaConstants->SectorsPerTrack * driveMediaConstants->BytesPerSector; -#ifndef __REACTOS__ buffer = ExAllocatePool(NonPagedPoolNxCacheAligned, length); -#else - buffer = ExAllocatePool(NonPagedPoolCacheAligned, length); -#endif if (buffer == NULL) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -3051,11 +3008,7 @@ Return Value: // Allocate an SRB for the SCSIOP_READ_FORMATTED_CAPACITY request // -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { @@ -3071,11 +3024,7 @@ Return Value: ASSERT(dataTransferLength < 0x100); -#ifndef __REACTOS__ dataBuffer = ExAllocatePool(NonPagedPoolNx, dataTransferLength); -#else - dataBuffer = ExAllocatePool(NonPagedPool, dataTransferLength); -#endif if (dataBuffer == NULL) { @@ -3425,11 +3374,7 @@ Return Value: // Allocate an SRB for the SCSIOP_FORMAT_UNIT request // -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { @@ -3438,13 +3383,8 @@ Return Value: // Allocate a transfer buffer for the SCSIOP_FORMAT_UNIT parameter list // -#ifndef __REACTOS__ parameterList = ExAllocatePool(NonPagedPoolNx, sizeof(FORMAT_UNIT_PARAMETER_LIST)); -#else - parameterList = ExAllocatePool(NonPagedPool, - sizeof(FORMAT_UNIT_PARAMETER_LIST)); -#endif if (parameterList == NULL) { @@ -3573,4 +3513,3 @@ Return Value: return status; } -

1 0

[reactos] 01/01: [NTOS:FSTUB] Simplify xHalIoReadPartitionTable function Use single IOCTL (IOCTL_DISK_GET_DRIVE_GEOMETRY_EX) for retrieving disk basic geometry information along with disk size. Previous implementation used to issue two requests for that.
by Victor Perevertkin 15 Jul '20

15 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5201472be77f8149786b8… commit 5201472be77f8149786b8d12fba8f2846b4a601e Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Jul 15 03:20:13 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Jul 15 03:20:13 2020 +0300 [NTOS:FSTUB] Simplify xHalIoReadPartitionTable function Use single IOCTL (IOCTL_DISK_GET_DRIVE_GEOMETRY_EX) for retrieving disk basic geometry information along with disk size. Previous implementation used to issue two requests for that. --- ntoskrnl/fstub/disksup.c | 77 ++++++++++-------------------------------------- 1 file changed, 15 insertions(+), 62 deletions(-) diff --git a/ntoskrnl/fstub/disksup.c b/ntoskrnl/fstub/disksup.c index 3198481fb5d..3c6119a2f85 100644 --- a/ntoskrnl/fstub/disksup.c +++ b/ntoskrnl/fstub/disksup.c @@ -1387,14 +1387,12 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, NTSTATUS NTAPI HalpGetFullGeometry(IN PDEVICE_OBJECT DeviceObject, - IN PDISK_GEOMETRY Geometry, - OUT PULONGLONG RealSectorCount) + OUT PDISK_GEOMETRY_EX Geometry) { PIRP Irp; IO_STATUS_BLOCK IoStatusBlock; PKEVENT Event; NTSTATUS Status; - PARTITION_INFORMATION PartitionInfo; PAGED_CODE(); /* Allocate a non-paged event */ @@ -1407,12 +1405,12 @@ HalpGetFullGeometry(IN PDEVICE_OBJECT DeviceObject, KeInitializeEvent(Event, NotificationEvent, FALSE); /* Build the IRP */ - Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, DeviceObject, NULL, 0UL, Geometry, - sizeof(DISK_GEOMETRY), + sizeof(DISK_GEOMETRY_EX), FALSE, Event, &IoStatusBlock); @@ -1432,47 +1430,6 @@ HalpGetFullGeometry(IN PDEVICE_OBJECT DeviceObject, Status = IoStatusBlock.Status; } - /* Check if the driver returned success */ - if(NT_SUCCESS(Status)) - { - /* Build another IRP */ - Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_PARTITION_INFO, - DeviceObject, - NULL, - 0UL, - &PartitionInfo, - sizeof(PARTITION_INFORMATION), - FALSE, - Event, - &IoStatusBlock); - if (!Irp) - { - /* Fail, free the event */ - ExFreePoolWithTag(Event, TAG_FILE_SYSTEM); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Reset event */ - KeClearEvent(Event); - - /* Call the driver and check if it's pending */ - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait on the driver */ - KeWaitForSingleObject(Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; - } - - /* Check if the driver returned success */ - if(NT_SUCCESS(Status)) - { - /* Get the number of sectors */ - *RealSectorCount = (PartitionInfo.PartitionLength.QuadPart / - Geometry->BytesPerSector); - } - } - /* Free the event and return the Status */ ExFreePoolWithTag(Event, TAG_FILE_SYSTEM); return Status; @@ -1823,9 +1780,8 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, ULONG BufferSize = 2048, InputSize; PDRIVE_LAYOUT_INFORMATION DriveLayoutInfo = NULL; LONG j = -1, i = -1, k; - DISK_GEOMETRY DiskGeometry; + DISK_GEOMETRY_EX DiskGeometryEx; LONGLONG EndSector, MaxSector, StartOffset; - ULONGLONG MaxOffset; LARGE_INTEGER Offset, VolumeOffset; BOOLEAN IsPrimary = TRUE, IsEzDrive = FALSE, MbrFound = FALSE; BOOLEAN IsValid, IsEmpty = TRUE; @@ -1856,7 +1812,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, } /* Get drive geometry */ - Status = HalpGetFullGeometry(DeviceObject, &DiskGeometry, &MaxOffset); + Status = HalpGetFullGeometry(DeviceObject, &DiskGeometryEx); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(*PartitionBuffer, TAG_FILE_SYSTEM); @@ -1865,10 +1821,10 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, } /* Get the end and maximum sector */ - EndSector = MaxOffset; - MaxSector = MaxOffset << 1; - DPRINT("FSTUB: MaxOffset = %#I64x, MaxSector = %#I64x\n", - MaxOffset, MaxSector); + EndSector = DiskGeometryEx.DiskSize.QuadPart / DiskGeometryEx.Geometry.BytesPerSector; + MaxSector = EndSector << 1; + DPRINT("FSTUB: DiskSize = %#I64x, MaxSector = %#I64x\n", + DiskGeometryEx.DiskSize, MaxSector); /* Allocate our buffer */ Buffer = ExAllocatePoolWithTag(NonPagedPool, InputSize, TAG_FILE_SYSTEM); @@ -1970,13 +1926,12 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, if (PartitionType == EFI_PMBR_OSTYPE_EFI) { /* Partition length might be bigger than disk size */ - FstubFixupEfiPartition(PartitionDescriptor, - MaxOffset); + FstubFixupEfiPartition(PartitionDescriptor, DiskGeometryEx.DiskSize.QuadPart); } /* Make sure that the partition is valid, unless it's the first */ if (!(HalpIsValidPartitionEntry(PartitionDescriptor, - MaxOffset, + DiskGeometryEx.DiskSize.QuadPart, MaxSector)) && (j == 0)) { /* It's invalid, so fail */ @@ -2158,7 +2113,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, } while (Offset.HighPart | Offset.LowPart); /* Check if this is a removable device that's probably a super-floppy */ - if ((DiskGeometry.MediaType == RemovableMedia) && + if ((DiskGeometryEx.Geometry.MediaType == RemovableMedia) && (j == 0) && (MbrFound) && (IsEmpty)) { PBOOT_SECTOR_INFO BootSectorInfo = (PBOOT_SECTOR_INFO)Buffer; @@ -2179,7 +2134,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, if (j == -1) { /* The likely cause is the super floppy detection above */ - if ((MbrFound) || (DiskGeometry.MediaType == RemovableMedia)) + if ((MbrFound) || (DiskGeometryEx.Geometry.MediaType == RemovableMedia)) { /* Print out debugging information */ DPRINT1("FSTUB: Drive %#p has no valid MBR. Make it into a " @@ -2187,7 +2142,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, DeviceObject); DPRINT1("FSTUB: Drive has %I64d sectors and is %#016I64x " "bytes large\n", - EndSector, EndSector * DiskGeometry.BytesPerSector); + EndSector, DiskGeometryEx.DiskSize); /* We should at least have some sectors */ if (EndSector > 0) @@ -2202,9 +2157,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, PartitionInfo->BootIndicator = FALSE; PartitionInfo->HiddenSectors = 0; PartitionInfo->StartingOffset.QuadPart = 0; - PartitionInfo->PartitionLength.QuadPart = (EndSector * - DiskGeometry. - BytesPerSector); + PartitionInfo->PartitionLength = DiskGeometryEx.DiskSize; /* FIXME: REACTOS HACK */ PartitionInfo->PartitionNumber = 0;

1 0

[reactos] 01/01: [LIBMPG123] Update to version 1.26.2. CORE-17158
by Thomas Faber 12 Jul '20

12 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64abd9fca8b6ebaba8769… commit 64abd9fca8b6ebaba8769ca249b7fba2dde716a2 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Jul 12 12:26:47 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jul 12 12:28:05 2020 +0200 [LIBMPG123] Update to version 1.26.2. CORE-17158 --- sdk/include/reactos/libs/libmpg123/config.h | 12 +++++++++--- sdk/include/reactos/libs/libmpg123/mpg123.h | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sdk/include/reactos/libs/libmpg123/config.h b/sdk/include/reactos/libs/libmpg123/config.h index 54697efe40f..9320b5f39e4 100644 --- a/sdk/include/reactos/libs/libmpg123/config.h +++ b/sdk/include/reactos/libs/libmpg123/config.h @@ -395,7 +395,7 @@ #define PACKAGE_NAME "mpg123" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mpg123 1.26.1" +#define PACKAGE_STRING "mpg123 1.26.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mpg123" @@ -404,7 +404,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.26.1" +#define PACKAGE_VERSION "1.26.2" /* Define if portaudio v18 API is wanted. */ /* #undef PORTAUDIO18 */ @@ -415,6 +415,9 @@ /* The size of `long', as computed by sizeof. */ #define SIZEOF_LONG 4 +/* The size of `off64_t', as computed by sizeof. */ +#define SIZEOF_OFF64_T 8 + /* The size of `off_t', as computed by sizeof. */ #define SIZEOF_OFF_T 4 @@ -440,7 +443,7 @@ /* #undef USE_YASM_FOR_AVX */ /* Version number of package */ -#define VERSION "1.26.1" +#define VERSION "1.26.2" /* Define to use Win32 named pipes */ #define WANT_WIN32_FIFO 1 @@ -448,6 +451,9 @@ /* Define to use Win32 sockets */ #define WANT_WIN32_SOCKETS 1 +/* Windows UWP build */ +/* #undef WINDOWS_UWP */ + /* Define to use Unicode for Windows */ #define WANT_WIN32_UNICODE 1 diff --git a/sdk/include/reactos/libs/libmpg123/mpg123.h b/sdk/include/reactos/libs/libmpg123/mpg123.h index 9cab00424d9..34b8a2f0db7 100644 --- a/sdk/include/reactos/libs/libmpg123/mpg123.h +++ b/sdk/include/reactos/libs/libmpg123/mpg123.h @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.26.1) + libmpg123: MPEG Audio Decoder library (version 1.26.2) copyright 1995-2015 by the mpg123 project free software under the terms of the LGPL 2.1

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs