Updated for "Windows 10 Anniversary Update" (Version 1607)

10 files changed, 173 insertions, 60 deletions

diff --git a/general/toaster/toastpkg/README.md b/general/toaster/toastpkg/README.md
index 7a5b7855..326d40a9 100644
--- a/general/toaster/toastpkg/README.md
+++ b/general/toaster/toastpkg/README.md
@@ -1,21 +1,134 @@
-Toaster Package Sample
-======================
+Toaster Sample Driver
+=====================
+The Toaster collection is an iterative series of samples that demonstrate fundamental aspects of Windows driver development for both Kernel-Mode Driver Framework (KMDF) and User-Mode Driver Framework (UMDF) version 1.
 
-The Toastpkg sample simulates hardware-first and software-first installation of the toaster sample driver.
+All the samples work with a hypothetical toaster bus, over which toaster devices can be connected to a PC.
 
-The Toaster Installation Package comprises driver projects (.vcxproj files) that are contained in the toastpkg.sln solution file (in general/toaster/toastpkg).
+The Toaster sample collection comprises driver projects (.vcxproj files) that are contained in the toaster.sln solution file (in general\\toaster\\toastdrv).
 
-This document discusses the different approaches that end users take when adding new hardware to their computer, and describes an approach that addresses these scenarios in a consistent, robust manner. It also outlines the mechanisms provided to facilitate additional vendor requirements such as the installation of value-added software.
+Related technologies
+--------------------
+[Windows Driver Frameworks](http://msdn.microsoft.com/en-us/library/windows/hardware/ff557565)
 
-**Introduction**
+For detailed descriptions and code walkthroughs of each project, see [Sample Toaster Driver Programming Tour](http://msdn.microsoft.com/en-us/library/windows/hardware/dn569312). To learn how to build and run the samples, read on.
 
-The installation of software to support an instance of a given device (known as "device installation" or "driver installation") is done in a device-centric fashion in Windows operating systems. A device INF that matches up with one of the device's hardware or compatible IDs is used to identify the required driver file(s), registry modifications, etc., that are needed to make the device fully operational. This INF, along with the files copied thereby and a catalog that contains the digital signatures of the INF and these other files, constitute what is known as a "driver package".
 
-Because device installation is done for a specific instance of a device, the "natural" method of adding devices to a computer running a Plug and Play operating system is by plugging in the device first, letting Plug and Play find the device and automatically initiate an installation for that device. The device installation may then proceed using a driver package supplied with the OS, or a "3rd-party" driver package (supplied via CD-ROM, the Internet, or some other distribution mechanism). When the device installation is initiated by the addition of hardware, this is termed a "hardware-first" device installation.
+Run the sample
+--------------
+The computer where you install the driver is called the *target computer* or the *test computer*. Typically this is a separate computer from where you develop and build the driver package. The computer where you develop and build the driver is called the *host computer*.
 
-Users may, however, take an alternate approach to adding hardware to their computer. In this scenario, they first run a setup program (perhaps launched as an autorun application when the vendor-supplied CD-ROM is inserted). This setup program may perform installation activities, and then prompt the user to insert their hardware. Upon the hardware's insertion, the vendor-supplied driver package (which was "pre-installed" by the setup program) is then found by Plug and Play, and the installation proceeds as in the hardware-first scenario. When the device installation is initiated by running a setup program, this is termed a "software-first" device installation. This approach to adding new hardware is just as valid as the hardware-first scenario, and some vendors may even instruct their users (via documentation that ships with the hardware) that this is the preferred method.
+The process of moving the driver package to the target computer and installing the driver is called *deploying the driver*. You can deploy components of the Toaster Sample automatically or manually. Here, we install the wdfsimple driver on the target computer.
 
-Vendors must support the hardware-first scenario (by providing a driver package that may be supplied to the "Found New Hardware" wizard with no "pre-configuration" performed by a setup program or other mechanism). Vendors may optionally support the software-first scenario as well, but the actual installation of the device instance is done by Plug and Play upon the device's arrival, as described above.
+### Specifying which projects to deploy
 
-Vendors may also wish to perform additional activities as part of the device installation. For example, the vendor may want to allow the user to optionally install one or more applications that ship with the device (e.g., a scanner that ships with an image processing application). Such software is termed "value-added software". Value-added software is distinct from the files that comprise the driver package because, unlike the core driver files, the device does not require value-added software to function properly. In the previous example of a scanner, for instance, perhaps the user already has an image processing application that they prefer. The user should be given the option of whether or not they want to install any value-added software. Additional activities (such as allowing the user to select value-added software offerings) may be accomplished by using a vendor-supplied device-specific co-installer.
+Before doing this, you should back up your package.vcxproj file, located in your sample directory, for example C:\\Toaster\\C++\\Package.
+
+1.  In the Properties for the package project, navigate to **Common Properties \> References**.
+2.  Remove all references except WdfSimple. (Use the **Remove Reference** button at the bottom.)
+
+### Automatic deployment (root enumerated)
+
+Before you automatically deploy a driver, you must provision the target computer. For instructions, see [Configuring a Computer for Driver Deployment, Testing, and Debugging](http://msdn.microsoft.com/en-us/library/windows/hardware/).
+
+1.  On the host computer, in Visual Studio, in Solution Explorer, right click the **package** project (within the package folder), and choose **Properties**. Navigate to **Configuration Properties \> Driver Install \> Deployment**.
+2.  Check **Enable deployment**, and check **Remove previous driver versions before deployment**. For **Target Computer Name**, use the drop down to select the name of a target computer that you provisioned previously. Select **Hardware ID Driver Update**, and enter **{b85b7c50-6a01-11d2-b841-00c04fad5171}\\MsToaster** for the hardware ID. (You can find this value in the WdfSimple.inx file.) Click **Apply** and **OK**.
+3.  Because this solution contains many projects, you may find it easier to remove some of them before you build and deploy a driver package. To do so, right click **package** (lower case), and choose **Properties**. Navigate to **Common Properties-\>References** and click **Remove Reference** to remove projects you don't want. (You can add them back later by using **Add New Reference**.) Click **OK**.
+4.  On the **Build** menu, choose **Build Solution** or **Rebuild Solution** (if you removed references).
+5.  If you removed references and deployment does not succeed, try deleting the contents of the c:\\DriverTest\\Drivers folder on the target machine, and then retry deployment.
+
+### Manual deployment (root enumerated)
+
+Before you manually deploy a driver, you must turn on test signing and install a certificate on the target computer. You also need to copy the [DevCon](http://msdn.microsoft.com/en-us/library/windows/hardware/ff544707) tool to the target computer. For instructions, see [Preparing a Computer for Manual Driver Deployment](http://msdn.microsoft.com/en-us/library/windows/hardware/dn265571).
+
+1.  Copy all of the files in your driver package to a folder on the target computer (for example, c:\\WdfSimplePackage).
+2.  On the target computer, open a Command Prompt window as Administrator. Navigate to your driver package folder, and enter the following command:
+
+    **devcon install WdfSimple.inf {b85b7c50-6a01-11d2-b841-00c04fad5171}\\MsToaster**
+
+### View the root enumerated driver in Device Manager
+
+On the target computer, in a Command Prompt window, enter **devmgmt** to open Device Manager. In Device Manager, on the **View** menu, choose **Devices by type**. In the device tree, locate **Microsoft WDF Simple Toaster (No Class Installer)**.
+
+In Device Manager, on the **View** menu, choose **Devices by connection**. Locate **Microsoft WDF Simple Toaster (No Class Installer)** as a child of the root node of the device tree.
+
+Build the sample using MSBuild
+------------------------------
+
+As an alternative to building the Toaster sample in Visual Studio, you can build it in a Visual Studio Command Prompt window. In Visual Studio, on the **Tools** menu, choose **Visual Studio Command Prompt**. In the Visual Studio Command Prompt window, navigate to the folder that has the solution file, Toaster.sln. Use the MSBuild command to build the solution. Here are some examples:
+
+**msbuild /p:configuration="Debug" /p:platform="x64" Toaster.sln**
+
+**msbuild /p:configuration="Release" /p:platform="Win32" Toaster.sln**
+
+For more information about using MSBuild to build a driver package, see [Building a Driver](http://msdn.microsoft.com/en-us/library/windows/hardware/ff554644).
+
+UMDF Toaster File Manifest
+--------------------------
+#### WUDFToaster.idl
+Component Interface file
+
+#### WUDFToaster.cpp
+DLL Support code - provides the DLL's entry point as well as the DllGetClassObject export.
+
+#### WUDFToaster.def
+This file lists the functions that the driver DLL exports.
+
+#### stdafx.h
+This is the main header file for the sample driver.
+
+#### driver.cpp & driver.h
+Definition and implementation of the IDriverEntry callbacks in CDriver class.
+
+#### device.cpp & device.h
+Definition and implementation of various interfaces and their callbacks in CDevice class. Add your PnP and Power interfaces specific for your hardware.
+
+#### queue.cpp & queue.h
+Definition and implementation of the base queue callback class (CQueue). IQueueCallbackDevicekIoControl, IQueueCallbackRead and IQueueCallBackWrite callbacks are implemented to handle I/O control requests.
+
+#### WUDFToaster.rc
+This file defines resource information for the WUDF Toaster sample driver.
+
+#### WUDFToaster.inf
+Sample INF for installing the sample WUDF Toaster driver under the Toaster class of devices.
+
+#### WUDFtoaster.ctl, internal.h
+This file lists the WPP trace control GUID(s) for the sample driver. This file can be used with the tracelog command's -guid flag to enable the collection of these trace events within an established trace session.
+These GUIDs must remain in sync with the trace control guids defined in internal.h.
+
+Toastmon File Manifest
+----------------------
+#### comsup.cpp & comsup.h
+Boilerplate COM Support code - specifically base classes which provide implementations for the standard COM interfaces IUnknown and IClassFactory which are used throughout the sample.
+The implementation of IClassFactory is designed to create instances of the CMyDriver class. If you should change the name of your base driver class, you would also need to modify this file.
+
+#### dllsup.cpp
+Boilerplate DLL Support code - provides the DLL's entry point as well as the single required export (DllGetClassObject).
+These depend on comsup.cpp to perform the necessary class creation.
+
+#### exports.def
+This file lists the functions that the driver DLL exports.
+
+#### makefile
+This file redirects to the real makefile, which is shared by all the driver components of the Windows Driver Kit.
+
+#### internal.h
+This is the main header file for the ToastMon driver
+
+#### driver.cpp & driver.h
+Definition and implementation of the driver callback class for the ToastMon sample.
+
+#### device.cpp & device.h
+Definition and implementation of the device callback class for the ToastMon sample. This is mostly boilerplate, but also registers for RemoteInterface Arrival notifications. When a RemoteInterface arrival callback occurs, it calls CreateRemoteInterface and creates a CMyRemoteTarget callback object to handle I/O on that RemoteInterface.
+
+#### RemoteTarget.cpp & RemoteTarget.h
+Definition and implementation of the remote target callback class for the ToastMon sample.
+
+#### list.h
+Doubly-linked-list code
+
+#### ToastMon.rc
+This file defines resource information for the ToastMon sample driver.
+
+#### UMDFToastMon.inf
+Sample INF for installing the Skeleton driver to control a root enumerated device with a hardware ID of UMDFSamples\\ToastMon
 
diff --git a/general/toaster/toastpkg/toastapp/toastapp.vcxproj b/general/toaster/toastpkg/toastapp/toastapp.vcxproj
index 772c2744..99f5d3ed 100644
--- a/general/toaster/toastpkg/toastapp/toastapp.vcxproj
+++ b/general/toaster/toastpkg/toastapp/toastapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{4BE9B424-9C7C-495D-BECD-A04867DB2802}</ProjectGuid>
+    <ProjectGuid>{DA341425-3029-4DFD-8024-6910371ACEF5}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{00FF9348-781D-4F7C-B665-3C46FF4F4DBE}</SampleGuid>
+    <SampleGuid>{11D55790-49C6-4517-A55C-ECAAB33AC1E9}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters b/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters
index 21f9ddec..3d3a9ae7 100644
--- a/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters
+++ b/general/toaster/toastpkg/toastapp/toastapp.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{67DF9821-5DF2-4390-8645-AA3893DBEB53}</UniqueIdentifier>
+      <UniqueIdentifier>{EC7E6C8A-C706-422C-AD10-91E347D35360}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7FB050B7-6DF1-4D3D-BE1C-B6D7D27C122B}</UniqueIdentifier>
+      <UniqueIdentifier>{0137E48B-AEC4-4FAF-BC20-ADB802C90BD2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{08ED54F9-B7BC-42BA-B064-47CA51C6FE48}</UniqueIdentifier>
+      <UniqueIdentifier>{C2DFE14E-5F5A-4CE1-8FEF-B6E479EE9088}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastpkg/toastcd/tostx86.cat b/general/toaster/toastpkg/toastcd/tostx86.cat
index b16db9e9..e8b604b5 100644
--- a/general/toaster/toastpkg/toastcd/tostx86.cat
+++ b/general/toaster/toastpkg/toastcd/tostx86.cat
diff --git a/general/toaster/toastpkg/toastcd/tstamd64.cat b/general/toaster/toastpkg/toastcd/tstamd64.cat
index 637df4db..cd1a8eb6 100644
--- a/general/toaster/toastpkg/toastcd/tstamd64.cat
+++ b/general/toaster/toastpkg/toastcd/tstamd64.cat
diff --git a/general/toaster/toastpkg/toastco/tostrco2.vcxproj b/general/toaster/toastpkg/toastco/tostrco2.vcxproj
index afaed3ff..acaa1a74 100644
--- a/general/toaster/toastpkg/toastco/tostrco2.vcxproj
+++ b/general/toaster/toastpkg/toastco/tostrco2.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2603EF56-C013-4A84-897A-76EA07FDBB27}</ProjectGuid>
+    <ProjectGuid>{7C8F71F5-C429-4DFF-957E-00B9E82E2882}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{94575B57-4141-4421-94D8-C4826C2077AF}</SampleGuid>
+    <SampleGuid>{3EE5DFE9-31C3-48A4-BAB4-DF9CD0FFE1BC}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters b/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters
index f176be76..7a8dd21a 100644
--- a/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters
+++ b/general/toaster/toastpkg/toastco/tostrco2.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{1EC35066-5352-4C66-AB55-7064A1D2710A}</UniqueIdentifier>
+      <UniqueIdentifier>{0E160D93-81ED-43A4-BE15-4BCB9047831E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{461AEF17-4B21-4416-983F-205E529241F9}</UniqueIdentifier>
+      <UniqueIdentifier>{EBF03CB3-5F56-4F34-A0E5-B350D5686B99}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{D2257EDC-D839-4646-836B-75D16A94E4F0}</UniqueIdentifier>
+      <UniqueIdentifier>{E8916D68-529D-40C2-8127-D69423218770}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/toaster/toastpkg/toastpkg.sln b/general/toaster/toastpkg/toastpkg.sln
index dd1e999c..870855c3 100644
--- a/general/toaster/toastpkg/toastpkg.sln
+++ b/general/toaster/toastpkg/toastpkg.sln
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastapp", "Toastapp", "{8638CA9F-2C57-4198-A01B-002B6A1226B2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastapp", "Toastapp", "{552BDD2C-737F-4EB1-884C-BDFC2370EC4A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastco", "Toastco", "{9B6AB1AE-E802-4AF9-B72B-D2262CFF65AD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastco", "Toastco", "{F661D16C-5F0B-4FE2-AAEC-97D786C17D54}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastva", "Toastva", "{80ACC4C0-C750-4914-9A4F-D36076590E22}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toastva", "Toastva", "{9326D33D-A5B7-443B-91D0-A65AE33394DB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastapp", "toastapp\toastapp.vcxproj", "{4BE9B424-9C7C-495D-BECD-A04867DB2802}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastapp", "toastapp\toastapp.vcxproj", "{DA341425-3029-4DFD-8024-6910371ACEF5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tostrco2", "toastco\tostrco2.vcxproj", "{2603EF56-C013-4A84-897A-76EA07FDBB27}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tostrco2", "toastco\tostrco2.vcxproj", "{7C8F71F5-C429-4DFF-957E-00B9E82E2882}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastva", "toastva\toastva.vcxproj", "{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toastva", "toastva\toastva.vcxproj", "{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2603EF56-C013-4A84-897A-76EA07FDBB27} = {2603EF56-C013-4A84-897A-76EA07FDBB27}
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882} = {7C8F71F5-C429-4DFF-957E-00B9E82E2882}
 	EndProjectSection
 EndProject
 Global
@@ -26,37 +26,37 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|Win32.Build.0 = Debug|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|Win32.ActiveCfg = Release|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|Win32.Build.0 = Release|Win32
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|x64.ActiveCfg = Debug|x64
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Debug|x64.Build.0 = Debug|x64
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|x64.ActiveCfg = Release|x64
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802}.Release|x64.Build.0 = Release|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|Win32.Build.0 = Debug|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|Win32.ActiveCfg = Release|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|Win32.Build.0 = Release|Win32
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|x64.ActiveCfg = Debug|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Debug|x64.Build.0 = Debug|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|x64.ActiveCfg = Release|x64
-		{2603EF56-C013-4A84-897A-76EA07FDBB27}.Release|x64.Build.0 = Release|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|Win32.Build.0 = Debug|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|Win32.ActiveCfg = Release|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|Win32.Build.0 = Release|Win32
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|x64.ActiveCfg = Debug|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Debug|x64.Build.0 = Debug|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|x64.ActiveCfg = Release|x64
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}.Release|x64.Build.0 = Release|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|Win32.Build.0 = Debug|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|Win32.ActiveCfg = Release|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|Win32.Build.0 = Release|Win32
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|x64.ActiveCfg = Debug|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Debug|x64.Build.0 = Debug|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|x64.ActiveCfg = Release|x64
+		{DA341425-3029-4DFD-8024-6910371ACEF5}.Release|x64.Build.0 = Release|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|Win32.Build.0 = Debug|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|Win32.ActiveCfg = Release|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|Win32.Build.0 = Release|Win32
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|x64.ActiveCfg = Debug|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Debug|x64.Build.0 = Debug|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|x64.ActiveCfg = Release|x64
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882}.Release|x64.Build.0 = Release|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|Win32.Build.0 = Debug|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|Win32.ActiveCfg = Release|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|Win32.Build.0 = Release|Win32
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|x64.ActiveCfg = Debug|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Debug|x64.Build.0 = Debug|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|x64.ActiveCfg = Release|x64
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{4BE9B424-9C7C-495D-BECD-A04867DB2802} = {8638CA9F-2C57-4198-A01B-002B6A1226B2}
-		{2603EF56-C013-4A84-897A-76EA07FDBB27} = {9B6AB1AE-E802-4AF9-B72B-D2262CFF65AD}
-		{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421} = {80ACC4C0-C750-4914-9A4F-D36076590E22}
+		{DA341425-3029-4DFD-8024-6910371ACEF5} = {552BDD2C-737F-4EB1-884C-BDFC2370EC4A}
+		{7C8F71F5-C429-4DFF-957E-00B9E82E2882} = {F661D16C-5F0B-4FE2-AAEC-97D786C17D54}
+		{91B0C70B-5062-4573-AD4E-4289FDE4E9E5} = {9326D33D-A5B7-443B-91D0-A65AE33394DB}
 	EndGlobalSection
 EndGlobal
diff --git a/general/toaster/toastpkg/toastva/toastva.vcxproj b/general/toaster/toastpkg/toastva/toastva.vcxproj
index 55a4cfb6..92591cdd 100644
--- a/general/toaster/toastpkg/toastva/toastva.vcxproj
+++ b/general/toaster/toastpkg/toastva/toastva.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B5B06D58-AAF5-4E69-B2F0-FF835B5F7421}</ProjectGuid>
+    <ProjectGuid>{91B0C70B-5062-4573-AD4E-4289FDE4E9E5}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{43F6E849-808D-47F0-9F7A-4D173795892D}</SampleGuid>
+    <SampleGuid>{02BCF403-1E72-4F88-9267-FBFB771C8A94}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters b/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters
index af5a1160..20306006 100644
--- a/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters
+++ b/general/toaster/toastpkg/toastva/toastva.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{69A8D8BA-92F5-4CB0-A45E-6F00B9831369}</UniqueIdentifier>
+      <UniqueIdentifier>{4127F338-E099-419C-A8F1-58489A04992A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{37B69B6B-8428-4579-9C66-618C8E6B9003}</UniqueIdentifier>
+      <UniqueIdentifier>{66FC923F-DCC6-4587-98AE-5C092542A0EA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{9F8FFEAF-405F-44A2-BAE8-E44AC9BDF69D}</UniqueIdentifier>
+      <UniqueIdentifier>{EA13A6E0-448B-4674-AFA8-79C6B8269AD5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>