[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

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
--- 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
index f7f8f16c..18e33282 100644
--- a/usb/umdf2_fx2/driver/osrusbfx2um.inx
+++ b/usb/umdf2_fx2/driver/osrusbfx2um.inx
diff --git a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx
index 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
index 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
index 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
index 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
index c8678d1e..ddd17e82 100644
--- a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx
+++ b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx