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

7 files changed, 42 insertions, 53 deletions

diff --git a/general/echo/umdf2/driver/AutoSync/echo.vcxproj b/general/echo/umdf2/driver/AutoSync/echo.vcxproj
index 93fc544b..e3a2e18d 100644
--- a/general/echo/umdf2/driver/AutoSync/echo.vcxproj
+++ b/general/echo/umdf2/driver/AutoSync/echo.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{407818D1-E32A-406A-9023-D0413C0733E4}</ProjectGuid>
+    <ProjectGuid>{82306592-0B90-44A7-AC88-F75A9E98E645}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{A6CA93A2-E3F5-40E0-A4AE-4930BB05BF0F}</SampleGuid>
+    <SampleGuid>{B74758D6-F9D4-46A4-9647-8B5AC4A9C689}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -75,13 +75,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems">
-    <Inf Include=".\EchoUm.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\EchoUm.inf</CopyOutput>
-    </Inf>
-  </ItemGroup>
+  <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>echo</TargetName>
   </PropertyGroup>
diff --git a/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters b/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters
index 55d8a04f..e7ee9b9d 100644
--- a/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters
+++ b/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{58D2BB85-1D40-4837-A558-C21C3266B208}</UniqueIdentifier>
+      <UniqueIdentifier>{B7A478F1-3462-402C-B3F4-2DB5F7484941}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{6036C97F-A229-4B81-B07B-34A70C91F167}</UniqueIdentifier>
+      <UniqueIdentifier>{AE34D3A5-726B-49B1-B974-C4D38F3B8CE0}</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>{8D6CC9F5-9AC8-45DD-8987-861FD69E167C}</UniqueIdentifier>
+      <UniqueIdentifier>{D9E33B3E-851D-4243-A6DA-F559C1FFF3FB}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{6FC299B3-583D-4209-A259-CF65F4D02C10}</UniqueIdentifier>
+      <UniqueIdentifier>{CAF21CF9-F7FF-4D7E-8FAD-E38B097DEF0B}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\EchoUm.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="device.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/echo/umdf2/driver/AutoSync/echoum.inx b/general/echo/umdf2/driver/AutoSync/echoum.inx
index 87db7cad..4e3cd6b3 100644
--- a/general/echo/umdf2/driver/AutoSync/echoum.inx
+++ b/general/echo/umdf2/driver/AutoSync/echoum.inx
diff --git a/general/echo/umdf2/exe/echoapp.cpp b/general/echo/umdf2/exe/echoapp.cpp
index 2383db2c..348b4976 100644
--- a/general/echo/umdf2/exe/echoapp.cpp
+++ b/general/echo/umdf2/exe/echoapp.cpp
@@ -446,7 +446,7 @@ AsyncIo(
 
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
-                    printf(" %dth Read failed %d \n",i, GetLastError());
+                    printf(" %dth Read failed %d \n", (ULONG) i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
@@ -460,7 +460,7 @@ AsyncIo(
                       &pOvList[i]) == 0) {
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
-                    printf(" %dth Write failed %d \n",i, GetLastError());
+                    printf(" %dth Write failed %d \n", (ULONG) i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
@@ -487,7 +487,7 @@ AsyncIo(
         if (ioType == READER_TYPE) {
 
             i = completedOv - pOvList;
-            printf("Number of bytes read by request number %d is %d\n", i, numberOfBytesTransferred);
+            printf("Number of bytes read by request number %Id is %d\n", i, numberOfBytesTransferred);
 
             //
             // If we're done with the I/Os, then exit
@@ -513,7 +513,7 @@ AsyncIo(
                       completedOv) == 0) {
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
-                    printf("%dth Read failed %d \n", i, GetLastError());
+                    printf("%Idth Read failed %d \n", i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
@@ -522,7 +522,7 @@ AsyncIo(
 
             i = completedOv - pOvList;
 
-            printf("Number of bytes written by request number %d is %d\n", i, numberOfBytesTransferred);
+            printf("Number of bytes written by request number %Id is %d\n", i, numberOfBytesTransferred);
 
             //
             // If we're done with the I/Os, then exit
@@ -549,7 +549,7 @@ AsyncIo(
                 error = GetLastError();
                 if (error != ERROR_IO_PENDING) {
 
-                    printf("%dth write failed %d \n", i, GetLastError());
+                    printf("%Idth write failed %d \n", i, GetLastError());
                     result = FALSE;
                     goto Error;
                 }
diff --git a/general/echo/umdf2/exe/echoapp.vcxproj b/general/echo/umdf2/exe/echoapp.vcxproj
index 120c89bf..d0c2d740 100644
--- a/general/echo/umdf2/exe/echoapp.vcxproj
+++ b/general/echo/umdf2/exe/echoapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{4527D01F-6A3D-4E3C-95BE-866DA38F0A0A}</ProjectGuid>
+    <ProjectGuid>{4500713F-105B-4F35-9FC9-85D30E7C3F2D}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{56E9CA0F-2FCF-4CC0-83D7-8179527F8288}</SampleGuid>
+    <SampleGuid>{B366A3FE-0009-4DB9-8482-AD1EDA2557F3}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/echo/umdf2/exe/echoapp.vcxproj.Filters b/general/echo/umdf2/exe/echoapp.vcxproj.Filters
index e502be53..0292f388 100644
--- a/general/echo/umdf2/exe/echoapp.vcxproj.Filters
+++ b/general/echo/umdf2/exe/echoapp.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>{8314F6CA-5E08-4F38-A79C-490CF0B1921E}</UniqueIdentifier>
+      <UniqueIdentifier>{9B789EE5-1E52-465E-B2F4-E76788525B58}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{B852C8A0-1F3F-4216-BE3B-027A9FCEA14C}</UniqueIdentifier>
+      <UniqueIdentifier>{CAB74E51-A64C-4198-A264-1B5025B52C8A}</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>{32AE256A-842E-4EC3-B190-09460CD4FA0A}</UniqueIdentifier>
+      <UniqueIdentifier>{FD7CD877-7D31-4A6F-9B7B-37A253E72D84}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/echo/umdf2/umdf2echo.sln b/general/echo/umdf2/umdf2echo.sln
index 71f8fa75..d1d8aea6 100644
--- a/general/echo/umdf2/umdf2echo.sln
+++ b/general/echo/umdf2/umdf2echo.sln
@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{E49BA847-A88E-4272-BC2D-D7ECB6937401}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{E19EE60B-03D8-4337-B1B0-87AC0B4C9279}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutoSync", "AutoSync", "{5AC4DDBC-AC4B-41E3-AE1A-21DC1570A05E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutoSync", "AutoSync", "{C6D1441B-C2EA-4548-8AE2-3DE76078F3DE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{48DED557-0B57-44D5-A364-F76A9BD5D83B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{5E4B11F2-937A-460F-8072-940A8EC7E648}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{FFCCCB8B-74AB-4C85-9200-B33171AAF119}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{4500713F-105B-4F35-9FC9-85D30E7C3F2D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{407818D1-E32A-406A-9023-D0413C0733E4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{82306592-0B90-44A7-AC88-F75A9E98E645}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,29 +21,29 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Debug|Win32.Build.0 = Debug|Win32
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Release|Win32.ActiveCfg = Release|Win32
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Release|Win32.Build.0 = Release|Win32
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Debug|x64.ActiveCfg = Debug|x64
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Debug|x64.Build.0 = Debug|x64
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Release|x64.ActiveCfg = Release|x64
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119}.Release|x64.Build.0 = Release|x64
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Debug|Win32.Build.0 = Debug|Win32
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Release|Win32.ActiveCfg = Release|Win32
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Release|Win32.Build.0 = Release|Win32
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Debug|x64.ActiveCfg = Debug|x64
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Debug|x64.Build.0 = Debug|x64
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Release|x64.ActiveCfg = Release|x64
-		{407818D1-E32A-406A-9023-D0413C0733E4}.Release|x64.Build.0 = Release|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|Win32.Build.0 = Debug|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|Win32.ActiveCfg = Release|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|Win32.Build.0 = Release|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|x64.ActiveCfg = Debug|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|x64.Build.0 = Debug|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|x64.ActiveCfg = Release|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|x64.Build.0 = Release|x64
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Debug|Win32.Build.0 = Debug|Win32
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Release|Win32.ActiveCfg = Release|Win32
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Release|Win32.Build.0 = Release|Win32
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Debug|x64.ActiveCfg = Debug|x64
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Debug|x64.Build.0 = Debug|x64
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Release|x64.ActiveCfg = Release|x64
+		{82306592-0B90-44A7-AC88-F75A9E98E645}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{FFCCCB8B-74AB-4C85-9200-B33171AAF119} = {E49BA847-A88E-4272-BC2D-D7ECB6937401}
-		{407818D1-E32A-406A-9023-D0413C0733E4} = {5AC4DDBC-AC4B-41E3-AE1A-21DC1570A05E}
-		{5AC4DDBC-AC4B-41E3-AE1A-21DC1570A05E} = {48DED557-0B57-44D5-A364-F76A9BD5D83B}
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D} = {E19EE60B-03D8-4337-B1B0-87AC0B4C9279}
+		{82306592-0B90-44A7-AC88-F75A9E98E645} = {C6D1441B-C2EA-4548-8AE2-3DE76078F3DE}
+		{C6D1441B-C2EA-4548-8AE2-3DE76078F3DE} = {5E4B11F2-937A-460F-8072-940A8EC7E648}
 	EndGlobalSection
 EndGlobal