]> xenbits.xensource.com Git - pvdrivers/win/xenvkbd.git/commitdiff
Remove CoInstaller from INF
authorOwen Smith <owen.smith@cloud.com>
Mon, 2 Oct 2023 12:52:06 +0000 (13:52 +0100)
committerPaul Durrant <pdurrant@amazon.com>
Mon, 2 Oct 2023 16:03:52 +0000 (17:03 +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

Interface safety checks need to be handled by changes to child device bindings.

Also updates the INF bindings to require XenBus with CoInstaller removed to
maintain consistent CoInstaller removal versioning.

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

index 08d96d0dc77ae54a31c0f23cdedb42d4d42c1589..f7d3b18b952443aad0d27c9083bad0ed4b955982 100644 (file)
@@ -38,20 +38,16 @@ Provider=%Vendor%
 CatalogFile=xenvkbd.cat
 DriverVer=@INF_DATE@,@MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@.@BUILD_NUMBER@
 DriverPackageDisplayName=%DiskDesc%
+PnpLockdown=1
 
 [DestinationDirs] 
 DefaultDestDir=12 
-CoInst_CopyFiles=11
 
 [SourceDisksNames]
 0=%DiskDesc%
 
 [SourceDisksFiles]
 xenvkbd.sys=0,,
-xenvkbd_coinst.dll=0,,
-
-[CoInst_CopyFiles]
-xenvkbd_coinst_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dll,xenvkbd_coinst.dll
 
 [Manufacturer] 
 %Vendor%=Inst,NT@INF_ARCH@
@@ -60,9 +56,9 @@ xenvkbd_coinst_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dl
 ; DisplayName          Section         DeviceID
 ; -----------          -------         --------
 
-%XenVkbdName%          =XenVkbd_Inst,  XENBUS\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_VKBD&REV_09000009
-%XenVkbdName%          =XenVkbd_Inst,  XENBUS\VEN_@VENDOR_PREFIX@0001&DEV_VKBD&REV_09000009
-%XenVkbdName%          =XenVkbd_Inst,  XENBUS\VEN_@VENDOR_PREFIX@0002&DEV_VKBD&REV_09000009
+%XenVkbdName%          =XenVkbd_Inst,  XENBUS\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_VKBD&REV_0900000A
+%XenVkbdName%          =XenVkbd_Inst,  XENBUS\VEN_@VENDOR_PREFIX@0001&DEV_VKBD&REV_0900000A
+%XenVkbdName%          =XenVkbd_Inst,  XENBUS\VEN_@VENDOR_PREFIX@0002&DEV_VKBD&REV_0900000A
 
 [XenVkbd_Inst] 
 CopyFiles=XenVkbd_Copyfiles
@@ -85,13 +81,6 @@ AddReg = XenVkbd_Parameters
 HKR,"Parameters",,0x00000010
 HKR,"Parameters","RequestKey",0x00000000,%RequestKey%
 
-[XenVkbd_Inst.CoInstallers]
-CopyFiles=CoInst_CopyFiles
-AddReg=CoInst_AddReg
-
-[CoInst_AddReg]
-HKR,,CoInstallers32,0x00010000,"xenvkbd_coinst_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dll,Entry"
-
 [Strings] 
 
 Vendor="@VENDOR_NAME@"