diff options
| author | Wei Mao <[email protected]> | 2023-01-15 15:37:52 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-01-15 15:37:52 -0800 |
| commit | 13092c638c30acbe2dec7d4be53d0d0d5bfb7487 (patch) | |
| tree | 4c421bbb5a5e47fac8390e52ced2c8e924aa76b6 /usb | |
| parent | 8ff2c86adcfbe50187d2aeb38a842095b137b7e4 (diff) | |
| parent | 217e46c9844145bf0bee397a916ddc5bffe26d02 (diff) | |
Merge pull request #834 - Update WDF samples to use DIRID=13 (Driver Store)
## Why is this change being made?
[Driver package isolation](https://learn.microsoft.com/en-us/windows-hardware/drivers/develop/driver-isolation) is a requirement for Windows Drivers that makes driver packages more resilient to external changes, easier to update, and more straightforward to install.
One of such requirements is to for driver to [run from the driver store](https://learn.microsoft.com/en-us/windows-hardware/drivers/develop/run-from-driver-store), which means to use `DIRID = 13` in INF file, `DestinationDirs` section and `ServiceBinary` directive.
## What changed?
Update generic WDF samples to use DIRID = 13. Specifically, it touches the following sample folders:
- general, toaster, usb, hid, input, serial, pofx, spb, wmi
Note it does not touch areas that are owned by individual driver classes, e.g., network, storage, file system.
This change does mean that the sample **won't work on older OS** (prior to Win10 version 1809) where DIRID 13 is not fully supported. To find the original sample, please look at https://github.com/microsoft/Windows-driver-samples/tree/win11-22h2.
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/UcmCxUcsi/UcmCxUcsi.inf | bin | 2700 -> 3888 bytes | |||
| -rw-r--r-- | usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf | bin | 3024 -> 3300 bytes | |||
| -rw-r--r-- | usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf | 13 | ||||
| -rw-r--r-- | usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx | bin | 5984 -> 5276 bytes | |||
| -rw-r--r-- | usb/kmdf_fx2/driver/osrusbfx2.inx | bin | 7628 -> 6938 bytes | |||
| -rw-r--r-- | usb/ufxclientsample/UfxClientSample.inx | bin | 4136 -> 4418 bytes | |||
| -rw-r--r-- | usb/umdf2_fx2/driver/osrusbfx2um.inx | bin | 6348 -> 6498 bytes | |||
| -rw-r--r-- | usb/usbsamp/sys/driver/usbsamp.inx | bin | 6444 -> 5766 bytes | |||
| -rw-r--r-- | usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx | bin | 5540 -> 4992 bytes | |||
| -rw-r--r-- | usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx | bin | 5540 -> 4992 bytes | |||
| -rw-r--r-- | usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx | bin | 5540 -> 4992 bytes | |||
| -rw-r--r-- | usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx | bin | 5540 -> 4992 bytes | |||
| -rw-r--r-- | usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx | bin | 5540 -> 4992 bytes |
13 files changed, 8 insertions, 5 deletions
diff --git a/usb/UcmCxUcsi/UcmCxUcsi.inf b/usb/UcmCxUcsi/UcmCxUcsi.inf Binary files differindex 9e876946..e5b7ae7b 100644 --- a/usb/UcmCxUcsi/UcmCxUcsi.inf +++ b/usb/UcmCxUcsi/UcmCxUcsi.inf diff --git a/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf b/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf Binary files differindex 9fbeeeec..51dc78c4 100644 --- a/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf +++ b/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf 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/kmdf_enumswitches/sys/kmdf_enumswitches.inx b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx Binary files differindex 7336000f..384d83fc 100644 --- a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx +++ b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx diff --git a/usb/kmdf_fx2/driver/osrusbfx2.inx b/usb/kmdf_fx2/driver/osrusbfx2.inx Binary files differindex 68e0ff48..9d7263ce 100644 --- a/usb/kmdf_fx2/driver/osrusbfx2.inx +++ b/usb/kmdf_fx2/driver/osrusbfx2.inx diff --git a/usb/ufxclientsample/UfxClientSample.inx b/usb/ufxclientsample/UfxClientSample.inx Binary files differindex 51525cc8..098e442e 100644 --- a/usb/ufxclientsample/UfxClientSample.inx +++ b/usb/ufxclientsample/UfxClientSample.inx diff --git a/usb/umdf2_fx2/driver/osrusbfx2um.inx b/usb/umdf2_fx2/driver/osrusbfx2um.inx Binary files differindex f7f8f16c..18e33282 100644 --- a/usb/umdf2_fx2/driver/osrusbfx2um.inx +++ b/usb/umdf2_fx2/driver/osrusbfx2um.inx diff --git a/usb/usbsamp/sys/driver/usbsamp.inx b/usb/usbsamp/sys/driver/usbsamp.inx Binary files differindex 5b16de78..8a1b4997 100644 --- a/usb/usbsamp/sys/driver/usbsamp.inx +++ b/usb/usbsamp/sys/driver/usbsamp.inx diff --git a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx Binary files differindex c8678d1e..ddd17e82 100644 --- a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx +++ b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx diff --git a/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx Binary files differindex c8678d1e..ddd17e82 100644 --- a/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx +++ b/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx diff --git a/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx Binary files differindex c8678d1e..ddd17e82 100644 --- a/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx +++ b/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx diff --git a/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx Binary files differindex c8678d1e..ddd17e82 100644 --- a/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx +++ b/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx diff --git a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx Binary files differindex c8678d1e..ddd17e82 100644 --- a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx +++ b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx |
