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

4 files changed, 20 insertions, 23 deletions

diff --git a/wpd/WpdServiceSampleDriver/README.md b/wpd/WpdServiceSampleDriver/README.md
index 3cdb63e4..4e277f0a 100644
--- a/wpd/WpdServiceSampleDriver/README.md
+++ b/wpd/WpdServiceSampleDriver/README.md
@@ -1,14 +1,11 @@
-WPD service sample driver
-=========================
+WPD multi-transport sample driver
+=================================
 
-The WpdServiceSampleDriver shows how to extend the WpdHelloWorldDriver sample so that it supports a simulated device with a Contacts device service. By using this device service, an application can discover events, methods, and properties that operate on Contacts that are stored on the device. And, the application can use the Contacts device service to handle these events, invoke these methods, or retrieve these properties. For example, the application might invoke methods to synchronize the Contacts that are found on the device with the contacts that are stored on a computer or to read the Name property for a given Contact.
+The WpdMultiTransportDriver sample demonstrates how you could extend the WpdHelloWorldDriver for a device that supports multiple transports. A transport is a protocol over which a portable device communicates with a computer. Example transports include Internet Protocol (IP), Bluetooth, and USB.
 
-A device service is an extension of a functional object. In addition to logically grouping device capabilities, a device service provides applications that can programmatically discover those capabilities.
-
-**Note** This driver was written in the simplest way to demonstrate concepts. Therefore, the sample driver might perform operations or be structured in a way that are inefficient in a production driver. Additionally, this sample does not use real hardware. Instead, it simulates a device by using data structures in memory. Therefore the driver might be implemented in a way that is unrealistic for production hardware.
-
-For a complete description of this sample and its underlying code and functionality, refer to the [WPD Service Sample Driver](http://msdn.microsoft.com/en-us/library/windows/hardware/ff597714) description in the Windows Driver Kit documentation.
+A number of portable devices now support multiple transports. For example, a number of cell phones support both Bluetooth and USB. Windows supports a multitransport driver model that ensures that only one node appears for each device.
 
+For a complete description of this sample and its underlying code and functionality, refer to the [WPD MultiTransport Driver](http://msdn.microsoft.com/en-us/library/windows/hardware/ff597709) description in the Windows Driver Kit documentation.
 
 Related topics
 --------------
diff --git a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.sln b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.sln
index 287e80fe..2c7e40e5 100644
--- a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.sln
+++ b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WpdServiceSampleDriver", "WpdServiceSampleDriver.vcxproj", "{C5678647-23D8-428F-B6D8-F76D0DD66FED}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WpdServiceSampleDriver", "WpdServiceSampleDriver.vcxproj", "{427BB6BF-A2BA-4CC6-AE53-648B107C0E5F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Debug|Win32.Build.0 = Debug|Win32
-		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Release|Win32.ActiveCfg = Release|Win32
-		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Release|Win32.Build.0 = Release|Win32
-		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Debug|x64.ActiveCfg = Debug|x64
-		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Debug|x64.Build.0 = Debug|x64
-		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Release|x64.ActiveCfg = Release|x64
-		{C5678647-23D8-428F-B6D8-F76D0DD66FED}.Release|x64.Build.0 = Release|x64
+		{427BB6BF-A2BA-4CC6-AE53-648B107C0E5F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{427BB6BF-A2BA-4CC6-AE53-648B107C0E5F}.Debug|Win32.Build.0 = Debug|Win32
+		{427BB6BF-A2BA-4CC6-AE53-648B107C0E5F}.Release|Win32.ActiveCfg = Release|Win32
+		{427BB6BF-A2BA-4CC6-AE53-648B107C0E5F}.Release|Win32.Build.0 = Release|Win32
+		{427BB6BF-A2BA-4CC6-AE53-648B107C0E5F}.Debug|x64.ActiveCfg = Debug|x64
+		{427BB6BF-A2BA-4CC6-AE53-648B107C0E5F}.Debug|x64.Build.0 = Debug|x64
+		{427BB6BF-A2BA-4CC6-AE53-648B107C0E5F}.Release|x64.ActiveCfg = Release|x64
+		{427BB6BF-A2BA-4CC6-AE53-648B107C0E5F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj
index 6431626e..32f13756 100644
--- a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj
+++ b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{C5678647-23D8-428F-B6D8-F76D0DD66FED}</ProjectGuid>
+    <ProjectGuid>{427BB6BF-A2BA-4CC6-AE53-648B107C0E5F}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{BD2E3BAC-111F-4306-AAFE-529806475FC0}</SampleGuid>
+    <SampleGuid>{23866B2C-44B5-4963-821D-729F96EA5AD9}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj.Filters b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj.Filters
index 7e058142..a3cf3c7c 100644
--- a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj.Filters
+++ b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj.Filters
@@ -3,19 +3,19 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{930F9018-015A-46BD-A347-171E1881999D}</UniqueIdentifier>
+      <UniqueIdentifier>{59DE54EC-F93C-4B41-9870-C769D596B90B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7E56FF5F-D26D-4887-8A49-57F2FC991795}</UniqueIdentifier>
+      <UniqueIdentifier>{CE787A41-44CA-4CF5-83F3-A902A8CEC775}</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>{66D2DFC5-B6CE-4AA6-A4C6-8E35D08B9A9A}</UniqueIdentifier>
+      <UniqueIdentifier>{7BDBC101-4E7B-45A0-A875-8975F943CBCE}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{B436CE26-D450-4F04-9C6A-13067DED6AFB}</UniqueIdentifier>
+      <UniqueIdentifier>{AE71DC3E-F17F-4900-A386-6E0295E28E9D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>