From b7904fc7b079a3adda02bb8386f04186ab1932d9 Mon Sep 17 00:00:00 2001 From: benyamin-codez <115509179+benyamin-codez@users.noreply.github.com> Date: Tue, 17 Dec 2024 04:52:13 +1100 Subject: [PATCH] [vioscsi] DriverEntry() improved tracing Addendum to b6edb81. 1. Updated NTDDI descriptions and definitions to include Dilithium (25H1) and Selenium (25H2) development semesters 2. Corrected descriptions to only use development semesters rather than include some combinations with Windows versions 3. Updated definition comments to show development semesters Signed-off-by: benyamin-codez <115509179+benyamin-codez@users.noreply.github.com> --- vioscsi/vioscsi.c | 18 ++++++++++++------ vioscsi/vioscsi.h | 13 +++++++++---- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/vioscsi/vioscsi.c b/vioscsi/vioscsi.c index 3a24b55d5..18b90c8a7 100755 --- a/vioscsi/vioscsi.c +++ b/vioscsi/vioscsi.c @@ -468,7 +468,7 @@ DriverEntry( RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_RS5 | Windows 10.0.17763 | 1809 | Redstone 5 \n"); break; case NTDDI_WIN10_19H1: - RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_19H1 | Windows 10.0.18362 | 1903 | 19H1 Titanium \n"); + RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_19H1 | Windows 10.0.18362 | 19H1 | Titanium \n"); break; case NTDDI_WIN10_VB: RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_VB | Windows 10.0.19041 | 2004 | Vibranium \n"); @@ -477,26 +477,32 @@ DriverEntry( RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_MN | Windows 10.0.19042 | 20H2 | Manganese \n"); break; case NTDDI_WIN10_FE: - RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_FE | Windows 10.0.19043 | 21H1 | Ferrum \n"); + RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_FE | Windows 10.0.19043 | 21H1 | Iron \n"); break; case NTDDI_WIN10_CO: RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_CO | Windows 10.0.19044-22000 | 21H2 | Cobalt \n"); break; case NTDDI_WIN10_NI: - RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_NI | Windows 10.0.22449-22631 | 22H2-22H3 | Nickel \n"); + RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_NI | Windows 10.0.22449-22631 | 22H2 | Nickel \n"); break; case NTDDI_WIN10_CU: - RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_CU | Windows 10.0.25057-25236 | 22H2 | Copper \n"); + RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN10_CU | Windows 10.0.25057-25236 | 23H1 | Copper \n"); break; case NTDDI_WIN11_ZN: - RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN11_ZN | Windows 10.0.25246-25398 | Zinc \n"); + RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN11_ZN | Windows 10.0.25246-25398 | 23H2 | Zinc \n"); break; case NTDDI_WIN11_GA: - RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN11_GA | Windows 10.0.25905-25941 | Gallium \n"); + RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN11_GA | Windows 10.0.25905-25941 | 24H1 | Gallium \n"); break; case NTDDI_WIN11_GE: RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN11_GE | Windows 10.0.25947-26100 | 24H2 | Germanium \n"); break; + case NTDDI_WIN11_GE: + RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN11_DT | Windows 10.0.27686-27691 | 25H1 | Dilithium \n"); + break; + case NTDDI_WIN11_GE: + RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : ABRACADABRA_WIN11_SE | Windows 10.0.27764 | 25H2 | Selenium \n"); + break; default: RhelDbgPrint(TRACE_LEVEL_VERBOSE, " NTDDI_VERSION : 0x%x \n", (NTDDI_VERSION)); break; diff --git a/vioscsi/vioscsi.h b/vioscsi/vioscsi.h index 53bae2aaa..313f2c5ea 100755 --- a/vioscsi/vioscsi.h +++ b/vioscsi/vioscsi.h @@ -57,13 +57,18 @@ typedef struct VirtIOBufferDescriptor VIO_SG, *PVIO_SG; #ifndef NTDDI_WIN11 #define NTDDI_WIN11 NTDDI_WIN10_CO #define NTDDI_WIN11_CO NTDDI_WIN10_CO // Windows 10.0.21277-22000 / Cobalt / 21H2 -#define NTDDI_WIN11_NI NTDDI_WIN10_NI // Windows 10.0.22449-22631 / Nickel / 22H2 23H2 -#define NTDDI_WIN11_CU NTDDI_WIN10_CU // Windows 10.0.25057-25236 / Copper -#define NTDDI_WIN11_ZN 0x0A00000E // Windows 10.0.25246-25398 / Zinc -#define NTDDI_WIN11_GA 0x0A00000F // Windows 10.0.25905-25941 / Gallium +#define NTDDI_WIN11_NI NTDDI_WIN10_NI // Windows 10.0.22449-22631 / Nickel / 22H2 +#define NTDDI_WIN11_CU NTDDI_WIN10_CU // Windows 10.0.25057-25236 / Copper / 23H1 +#define NTDDI_WIN11_ZN 0x0A00000E // Windows 10.0.25246-25398 / Zinc / 23H2 +#define NTDDI_WIN11_GA 0x0A00000F // Windows 10.0.25905-25941 / Gallium / 24H1 #define NTDDI_WIN11_GE 0x0A000010 // Windows 10.0.25947-26100 / Germanium / 24H2 #endif +#ifndef NTDDI_WIN11_DT +#define NTDDI_WIN11_DT 0x0A000011 // Windows 10.0.27686-27691 / Dilithium / 25H1 +#define NTDDI_WIN11_SE 0x0A000012 // Windows 10.0.27764 / Selenium / 25H2 +#endif + #define NTDDI_THRESHOLD NTDDI_WINTHRESHOLD #define PHYS_SEGMENTS 32