From 66123ff99f94cab467a2e6b558e04f76c0055c55 Mon Sep 17 00:00:00 2001 From: Wei Mao Date: Fri, 13 Jan 2023 11:50:48 -0800 Subject: [DirID-13] echo, pcidrv, plx9x5x, vhidmini, serial, virtualserial2, usbsamp, usb/ucm Change INF files with the following: - Use Driver Store DirID = 13 which are available starting Windows 10 1809 - Remove WDF coinstaller - Add PnpLockdown = 1 --- general/PLX9x5x/sys/pci9x5x.inx | Bin 5078 -> 5280 bytes general/echo/kmdf/driver/AutoSync/echo.inx | Bin 4842 -> 4084 bytes general/echo/kmdf/driver/DriverSync/echo_2.inx | Bin 4998 -> 4218 bytes general/echo/umdf2/driver/AutoSync/echoum.inx | Bin 3924 -> 4030 bytes general/pcidrv/kmdf/genpci.inx | Bin 7198 -> 6244 bytes hid/vhidmini2/driver/kmdf/vhidmini.inx | Bin 4784 -> 4814 bytes hid/vhidmini2/driver/umdf2/VhidminiUm.inx | Bin 5402 -> 5552 bytes serial/VirtualSerial2/ComPort/virtualserial2um.inx | Bin 4160 -> 4392 bytes serial/VirtualSerial2/FakeModem/fakemodem2um.inx | Bin 16566 -> 16596 bytes serial/serial/serial.inx | Bin 6212 -> 5574 bytes usb/UcmCxUcsi/UcmCxUcsi.inf | Bin 2700 -> 3888 bytes .../UcmTcpciCxClientSample.inf | Bin 3024 -> 3300 bytes usb/usbsamp/sys/driver/usbsamp.inx | Bin 6444 -> 5766 bytes 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/general/PLX9x5x/sys/pci9x5x.inx b/general/PLX9x5x/sys/pci9x5x.inx index 675a2a2c..2446271e 100644 Binary files a/general/PLX9x5x/sys/pci9x5x.inx and b/general/PLX9x5x/sys/pci9x5x.inx differ diff --git a/general/echo/kmdf/driver/AutoSync/echo.inx b/general/echo/kmdf/driver/AutoSync/echo.inx index bfb3b356..970462a3 100644 Binary files a/general/echo/kmdf/driver/AutoSync/echo.inx and b/general/echo/kmdf/driver/AutoSync/echo.inx differ diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.inx b/general/echo/kmdf/driver/DriverSync/echo_2.inx index ea524f85..bb73b485 100644 Binary files a/general/echo/kmdf/driver/DriverSync/echo_2.inx and b/general/echo/kmdf/driver/DriverSync/echo_2.inx differ diff --git a/general/echo/umdf2/driver/AutoSync/echoum.inx b/general/echo/umdf2/driver/AutoSync/echoum.inx index cae8b45f..ccfe6a7e 100644 Binary files a/general/echo/umdf2/driver/AutoSync/echoum.inx and b/general/echo/umdf2/driver/AutoSync/echoum.inx differ diff --git a/general/pcidrv/kmdf/genpci.inx b/general/pcidrv/kmdf/genpci.inx index 1ccf8ca9..db6e5c55 100644 Binary files a/general/pcidrv/kmdf/genpci.inx and b/general/pcidrv/kmdf/genpci.inx differ diff --git a/hid/vhidmini2/driver/kmdf/vhidmini.inx b/hid/vhidmini2/driver/kmdf/vhidmini.inx index 3e709ef6..9d78ad34 100644 Binary files a/hid/vhidmini2/driver/kmdf/vhidmini.inx and b/hid/vhidmini2/driver/kmdf/vhidmini.inx differ diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx index 73bf251c..50ddab0b 100644 Binary files a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx and b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx differ diff --git a/serial/VirtualSerial2/ComPort/virtualserial2um.inx b/serial/VirtualSerial2/ComPort/virtualserial2um.inx index 6d95d795..6caf7773 100644 Binary files a/serial/VirtualSerial2/ComPort/virtualserial2um.inx and b/serial/VirtualSerial2/ComPort/virtualserial2um.inx differ diff --git a/serial/VirtualSerial2/FakeModem/fakemodem2um.inx b/serial/VirtualSerial2/FakeModem/fakemodem2um.inx index 35bbc3c5..0e5ad80b 100644 Binary files a/serial/VirtualSerial2/FakeModem/fakemodem2um.inx and b/serial/VirtualSerial2/FakeModem/fakemodem2um.inx differ diff --git a/serial/serial/serial.inx b/serial/serial/serial.inx index 3322653b..2a2cdc66 100644 Binary files a/serial/serial/serial.inx and b/serial/serial/serial.inx differ diff --git a/usb/UcmCxUcsi/UcmCxUcsi.inf b/usb/UcmCxUcsi/UcmCxUcsi.inf index 9e876946..e5b7ae7b 100644 Binary files a/usb/UcmCxUcsi/UcmCxUcsi.inf and b/usb/UcmCxUcsi/UcmCxUcsi.inf differ diff --git a/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf b/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf index 9fbeeeec..51dc78c4 100644 Binary files a/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf and b/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf differ diff --git a/usb/usbsamp/sys/driver/usbsamp.inx b/usb/usbsamp/sys/driver/usbsamp.inx index 5b16de78..8a1b4997 100644 Binary files a/usb/usbsamp/sys/driver/usbsamp.inx and b/usb/usbsamp/sys/driver/usbsamp.inx differ -- cgit v1.3.1 From 43abc35b1ce93067cb0dbfbe7f26c2f01974f78a Mon Sep 17 00:00:00 2001 From: Wei Mao Date: Fri, 13 Jan 2023 12:58:53 -0800 Subject: [DirID-13] toaster sample drivers Change INF files with the following: - Use Driver Store DirID = 13 which are available starting Windows 10 1809 - Remove WDF coinstaller - Add PnpLockdown = 1 --- .../toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx | Bin 5754 -> 4740 bytes .../toaster/toastDrv/kmdf/bus/static/statbus.inx | Bin 5658 -> 4684 bytes general/toaster/toastDrv/kmdf/filter/filter.inx | Bin 7318 -> 6208 bytes .../toastDrv/kmdf/func/featured/wdffeatured.inx | Bin 5870 -> 5022 bytes .../toastDrv/kmdf/func/simple/wdfsimple.inx | Bin 6838 -> 6020 bytes .../toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx | Bin 4598 -> 3910 bytes general/toaster/toastpkg/inf/toastpkg.inf | 38 ++++++++++++--------- general/toaster/toastpkg/toastcd/toastpkg.inf | 38 ++++++++++++--------- general/toaster/umdf2/filter/generic/filterum.inx | Bin 4904 -> 5060 bytes .../toaster/umdf2/func/featured/wdffeaturedum.inx | Bin 4924 -> 5092 bytes general/toaster/umdf2/func/simple/wdfsimpleum.inx | Bin 4796 -> 4964 bytes 11 files changed, 42 insertions(+), 34 deletions(-) diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx index c51e1e9b..912596fd 100644 Binary files a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx and b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx differ diff --git a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx index a28b3144..7a7053ae 100644 Binary files a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx and b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx differ diff --git a/general/toaster/toastDrv/kmdf/filter/filter.inx b/general/toaster/toastDrv/kmdf/filter/filter.inx index d579ff7e..7958ef4d 100644 Binary files a/general/toaster/toastDrv/kmdf/filter/filter.inx and b/general/toaster/toastDrv/kmdf/filter/filter.inx differ diff --git a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx index 73a1a1ea..4b7f091f 100644 Binary files a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx and b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx differ diff --git a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx index 69fbea75..22ef9301 100644 Binary files a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx and b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx differ diff --git a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx index cfee1b11..2986b5e4 100644 Binary files a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx and b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx differ diff --git a/general/toaster/toastpkg/inf/toastpkg.inf b/general/toaster/toastpkg/inf/toastpkg.inf index 04ac6103..a2a1982c 100644 --- a/general/toaster/toastpkg/inf/toastpkg.inf +++ b/general/toaster/toastpkg/inf/toastpkg.inf @@ -18,6 +18,9 @@ ; This is a mutlios INF file. Same INF file cab be used on ; x86, ia64 and amd64 platforms. ; +; Important: +; This INF depends on features for the Driver Store DIRIDs which are available starting Windows 10 1809 +; ;--*/ [Version] Signature="$WINDOWS NT$" @@ -28,15 +31,29 @@ DriverVer=09/21/2006,6.0.5736.1 CatalogFile.NTx86 = tostx86.cat CatalogFile.NTIA64 = tostia64.cat CatalogFile.NTAMD64 = tstamd64.cat +PnpLockdown = 1 [DestinationDirs] -DefaultDestDir = 12 +DefaultDestDir = 13 CoInstaller_CopyFiles = 11 +[SourceDisksNames.x86] +1 = %DiskId1%, toastpkg.tag,,\i386 + +[SourceDisksNames.ia64] +1 = %DiskId1%, toastpkg.tag,,\ia64 + +[SourceDisksNames.amd64] +1 = %DiskId1%, toastpkg.tag,,\amd64 + +[SourceDisksFiles] +toaster.sys = 1,, +tostrco2.dll = 1,, + ; ================= Class section ===================== [ClassInstall32] -Addreg=ToasterClassReg +Addreg=ToasterClassReg CopyFiles=ToasterClassInstallerCopyFiles [ToasterClassReg] @@ -82,9 +99,9 @@ AddService = toaster, %SPSVCINST_ASSOCSERVICE%, toaster_Service_Inst [toaster_Service_Inst] DisplayName = %toaster.SVCDESC% ServiceType = 1 ; SERVICE_KERNEL_DRIVER -StartType = 3 ; SERVICE_DEMAND_START +StartType = 3 ; SERVICE_DEMAND_START ErrorControl = 1 ; SERVICE_ERROR_NORMAL -ServiceBinary = %12%\toaster.sys +ServiceBinary = %13%\toaster.sys ;-------------- Coinstaller installation @@ -103,19 +120,6 @@ HKR,,CoInstallers32,0x00010000,"tostrco2.dll,ToasterCoInstaller" ; located (so it can launch value-added setup programs). OriginalInfSourcePath = %1% -[SourceDisksNames.x86] -1 = %DiskId1%, toastpkg.tag,,\i386 - -[SourceDisksNames.ia64] -1 = %DiskId1%, toastpkg.tag,,\ia64 - -[SourceDisksNames.amd64] -1 = %DiskId1%, toastpkg.tag,,\amd64 - -[SourceDisksFiles] -toaster.sys = 1,, -tostrco2.dll = 1,, - [Strings] SPSVCINST_ASSOCSERVICE= 0x00000002 ProviderName = "TODO-Set-Provider" diff --git a/general/toaster/toastpkg/toastcd/toastpkg.inf b/general/toaster/toastpkg/toastcd/toastpkg.inf index 04ac6103..a2a1982c 100644 --- a/general/toaster/toastpkg/toastcd/toastpkg.inf +++ b/general/toaster/toastpkg/toastcd/toastpkg.inf @@ -18,6 +18,9 @@ ; This is a mutlios INF file. Same INF file cab be used on ; x86, ia64 and amd64 platforms. ; +; Important: +; This INF depends on features for the Driver Store DIRIDs which are available starting Windows 10 1809 +; ;--*/ [Version] Signature="$WINDOWS NT$" @@ -28,15 +31,29 @@ DriverVer=09/21/2006,6.0.5736.1 CatalogFile.NTx86 = tostx86.cat CatalogFile.NTIA64 = tostia64.cat CatalogFile.NTAMD64 = tstamd64.cat +PnpLockdown = 1 [DestinationDirs] -DefaultDestDir = 12 +DefaultDestDir = 13 CoInstaller_CopyFiles = 11 +[SourceDisksNames.x86] +1 = %DiskId1%, toastpkg.tag,,\i386 + +[SourceDisksNames.ia64] +1 = %DiskId1%, toastpkg.tag,,\ia64 + +[SourceDisksNames.amd64] +1 = %DiskId1%, toastpkg.tag,,\amd64 + +[SourceDisksFiles] +toaster.sys = 1,, +tostrco2.dll = 1,, + ; ================= Class section ===================== [ClassInstall32] -Addreg=ToasterClassReg +Addreg=ToasterClassReg CopyFiles=ToasterClassInstallerCopyFiles [ToasterClassReg] @@ -82,9 +99,9 @@ AddService = toaster, %SPSVCINST_ASSOCSERVICE%, toaster_Service_Inst [toaster_Service_Inst] DisplayName = %toaster.SVCDESC% ServiceType = 1 ; SERVICE_KERNEL_DRIVER -StartType = 3 ; SERVICE_DEMAND_START +StartType = 3 ; SERVICE_DEMAND_START ErrorControl = 1 ; SERVICE_ERROR_NORMAL -ServiceBinary = %12%\toaster.sys +ServiceBinary = %13%\toaster.sys ;-------------- Coinstaller installation @@ -103,19 +120,6 @@ HKR,,CoInstallers32,0x00010000,"tostrco2.dll,ToasterCoInstaller" ; located (so it can launch value-added setup programs). OriginalInfSourcePath = %1% -[SourceDisksNames.x86] -1 = %DiskId1%, toastpkg.tag,,\i386 - -[SourceDisksNames.ia64] -1 = %DiskId1%, toastpkg.tag,,\ia64 - -[SourceDisksNames.amd64] -1 = %DiskId1%, toastpkg.tag,,\amd64 - -[SourceDisksFiles] -toaster.sys = 1,, -tostrco2.dll = 1,, - [Strings] SPSVCINST_ASSOCSERVICE= 0x00000002 ProviderName = "TODO-Set-Provider" diff --git a/general/toaster/umdf2/filter/generic/filterum.inx b/general/toaster/umdf2/filter/generic/filterum.inx index 0efeb0d3..03dda4ff 100644 Binary files a/general/toaster/umdf2/filter/generic/filterum.inx and b/general/toaster/umdf2/filter/generic/filterum.inx differ diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.inx b/general/toaster/umdf2/func/featured/wdffeaturedum.inx index bb8af311..4444f23c 100644 Binary files a/general/toaster/umdf2/func/featured/wdffeaturedum.inx and b/general/toaster/umdf2/func/featured/wdffeaturedum.inx differ diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.inx b/general/toaster/umdf2/func/simple/wdfsimpleum.inx index 3187b27f..4bc7c4e4 100644 Binary files a/general/toaster/umdf2/func/simple/wdfsimpleum.inx and b/general/toaster/umdf2/func/simple/wdfsimpleum.inx differ -- cgit v1.3.1 From 51fed2a629bc5b15e6bdc43e6eeeb2be74c28870 Mon Sep 17 00:00:00 2001 From: Wei Mao Date: Fri, 13 Jan 2023 21:35:44 -0800 Subject: [DirID-13] hid, input, pofx, serial, spb, wmi Change INF files with the following: - Use Driver Store DirID = 13 which are available starting Windows 10 1809 - Remove WDF coinstaller - Add PnpLockdown = 1 --- hid/firefly/driver/firefly.inx | Bin 7280 -> 6500 bytes hid/hidusbfx2/sys/hidusbfx2.inx | Bin 12214 -> 10346 bytes hid/vhidmini2/driver/kmdf/vhidmini.inx | Bin 4814 -> 5066 bytes hid/vhidmini2/driver/umdf2/VhidminiUm.inx | Bin 5552 -> 5556 bytes input/kbfiltr/sys/kbfiltr.inx | Bin 5714 -> 4924 bytes input/moufiltr/moufiltr.inx | Bin 5704 -> 4900 bytes .../SingleComp/SingleComponentSingleStateUm.inx | Bin 4472 -> 4646 bytes pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx | Bin 3898 -> 3560 bytes .../SingleComp/SingleComponentFStateSample.inx | Bin 6220 -> 5212 bytes serial/VirtualSerial2/FakeModem/fakemodem2um.inx | Bin 16596 -> 16766 bytes spb/SkeletonI2C/skeletoni2c.inx | Bin 3874 -> 4032 bytes spb/SpbTestTool/sys/spbtesttool.inx | Bin 4688 -> 4964 bytes wmi/wmisamp/wmisamp.inx | Bin 6046 -> 5160 bytes 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/hid/firefly/driver/firefly.inx b/hid/firefly/driver/firefly.inx index da7c841c..deff9919 100644 Binary files a/hid/firefly/driver/firefly.inx and b/hid/firefly/driver/firefly.inx differ diff --git a/hid/hidusbfx2/sys/hidusbfx2.inx b/hid/hidusbfx2/sys/hidusbfx2.inx index 43a55fb0..22f32303 100644 Binary files a/hid/hidusbfx2/sys/hidusbfx2.inx and b/hid/hidusbfx2/sys/hidusbfx2.inx differ diff --git a/hid/vhidmini2/driver/kmdf/vhidmini.inx b/hid/vhidmini2/driver/kmdf/vhidmini.inx index 9d78ad34..771d664d 100644 Binary files a/hid/vhidmini2/driver/kmdf/vhidmini.inx and b/hid/vhidmini2/driver/kmdf/vhidmini.inx differ diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx index 50ddab0b..30855f4a 100644 Binary files a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx and b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx differ diff --git a/input/kbfiltr/sys/kbfiltr.inx b/input/kbfiltr/sys/kbfiltr.inx index d5788b55..190d458b 100644 Binary files a/input/kbfiltr/sys/kbfiltr.inx and b/input/kbfiltr/sys/kbfiltr.inx differ diff --git a/input/moufiltr/moufiltr.inx b/input/moufiltr/moufiltr.inx index 406de846..4268a83a 100644 Binary files a/input/moufiltr/moufiltr.inx and b/input/moufiltr/moufiltr.inx differ diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx index 7eab5b70..697ccda5 100644 Binary files a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx and b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx differ diff --git a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx index 3a02e75f..c00074d5 100644 Binary files a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx and b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx differ diff --git a/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx b/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx index 2a15c660..ca9dfc6b 100644 Binary files a/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx and b/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx differ diff --git a/serial/VirtualSerial2/FakeModem/fakemodem2um.inx b/serial/VirtualSerial2/FakeModem/fakemodem2um.inx index 0e5ad80b..4e550c87 100644 Binary files a/serial/VirtualSerial2/FakeModem/fakemodem2um.inx and b/serial/VirtualSerial2/FakeModem/fakemodem2um.inx differ diff --git a/spb/SkeletonI2C/skeletoni2c.inx b/spb/SkeletonI2C/skeletoni2c.inx index 1a911e9d..4c42c7db 100644 Binary files a/spb/SkeletonI2C/skeletoni2c.inx and b/spb/SkeletonI2C/skeletoni2c.inx differ diff --git a/spb/SpbTestTool/sys/spbtesttool.inx b/spb/SpbTestTool/sys/spbtesttool.inx index ae1a4fe4..bf337b3e 100644 Binary files a/spb/SpbTestTool/sys/spbtesttool.inx and b/spb/SpbTestTool/sys/spbtesttool.inx differ diff --git a/wmi/wmisamp/wmisamp.inx b/wmi/wmisamp/wmisamp.inx index 800fda27..c4c48070 100644 Binary files a/wmi/wmisamp/wmisamp.inx and b/wmi/wmisamp/wmisamp.inx differ -- cgit v1.3.1 From 8b17742dda77e6ae08fb8bbda9b97943f2efd454 Mon Sep 17 00:00:00 2001 From: Wei Mao Date: Fri, 13 Jan 2023 22:12:38 -0800 Subject: [DirID-13] usb Change INF files with the following: - Use Driver Store DirID = 13 which are available starting Windows 10 1809 - Remove WDF coinstaller - Add PnpLockdown = 1 --- .../UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf | 13 ++++++++----- usb/ufxclientsample/UfxClientSample.inx | Bin 4136 -> 4418 bytes usb/umdf2_fx2/driver/osrusbfx2um.inx | Bin 6348 -> 6498 bytes usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx | Bin 5540 -> 4992 bytes usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx | Bin 5540 -> 4992 bytes usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx | Bin 5540 -> 4992 bytes usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx | Bin 5540 -> 4992 bytes usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx | Bin 5540 -> 4992 bytes 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf index 04be1394..acd7fd49 100644 --- a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf +++ b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf @@ -9,15 +9,21 @@ ; ; INF for installing the UCM-UCSI ACPI client driver. ; +; Important: +; This INF depends on features for the Driver Store DIRIDs which are available starting Windows 10 1809 +; [Version] Signature = "$WINDOWS NT$" Class = UCM ClassGuid = {e6f1aa1c-7f3b-4473-b2e8-c97d8ac71d53} Provider = %ProviderName% -PnpLockdown = 1 DriverVer = 06/21/2006,10.0.17741.1000 CatalogFile = UcmUcsiAcpiSample.cat +PnpLockdown = 1 + +[DestinationDirs] +DefaultDestDir = 13 [SourceDisksNames] 3426 = windows cd @@ -25,9 +31,6 @@ CatalogFile = UcmUcsiAcpiSample.cat [SourceDisksFiles] UcmUcsiAcpiSample.sys = 3426 -[DestinationDirs] -DefaultDestDir = 12 - [Manufacturer] %ProviderName% = UcmUcsiAcpiSample, NT$ARCH$ @@ -49,7 +52,7 @@ DisplayName = %UcmUcsiAcpiSample.ServiceName% ServiceType = 1 StartType = 3 ErrorControl = 1 -ServiceBinary = %12%\UcmUcsiAcpiSample.sys +ServiceBinary = %13%\UcmUcsiAcpiSample.sys Dependencies = UcmUcsiCx [Strings] diff --git a/usb/ufxclientsample/UfxClientSample.inx b/usb/ufxclientsample/UfxClientSample.inx index 51525cc8..098e442e 100644 Binary files a/usb/ufxclientsample/UfxClientSample.inx and b/usb/ufxclientsample/UfxClientSample.inx differ diff --git a/usb/umdf2_fx2/driver/osrusbfx2um.inx b/usb/umdf2_fx2/driver/osrusbfx2um.inx index f7f8f16c..18e33282 100644 Binary files a/usb/umdf2_fx2/driver/osrusbfx2um.inx and b/usb/umdf2_fx2/driver/osrusbfx2um.inx differ diff --git a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx index c8678d1e..ddd17e82 100644 Binary files a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx and b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx differ diff --git a/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx index c8678d1e..ddd17e82 100644 Binary files a/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx and b/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx differ diff --git a/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx index c8678d1e..ddd17e82 100644 Binary files a/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx and b/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx differ diff --git a/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx index c8678d1e..ddd17e82 100644 Binary files a/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx and b/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx differ diff --git a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx index c8678d1e..ddd17e82 100644 Binary files a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx and b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx differ -- cgit v1.3.1 From 217e46c9844145bf0bee397a916ddc5bffe26d02 Mon Sep 17 00:00:00 2001 From: Wei Mao Date: Sun, 15 Jan 2023 14:54:25 -0800 Subject: Fix: Invalid flag 0x4000, cannot be used with DIRID 13 --- general/toaster/umdf2/filter/generic/filterum.inx | Bin 5060 -> 4908 bytes general/toaster/umdf2/func/featured/wdffeaturedum.inx | Bin 5092 -> 5012 bytes general/toaster/umdf2/func/simple/wdfsimpleum.inx | Bin 4964 -> 4888 bytes .../SingleComp/SingleComponentSingleStateUm.inx | Bin 4646 -> 4554 bytes usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx | Bin 5984 -> 5276 bytes usb/kmdf_fx2/driver/osrusbfx2.inx | Bin 7628 -> 6938 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/general/toaster/umdf2/filter/generic/filterum.inx b/general/toaster/umdf2/filter/generic/filterum.inx index 03dda4ff..db5e7a28 100644 Binary files a/general/toaster/umdf2/filter/generic/filterum.inx and b/general/toaster/umdf2/filter/generic/filterum.inx differ diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.inx b/general/toaster/umdf2/func/featured/wdffeaturedum.inx index 4444f23c..2c251ffd 100644 Binary files a/general/toaster/umdf2/func/featured/wdffeaturedum.inx and b/general/toaster/umdf2/func/featured/wdffeaturedum.inx differ diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.inx b/general/toaster/umdf2/func/simple/wdfsimpleum.inx index 4bc7c4e4..8f28fbaa 100644 Binary files a/general/toaster/umdf2/func/simple/wdfsimpleum.inx and b/general/toaster/umdf2/func/simple/wdfsimpleum.inx differ diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx index 697ccda5..27a79e16 100644 Binary files a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx and b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx differ diff --git a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx index 7336000f..384d83fc 100644 Binary files a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx and b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx differ diff --git a/usb/kmdf_fx2/driver/osrusbfx2.inx b/usb/kmdf_fx2/driver/osrusbfx2.inx index 68e0ff48..9d7263ce 100644 Binary files a/usb/kmdf_fx2/driver/osrusbfx2.inx and b/usb/kmdf_fx2/driver/osrusbfx2.inx differ -- cgit v1.3.1