[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

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
--- a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx
+++ b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx
diff --git a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx
index a28b3144..7a7053ae 100644
--- a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx
+++ b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx
diff --git a/general/toaster/toastDrv/kmdf/filter/filter.inx b/general/toaster/toastDrv/kmdf/filter/filter.inx
index d579ff7e..7958ef4d 100644
--- a/general/toaster/toastDrv/kmdf/filter/filter.inx
+++ b/general/toaster/toastDrv/kmdf/filter/filter.inx
diff --git a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx
index 73a1a1ea..4b7f091f 100644
--- a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx
+++ b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx
diff --git a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx
index 69fbea75..22ef9301 100644
--- a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx
+++ b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx
diff --git a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx
index cfee1b11..2986b5e4 100644
--- a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx
+++ b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx
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
--- a/general/toaster/umdf2/filter/generic/filterum.inx
+++ b/general/toaster/umdf2/filter/generic/filterum.inx
diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.inx b/general/toaster/umdf2/func/featured/wdffeaturedum.inx
index bb8af311..4444f23c 100644
--- a/general/toaster/umdf2/func/featured/wdffeaturedum.inx
+++ b/general/toaster/umdf2/func/featured/wdffeaturedum.inx
diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.inx b/general/toaster/umdf2/func/simple/wdfsimpleum.inx
index 3187b27f..4bc7c4e4 100644
--- a/general/toaster/umdf2/func/simple/wdfsimpleum.inx
+++ b/general/toaster/umdf2/func/simple/wdfsimpleum.inx