[PATCH] Use BootFlags directive on build 25398 and later

["Tu Dinh" <ngoc-tu.dinh@xxxxxxxxxx>]

Setting BootFlags in an AddReg section is no longer allowed by INFVerif.

This requires duplication of some INF sections upstream from
XenCons_Service.

Link: 
https://techcommunity.microsoft.com/blog/hardware-dev-center/driver-isolation-ruleset-changes-for-whcp-and-attestation-submissions/4461580
Signed-off-by: Tu Dinh <ngoc-tu.dinh@xxxxxxxxxx>
---
 src/xencons.inf | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/xencons.inf b/src/xencons.inf
index bae7624..4e8d274 100644
--- a/src/xencons.inf
+++ b/src/xencons.inf
@@ -62,7 +62,7 @@ 
xencons_monitor_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.d
 
xencons_tty_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.exe,xencons_tty.exe
 
 [Manufacturer]
-%Vendor%=Inst,NT@INF_ARCH@
+%Vendor%=Inst,NT@INF_ARCH@,NT@INF_ARCH@.10.0...25398
 
 [Inst.NT@INF_ARCH@]
 %XenConsName%=XenCons_Inst,\
@@ -70,6 +70,12 @@ 
XENBUS\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_CONS&REV_0900000A,\
 XENBUS\VEN_@VENDOR_PREFIX@0001&DEV_CONS&REV_0900000A,\
 XENBUS\VEN_@VENDOR_PREFIX@0002&DEV_CONS&REV_0900000A
 
+[Inst.NT@INF_ARCH@.10.0...25398]
+%XenConsName%=XenCons_Inst_25H2,\
+XENBUS\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_CONS&REV_0900000A,\
+XENBUS\VEN_@VENDOR_PREFIX@0001&DEV_CONS&REV_0900000A,\
+XENBUS\VEN_@VENDOR_PREFIX@0002&DEV_CONS&REV_0900000A
+
 [XenCons_Inst]
 CopyFiles=XenCons_Copyfiles
 CopyFiles=Monitor_Copyfiles
@@ -77,6 +83,13 @@ CopyFiles=Tty_Copyfiles
 ; TODO: Remove during next PDO version bump
 FeatureScore=0xFE
 
+[XenCons_Inst_25H2]
+CopyFiles=XenCons_Copyfiles
+CopyFiles=Monitor_Copyfiles
+CopyFiles=Tty_Copyfiles
+; TODO: Remove during next PDO version bump
+FeatureScore=0xFE
+
 [XenCons_Copyfiles]
 xencons.sys
 
@@ -84,6 +97,10 @@ xencons.sys
 
AddService=xencons_monitor,%SPSVCSINST_STARTSERVICE%,Monitor_Service,Monitor_EventLog
 AddService=xencons,%SPSVCINST_ASSOCSERVICE%,XenCons_Service
 
+[XenCons_Inst_25H2.Services]
+AddService=xencons_monitor,%SPSVCSINST_STARTSERVICE%,Monitor_Service,Monitor_EventLog
+AddService=xencons,%SPSVCINST_ASSOCSERVICE%,XenCons_Service_25H2
+
 [XenCons_Service]
 DisplayName=%XenConsName%
 ServiceType=%SERVICE_KERNEL_DRIVER%
@@ -93,6 +110,16 @@ ServiceBinary=%12%\xencons.sys
 LoadOrderGroup="Extended Base"
 AddReg = XenCons_BootFlags, XenCons_Parameters
 
+[XenCons_Service_25H2]
+DisplayName=%XenConsName%
+ServiceType=%SERVICE_KERNEL_DRIVER%
+StartType=%SERVICE_DEMAND_START%
+ErrorControl=%SERVICE_ERROR_NORMAL%
+ServiceBinary=%12%\xencons.sys
+LoadOrderGroup="Extended Base"
+AddReg = XenCons_Parameters
+BootFlags = 0x81
+
 [XenCons_BootFlags]
 HKR,,"BootFlags",0x00010003,0x81
 
-- 
2.51.2.windows.1



--
Ngoc Tu Dinh | Vates XCP-ng Developer

XCP-ng & Xen Orchestra - Vates solutions

web: https://vates.tech