From 8b17742dda77e6ae08fb8bbda9b97943f2efd454 Mon Sep 17 00:00:00 2001 From: Wei Mao Date: Fri, 13 Jan 2023 22:12:38 -0800 Subject: [PATCH] [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 04be1394d..acd7fd492 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 51525cc852400f9dc84666ea0dfca1a6d35ff564..098e442ea3b6a9519b053c40b6820e82dc1b45fc 100644 GIT binary patch delta 316 zcmXYs&k6xi6vn?XvA`_tZx<`!3$Wbc?0Doyo6Wq z-AlK7&bhyHzVCMK;+cK~`oY2iOZZqJzyKa&1qR}%Li|q$Q@B|3Wubu@vkiwDhtsy= zJ}ZGS$$X(#iR*TtN1 z$SB#G7P23Zdzg@PRb}(zopQ<}N18{8x%^-3w_X-mWDxH4x0Y&By+oa=5oTOUs=ag3 X=xc@ZG5HF6(MycwCvgj}#wqdztj9cf delta 46 zcmV+}0MY-#BB&s+bOW<&1mFR)eg~Qc1u_6709=z%3L%p|4tA5q2E3DU21)@kv#So5 E0(T-0bN~PV diff --git a/usb/umdf2_fx2/driver/osrusbfx2um.inx b/usb/umdf2_fx2/driver/osrusbfx2um.inx index f7f8f16cccc70253b54e8a29d024f7b92feeca97..18e3328209f0207c60f6514c1969afc7fc3615fb 100644 GIT binary patch delta 330 zcmX?O_{eBO4RfR?LoP!BLq0ZW zNT)EQ0`;Tiy=h2vd->`aC-AioHxA{ZzOvMCkF zb^)3e1jH_26UxDMBm+qWpcxPqi9mgcK;1b&G6_h6bQObL336*D(9ZP9h5W+2h71Nk z8AApOAZ@uhpSh7yG5{!9z~BS4ESVu2=*WDAa-fJUgW+UVUT;R@$PcXO9AZhpoq!L&)hjB&GtpabLNC4wT8`-G$>uM!HG Uyg*O_$d;J=Mo4J0i*N@k0Hz;ErT_o{ delta 220 zcmaE4bjEN)4fEy_mJ-HI>~Tz!SFlM;&SRUlIgWD^GrtjoDnkrID1$G93xgX&%;Z`& z`OPN0A&irG*c`Hr7_%$hcs#qmbz24Z;%4u?z~6orOc$6~Kmr#W!yd-oy$3_1-Zq diff --git a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx index c8678d1e302b65e15cf0ec9e4c232b6bf3cef26b..ddd17e82afe77751aac9aa019fa64d33aed8ba5e 100644 GIT binary patch delta 338 zcmXYs!D_-l5QhIW@t`z^9!oEKDFr29@KRfPDN+a&5ta7hMNQPuHnD2;7+=9|AE8GN z!aj+wAbp4){dWz^&dh!@|G&&{Wqq@2*;#-OOp#)S1^P%B@8F_@dx-pWF+q$uUjdqU zVh#~e6LC5;JY^*?BI#5AMX$*4k?|E|6B2<2J2955XMA_lH>_tk6&Rp!^LDnU%!~??Kl15rKEbt(iP30tJ+Crja5zH> zLmGoKLq3BiLmophLkUA7Lk;eU_o=glkDgaGDc6TDs2bnWMHLv7fbmDw6s7`Bo;rAqRoeWKub%|~`3jCr diff --git a/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx index c8678d1e302b65e15cf0ec9e4c232b6bf3cef26b..ddd17e82afe77751aac9aa019fa64d33aed8ba5e 100644 GIT binary patch delta 338 zcmXYs!D_-l5QhIW@t`z^9!oEKDFr29@KRfPDN+a&5ta7hMNQPuHnD2;7+=9|AE8GN z!aj+wAbp4){dWz^&dh!@|G&&{Wqq@2*;#-OOp#)S1^P%B@8F_@dx-pWF+q$uUjdqU zVh#~e6LC5;JY^*?BI#5AMX$*4k?|E|6B2<2J2955XMA_lH>_tk6&Rp!^LDnU%!~??Kl15rKEbt(iP30tJ+Crja5zH> zLmGoKLq3BiLmophLkUA7Lk;eU_o=glkDgaGDc6TDs2bnWMHLv7fbmDw6s7`Bo;rAqRoeWKub%|~`3jCr diff --git a/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx index c8678d1e302b65e15cf0ec9e4c232b6bf3cef26b..ddd17e82afe77751aac9aa019fa64d33aed8ba5e 100644 GIT binary patch delta 338 zcmXYs!D_-l5QhIW@t`z^9!oEKDFr29@KRfPDN+a&5ta7hMNQPuHnD2;7+=9|AE8GN z!aj+wAbp4){dWz^&dh!@|G&&{Wqq@2*;#-OOp#)S1^P%B@8F_@dx-pWF+q$uUjdqU zVh#~e6LC5;JY^*?BI#5AMX$*4k?|E|6B2<2J2955XMA_lH>_tk6&Rp!^LDnU%!~??Kl15rKEbt(iP30tJ+Crja5zH> zLmGoKLq3BiLmophLkUA7Lk;eU_o=glkDgaGDc6TDs2bnWMHLv7fbmDw6s7`Bo;rAqRoeWKub%|~`3jCr diff --git a/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx index c8678d1e302b65e15cf0ec9e4c232b6bf3cef26b..ddd17e82afe77751aac9aa019fa64d33aed8ba5e 100644 GIT binary patch delta 338 zcmXYs!D_-l5QhIW@t`z^9!oEKDFr29@KRfPDN+a&5ta7hMNQPuHnD2;7+=9|AE8GN z!aj+wAbp4){dWz^&dh!@|G&&{Wqq@2*;#-OOp#)S1^P%B@8F_@dx-pWF+q$uUjdqU zVh#~e6LC5;JY^*?BI#5AMX$*4k?|E|6B2<2J2955XMA_lH>_tk6&Rp!^LDnU%!~??Kl15rKEbt(iP30tJ+Crja5zH> zLmGoKLq3BiLmophLkUA7Lk;eU_o=glkDgaGDc6TDs2bnWMHLv7fbmDw6s7`Bo;rAqRoeWKub%|~`3jCr diff --git a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx index c8678d1e302b65e15cf0ec9e4c232b6bf3cef26b..ddd17e82afe77751aac9aa019fa64d33aed8ba5e 100644 GIT binary patch delta 338 zcmXYs!D_-l5QhIW@t`z^9!oEKDFr29@KRfPDN+a&5ta7hMNQPuHnD2;7+=9|AE8GN z!aj+wAbp4){dWz^&dh!@|G&&{Wqq@2*;#-OOp#)S1^P%B@8F_@dx-pWF+q$uUjdqU zVh#~e6LC5;JY^*?BI#5AMX$*4k?|E|6B2<2J2955XMA_lH>_tk6&Rp!^LDnU%!~??Kl15rKEbt(iP30tJ+Crja5zH> zLmGoKLq3BiLmophLkUA7Lk;eU_o=glkDgaGDc6TDs2bnWMHLv7fbmDw6s7`Bo;rAqRoeWKub%|~`3jCr