]> xenbits.xensource.com Git - pvdrivers/win/xencons.git/commitdiff
Remove CoInstaller from INF
authorOwen Smith <owen.smith@cloud.com>
Mon, 2 Oct 2023 10:30:17 +0000 (11:30 +0100)
committerPaul Durrant <pdurrant@amazon.com>
Mon, 2 Oct 2023 15:39:59 +0000 (16:39 +0100)
Windows 11 22H2 WHQL requires INF files pass "InfVerif /k", which highlights
several issues
- PnpLockdown=1 needs to be specified
- CoInstallers are no longer allowed

The CoInstaller has several functions that will need alternative solutions:
- The AllowUpdate mechanism is no longer possible
- The safety checks that ensure interface versionings remain compatible
- Cleanup user mode service (xencons_monitor) on uninstall

Interface safety checks need to be handled by changes to child device bindings,
and assuming upgrade via emulated devices is safe.

Signed-off-by: Owen Smith <owen.smith@cloud.com>
src/xencons.inf

index 5f3be798d5471410a7e3d266d73deba4cdde3de9..4b0dbde2d201d76fc1a1ea006264ff93a8a49bff 100644 (file)
@@ -38,10 +38,10 @@ Provider=%Vendor%
 CatalogFile=xencons.cat
 DriverVer=@INF_DATE@,@MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@.@BUILD_NUMBER@
 DriverPackageDisplayName=%DiskDesc%
+PnpLockdown=1
 
 [DestinationDirs]
 DefaultDestDir=12
-CoInst_CopyFiles=11
 Monitor_CopyFiles=11
 Tty_CopyFiles=11
 
@@ -50,14 +50,10 @@ Tty_CopyFiles=11
 
 [SourceDisksFiles]
 xencons.sys=0,,
-xencons_coinst.dll=0,,
 xencons_monitor.exe=0,,
 xencons_monitor.dll=0,,
 xencons_tty.exe=0,,
 
-[CoInst_CopyFiles]
-xencons_coinst_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dll,xencons_coinst.dll
-
 [Monitor_CopyFiles]
 xencons_monitor_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.exe,xencons_monitor.exe
 xencons_monitor_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dll,xencons_monitor.dll
@@ -72,9 +68,9 @@ xencons_tty_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.exe,x
 ; DisplayName          Section         DeviceID
 ; -----------          -------         --------
 
-%XenConsName%          =XenCons_Inst,  XENBUS\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_CONS&REV_09000009
-%XenConsName%          =XenCons_Inst,  XENBUS\VEN_@VENDOR_PREFIX@0001&DEV_CONS&REV_09000009
-%XenConsName%          =XenCons_Inst,  XENBUS\VEN_@VENDOR_PREFIX@0002&DEV_CONS&REV_09000009
+%XenConsName%          =XenCons_Inst,  XENBUS\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_CONS&REV_0900000A
+%XenConsName%          =XenCons_Inst,  XENBUS\VEN_@VENDOR_PREFIX@0001&DEV_CONS&REV_0900000A
+%XenConsName%          =XenCons_Inst,  XENBUS\VEN_@VENDOR_PREFIX@0002&DEV_CONS&REV_0900000A
 
 [XenCons_Inst]
 CopyFiles=XenCons_Copyfiles
@@ -123,13 +119,6 @@ AddReg=Monitor_EventLog_AddReg
 HKR,,EventMessageFile,0x00020000,"%%SystemRoot%%\System32\xencons_monitor_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dll"
 HKR,,TypesSupported,0x00010001,7
 
-[XenCons_Inst.CoInstallers]
-CopyFiles=CoInst_CopyFiles
-AddReg=CoInst_AddReg
-
-[CoInst_AddReg]
-HKR,,CoInstallers32,0x00010000,"xencons_coinst_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dll,Entry"
-
 [Strings]
 
 Vendor="@VENDOR_NAME@"