[general/toaster/toastpkg] update INF; remove toastcd (#936)

 - Remove reference to coinstaller. They are deprecated.
 - Remove support for multiple-arch. No many needs for such a feature, and they do not play well with InfVerif
 - Remove toastcd folder. They are basically the binary result of sibling folders.

15 files changed, 3 insertions, 163 deletions

diff --git a/general/toaster/toastpkg/inf/toastpkg.inf b/general/toaster/toastpkg/inf/toastpkg.inf
index 1c39e9b4..772fbc03 100644
--- a/general/toaster/toastpkg/inf/toastpkg.inf
+++ b/general/toaster/toastpkg/inf/toastpkg.inf
@@ -15,8 +15,6 @@
 ;
 ;    INF file for installing toaster device drivers (and, optionally, value-
 ;    added software) via device-specific coinstaller.
-;    This is a mutlios INF file. Same INF file cab be used on
-;    x86 and amd64 platforms.
 ;
 ; Important:
 ;    This INF depends on features for the Driver Store DIRIDs which are available starting Windows 10 1709
@@ -28,23 +26,17 @@ Class=TOASTER
 ClassGuid={B85B7C50-6A01-11d2-B841-00C04FAD5171}
 Provider=%ProviderName%
 DriverVer=09/21/2006,6.0.5736.1
-CatalogFile.NTx86  = tostx86.cat
-CatalogFile.NTAMD64 = tstamd64.cat
+CatalogFile = toastpkg.cat
 PnpLockdown = 1
 
 [DestinationDirs]
 DefaultDestDir = 13
-CoInstaller_CopyFiles = 11
 
-[SourceDisksNames.x86]
-1 = %DiskId1%, toastpkg.tag,,\i386
-
-[SourceDisksNames.amd64]
-1 = %DiskId1%, toastpkg.tag,,\amd64
+[SourceDisksNames]
+1 = %DiskId1%
 
 [SourceDisksFiles]
 toaster.sys  = 1,,
-tostrco2.dll = 1,,
 
 ; ================= Class section =====================
 
@@ -95,23 +87,6 @@ StartType      = 3               ; SERVICE_DEMAND_START
 ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
 ServiceBinary  = %13%\toaster.sys
 
-;-------------- Coinstaller installation
-
-[Toaster_Device.NT.CoInstallers]
-AddReg=CoInstaller_AddReg
-CopyFiles=CoInstaller_CopyFiles
-
-[CoInstaller_CopyFiles]
-tostrco2.dll
-
-[CoInstaller_AddReg]
-HKR,,CoInstallers32,0x00010000,"tostrco2.dll,ToasterCoInstaller"
-
-[ToastCoInfo]
-; Used by the toaster co-installer to figure out where the original media is
-; located (so it can launch value-added setup programs).
-OriginalInfSourcePath = %1%
-
 [Strings]
 SPSVCINST_ASSOCSERVICE= 0x00000002
 ProviderName = "TODO-Set-Provider"
diff --git a/general/toaster/toastpkg/toastcd/ToastApp/setup.exe b/general/toaster/toastpkg/toastcd/ToastApp/setup.exe
deleted file mode 100644
index 9fcedf96..00000000
--- a/general/toaster/toastpkg/toastcd/ToastApp/setup.exe
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/ToastApp/setup.ini b/general/toaster/toastpkg/toastcd/ToastApp/setup.ini
deleted file mode 100644
index 81d61154..00000000
--- a/general/toaster/toastpkg/toastcd/ToastApp/setup.ini
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/ToastApp/toastapp.msi b/general/toaster/toastpkg/toastcd/ToastApp/toastapp.msi
deleted file mode 100644
index 0bdfaa65..00000000
--- a/general/toaster/toastpkg/toastcd/ToastApp/toastapp.msi
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/amd64/toaster.sys b/general/toaster/toastpkg/toastcd/amd64/toaster.sys
deleted file mode 100644
index d51da6c4..00000000
--- a/general/toaster/toastpkg/toastcd/amd64/toaster.sys
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/amd64/toastva.exe b/general/toaster/toastpkg/toastcd/amd64/toastva.exe
deleted file mode 100644
index ebd46df9..00000000
--- a/general/toaster/toastpkg/toastcd/amd64/toastva.exe
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/amd64/tostrco2.dll b/general/toaster/toastpkg/toastcd/amd64/tostrco2.dll
deleted file mode 100644
index 58dfab32..00000000
--- a/general/toaster/toastpkg/toastcd/amd64/tostrco2.dll
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/autorun.inf b/general/toaster/toastpkg/toastcd/autorun.inf
deleted file mode 100644
index ee67cf9a..00000000
--- a/general/toaster/toastpkg/toastcd/autorun.inf
+++ /dev/null
@@ -1,12 +0,0 @@
-[AutoRun]
-open=i386\toastva.exe
-icon=i386\toastva.exe,0
-
-[AutoRun.i386]
-open=i386\toastva.exe
-
-[AutoRun.amd64]
-open=amd64\toastva.exe
-
-[DeviceInstall]
-DriverPath=\
diff --git a/general/toaster/toastpkg/toastcd/i386/toaster.sys b/general/toaster/toastpkg/toastcd/i386/toaster.sys
deleted file mode 100644
index 19184dc9..00000000
--- a/general/toaster/toastpkg/toastcd/i386/toaster.sys
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/i386/toastva.exe b/general/toaster/toastpkg/toastcd/i386/toastva.exe
deleted file mode 100644
index 7bbb4a47..00000000
--- a/general/toaster/toastpkg/toastcd/i386/toastva.exe
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/i386/tostrco2.dll b/general/toaster/toastpkg/toastcd/i386/tostrco2.dll
deleted file mode 100644
index 3f7b3ed1..00000000
--- a/general/toaster/toastpkg/toastcd/i386/tostrco2.dll
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/toastpkg.inf b/general/toaster/toastpkg/toastcd/toastpkg.inf
deleted file mode 100644
index 1c39e9b4..00000000
--- a/general/toaster/toastpkg/toastcd/toastpkg.inf
+++ /dev/null
@@ -1,123 +0,0 @@
-;/*++
-;
-;Copyright (c) Microsoft Corporation.  All rights reserved.
-;
-;    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
-;    KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-;    IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
-;    PURPOSE.
-;
-;Module Name:
-;
-;    TOASTPKG.INF
-;
-;Abstract:
-;
-;    INF file for installing toaster device drivers (and, optionally, value-
-;    added software) via device-specific coinstaller.
-;    This is a mutlios INF file. Same INF file cab be used on
-;    x86 and amd64 platforms.
-;
-; Important:
-;    This INF depends on features for the Driver Store DIRIDs which are available starting Windows 10 1709
-;
-;--*/
-[Version]
-Signature="$WINDOWS NT$"
-Class=TOASTER
-ClassGuid={B85B7C50-6A01-11d2-B841-00C04FAD5171}
-Provider=%ProviderName%
-DriverVer=09/21/2006,6.0.5736.1
-CatalogFile.NTx86  = tostx86.cat
-CatalogFile.NTAMD64 = tstamd64.cat
-PnpLockdown = 1
-
-[DestinationDirs]
-DefaultDestDir = 13
-CoInstaller_CopyFiles = 11
-
-[SourceDisksNames.x86]
-1 = %DiskId1%, toastpkg.tag,,\i386
-
-[SourceDisksNames.amd64]
-1 = %DiskId1%, toastpkg.tag,,\amd64
-
-[SourceDisksFiles]
-toaster.sys  = 1,,
-tostrco2.dll = 1,,
-
-; ================= Class section =====================
-
-[ClassInstall32]
-Addreg=ToasterClassReg
-
-[ToasterClassReg]
-HKR,,,0,%ClassName%
-HKR,,Icon,,100
-HKR,,DeviceCharacteristics,0x10001,0x100        ; Use same security checks on relative opens
-
-;*****************************************
-; Toaster Device  Install Section
-;*****************************************
-
-[Manufacturer]
-%ToastRUs%=ToastRUs,NTx86.10.0...16299, NTamd64.10.0...16299
-
-[ToastRUs.NTx86.10.0...16299]
-%ToasterDevice.DeviceDesc%=Toaster_Device, {b85b7c50-6a01-11d2-b841-00c04fad5171}\MsToaster
-
-[ToastRUs.NTamd64.10.0...16299]
-%ToasterDevice.DeviceDesc%=Toaster_Device, {b85b7c50-6a01-11d2-b841-00c04fad5171}\MsToaster
-
-
-[Toaster_Device.NT]
-CopyFiles=Toaster_Device.NT.Copy
-FriendlyNameFormat=%FriendlyNameFormat%
-
-[Toaster_Device.NT.Copy]
-toaster.sys
-
-[Toaster_Device.NT.HW]
-AddReg=Toaster_Device.NT.HW.AddReg
-
-[Toaster_Device.NT.HW.AddReg]
-HKR,,"BeepCount",0x00010003,4
-
-;-------------- Service installation
-
-[Toaster_Device.NT.Services]
-AddService = toaster, %SPSVCINST_ASSOCSERVICE%, toaster_Service_Inst
-
-[toaster_Service_Inst]
-DisplayName    = %toaster.SVCDESC%
-ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
-StartType      = 3               ; SERVICE_DEMAND_START
-ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
-ServiceBinary  = %13%\toaster.sys
-
-;-------------- Coinstaller installation
-
-[Toaster_Device.NT.CoInstallers]
-AddReg=CoInstaller_AddReg
-CopyFiles=CoInstaller_CopyFiles
-
-[CoInstaller_CopyFiles]
-tostrco2.dll
-
-[CoInstaller_AddReg]
-HKR,,CoInstallers32,0x00010000,"tostrco2.dll,ToasterCoInstaller"
-
-[ToastCoInfo]
-; Used by the toaster co-installer to figure out where the original media is
-; located (so it can launch value-added setup programs).
-OriginalInfSourcePath = %1%
-
-[Strings]
-SPSVCINST_ASSOCSERVICE= 0x00000002
-ProviderName = "TODO-Set-Provider"
-ToastRUs = "Toast'R'Us"
-ClassName = "Toaster"
-DiskId1 = "Toaster Device Installation Disk #1"
-ToasterDevice.DeviceDesc = "Toaster Package Sample Toaster"
-toaster.SVCDESC = "Toaster Device Driver"
-FriendlyNameFormat = "ToasterDevice%1!u!"
diff --git a/general/toaster/toastpkg/toastcd/toastpkg.tag b/general/toaster/toastpkg/toastcd/toastpkg.tag
deleted file mode 100644
index e69de29b..00000000
--- a/general/toaster/toastpkg/toastcd/toastpkg.tag
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/tostx86.cat b/general/toaster/toastpkg/toastcd/tostx86.cat
deleted file mode 100644
index e8b604b5..00000000
--- a/general/toaster/toastpkg/toastcd/tostx86.cat
+++ /dev/null
diff --git a/general/toaster/toastpkg/toastcd/tstamd64.cat b/general/toaster/toastpkg/toastcd/tstamd64.cat
deleted file mode 100644
index cd1a8eb6..00000000
--- a/general/toaster/toastpkg/toastcd/tstamd64.cat
+++ /dev/null