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

author: karlf <[email protected]> 2016-08-11 13:28:13 -0700
committer: karlf <[email protected]> 2016-08-11 13:28:13 -0700
commit: 96eb96dfb613e4c745db6bd1f53a92fe7e2290fc (patch)
tree: ad5f3ede5cbcd6b598677ce41bcf8318471bdd92 /general/echo
parent: 687b274aa38fd05c8c26e3068932121876d7f745 (diff)
29 files changed, 153 insertions, 206 deletions
diff --git a/general/echo/kmdf/driver/AutoSync/echo.inx b/general/echo/kmdf/driver/AutoSync/echo.inx
index 24d4370d..d22c8806 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.inx
+++ b/general/echo/kmdf/driver/AutoSync/echo.inx
diff --git a/general/echo/kmdf/driver/AutoSync/echo.vcxproj b/general/echo/kmdf/driver/AutoSync/echo.vcxproj
index 0c1b0ac0..b41d49c9 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.vcxproj
+++ b/general/echo/kmdf/driver/AutoSync/echo.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{C4DF013B-7414-4D27-B108-DC70B6A8DD80}</ProjectGuid>
+    <ProjectGuid>{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{3A2C1022-6A0D-49CE-8375-AD5ED987BCF5}</SampleGuid>
+    <SampleGuid>{315B8CBA-8105-439D-8F1A-F4291E25B6C6}</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=".\echo.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\echo.inf</CopyOutput>
-    </Inf>
-  </ItemGroup>
+  <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>echo</TargetName>
   </PropertyGroup>
diff --git a/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters b/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
index 0d3f7346..b74c71cb 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
+++ b/general/echo/kmdf/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>{CAC61770-4C68-4C08-8954-C2EE9F4615B7}</UniqueIdentifier>
+      <UniqueIdentifier>{5F185289-EC4E-4722-AEA2-0B4F3C5C1B4B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{D8218D2B-4511-4292-A88E-8FADB0F1397E}</UniqueIdentifier>
+      <UniqueIdentifier>{20A0E0CC-6A73-4E97-8B00-7F3446A87F11}</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>{E024B75C-350B-4462-936B-54AFDBE3B003}</UniqueIdentifier>
+      <UniqueIdentifier>{F09DC5A0-148C-4EFB-A50D-C1C7F465CB09}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{AEECFCB2-863B-4F2E-8286-C6819113B132}</UniqueIdentifier>
+      <UniqueIdentifier>{0EA02671-13DA-40C0-850F-1A44D332A58D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\echo.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="device.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/echo/kmdf/driver/AutoSync/queue.c b/general/echo/kmdf/driver/AutoSync/queue.c
index 4906e067..b821add2 100644
--- a/general/echo/kmdf/driver/AutoSync/queue.c
+++ b/general/echo/kmdf/driver/AutoSync/queue.c
@@ -423,7 +423,7 @@ Return Value:
         queueContext->Length = 0L;
     }
 
-    queueContext->Buffer = ExAllocatePoolWithTag(NonPagedPool, Length, 'sam1');
+    queueContext->Buffer = ExAllocatePoolWithTag(NonPagedPoolNx, Length, 'sam1');
     if( queueContext->Buffer == NULL ) {
         KdPrint(("EchoEvtIoWrite: Could not allocate %Iu byte buffer\n", Length));
         WdfRequestComplete(Request, STATUS_INSUFFICIENT_RESOURCES);
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.inx b/general/echo/kmdf/driver/DriverSync/echo_2.inx
index 3cb9b163..235d12c0 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.inx
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.inx
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
index ad731fd9..95957fec 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B405FDF0-4BAD-4E15-86D6-48501103E91F}</ProjectGuid>
+    <ProjectGuid>{8E09C05F-B634-49BE-96C9-64682605DFB0}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{5D9EA73C-DEA4-4E2D-A61B-27BD444A4EE7}</SampleGuid>
+    <SampleGuid>{5F1267F8-39A5-49E0-A0D3-6D7C430F11B7}</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=".\echo_2.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\echo_2.inf</CopyOutput>
-    </Inf>
-  </ItemGroup>
+  <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>echo_2</TargetName>
   </PropertyGroup>
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
index 274afb0b..a8292fef 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.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>{97EF35D4-90F8-4D46-979C-74DCEB007F84}</UniqueIdentifier>
+      <UniqueIdentifier>{EC10D63B-B51A-4A42-AC2C-54C5E9525944}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7E927353-FF78-45C4-837F-EDD782088E83}</UniqueIdentifier>
+      <UniqueIdentifier>{9EF2AD11-E87C-435A-AA3B-D706A34C0258}</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>{B669A8E3-E681-47BD-BF49-1FD5410AAD61}</UniqueIdentifier>
+      <UniqueIdentifier>{C14B0E60-6730-4C38-B2CC-C95C65C48EE0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{918A2EDA-630F-4822-AF89-DFEBD8BDA328}</UniqueIdentifier>
+      <UniqueIdentifier>{2E1C95C5-8516-4563-8F8C-A4EB61299F69}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\echo_2.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="device.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/general/echo/kmdf/driver/DriverSync/queue.c b/general/echo/kmdf/driver/DriverSync/queue.c
index 6017294e..78c199d2 100644
--- a/general/echo/kmdf/driver/DriverSync/queue.c
+++ b/general/echo/kmdf/driver/DriverSync/queue.c
@@ -638,7 +638,7 @@ Return Value:
         queueContext->Length = 0L;
     }
 
-    queueContext->Buffer = ExAllocatePoolWithTag(NonPagedPool, Length, 'sam1');
+    queueContext->Buffer = ExAllocatePoolWithTag(NonPagedPoolNx, Length, 'sam1');
     if( queueContext->Buffer == NULL ) {
         KdPrint(("EchoEvtIoWrite: Could not allocate %Iu byte buffer\n",Length));
         WdfRequestComplete(Request, STATUS_INSUFFICIENT_RESOURCES);
diff --git a/general/echo/kmdf/exe/echoapp.cpp b/general/echo/kmdf/exe/echoapp.cpp
index 2383db2c..348b4976 100644
--- a/general/echo/kmdf/exe/echoapp.cpp
+++ b/general/echo/kmdf/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/kmdf/exe/echoapp.vcxproj b/general/echo/kmdf/exe/echoapp.vcxproj
index 611109de..d0c2d740 100644
--- a/general/echo/kmdf/exe/echoapp.vcxproj
+++ b/general/echo/kmdf/exe/echoapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{6064ECE2-B8F6-4272-85EC-C80BD65DE700}</ProjectGuid>
+    <ProjectGuid>{4500713F-105B-4F35-9FC9-85D30E7C3F2D}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{622CAFC6-E185-4727-952B-9B24EE9F7F80}</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/kmdf/exe/echoapp.vcxproj.Filters b/general/echo/kmdf/exe/echoapp.vcxproj.Filters
index 16c9210f..0292f388 100644
--- a/general/echo/kmdf/exe/echoapp.vcxproj.Filters
+++ b/general/echo/kmdf/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>{F7DC8A79-8789-4F30-AAF9-84E75E74662B}</UniqueIdentifier>
+      <UniqueIdentifier>{9B789EE5-1E52-465E-B2F4-E76788525B58}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{978DA09C-AAC5-4A3C-BDD6-C06EE55BF876}</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>{069F7D15-D8CC-4677-BD02-7013C88EF23B}</UniqueIdentifier>
+      <UniqueIdentifier>{FD7CD877-7D31-4A6F-9B7B-37A253E72D84}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/echo/kmdf/kmdfecho.sln b/general/echo/kmdf/kmdfecho.sln
index 87d4ca91..fc7a8245 100644
--- a/general/echo/kmdf/kmdfecho.sln
+++ b/general/echo/kmdf/kmdfecho.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}") = "Exe", "Exe", "{2CB6609B-4511-4F2F-89DD-0F70D2D4978C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{4C3245DE-386F-4315-AE20-B7F8938239A7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutoSync", "AutoSync", "{DA4A75C3-4783-40D0-87FF-48BE5D4C347A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutoSync", "AutoSync", "{F6CBEC4C-BA8E-46F5-9A69-B164E393E074}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{63B83859-9E79-4DA8-8A37-A657790D1DE9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{4A3350D6-C44E-40F3-9274-DCC201D5613E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DriverSync", "DriverSync", "{284392FE-8376-4F89-9793-46999E72B1CD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DriverSync", "DriverSync", "{329569F4-D659-4E23-9B29-791CA85BF28F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{C4DF013B-7414-4D27-B108-DC70B6A8DD80}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo_2", "driver\DriverSync\echo_2.vcxproj", "{F95F639B-5A29-4D6A-A0BF-60558789C717}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo_2", "driver\DriverSync\echo_2.vcxproj", "{8E09C05F-B634-49BE-96C9-64682605DFB0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,39 +25,39 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|Win32.Build.0 = Debug|Win32
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|Win32.ActiveCfg = Release|Win32
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|Win32.Build.0 = Release|Win32
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|x64.ActiveCfg = Debug|x64
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|x64.Build.0 = Debug|x64
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|x64.ActiveCfg = Release|x64
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|x64.Build.0 = Release|x64
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|Win32.Build.0 = Debug|Win32
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|Win32.ActiveCfg = Release|Win32
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|Win32.Build.0 = Release|Win32
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|x64.ActiveCfg = Debug|x64
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|x64.Build.0 = Debug|x64
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|x64.ActiveCfg = Release|x64
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|x64.Build.0 = Release|x64
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|Win32.Build.0 = Debug|Win32
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|Win32.ActiveCfg = Release|Win32
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|Win32.Build.0 = Release|Win32
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|x64.ActiveCfg = Debug|x64
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|x64.Build.0 = Debug|x64
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|x64.ActiveCfg = Release|x64
-		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|x64.Build.0 = Release|x64
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|Win32.Build.0 = Debug|Win32
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|Win32.ActiveCfg = Release|Win32
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|Win32.Build.0 = Release|Win32
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|x64.ActiveCfg = Debug|x64
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|x64.Build.0 = Debug|x64
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|x64.ActiveCfg = Release|x64
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|x64.Build.0 = Release|x64
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|Win32.ActiveCfg = Debug|Win32
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|Win32.Build.0 = Debug|Win32
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|Win32.ActiveCfg = Release|Win32
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|Win32.Build.0 = Release|Win32
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|x64.ActiveCfg = Debug|x64
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|x64.Build.0 = Debug|x64
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|x64.ActiveCfg = Release|x64
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|x64.Build.0 = Release|x64
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|Win32.Build.0 = Debug|Win32
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|Win32.ActiveCfg = Release|Win32
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|Win32.Build.0 = Release|Win32
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|x64.ActiveCfg = Debug|x64
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|x64.Build.0 = Debug|x64
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|x64.ActiveCfg = Release|x64
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB} = {2CB6609B-4511-4F2F-89DD-0F70D2D4978C}
-		{C4DF013B-7414-4D27-B108-DC70B6A8DD80} = {DA4A75C3-4783-40D0-87FF-48BE5D4C347A}
-		{F95F639B-5A29-4D6A-A0BF-60558789C717} = {284392FE-8376-4F89-9793-46999E72B1CD}
-		{DA4A75C3-4783-40D0-87FF-48BE5D4C347A} = {63B83859-9E79-4DA8-8A37-A657790D1DE9}
-		{284392FE-8376-4F89-9793-46999E72B1CD} = {63B83859-9E79-4DA8-8A37-A657790D1DE9}
+		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69} = {4C3245DE-386F-4315-AE20-B7F8938239A7}
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66} = {F6CBEC4C-BA8E-46F5-9A69-B164E393E074}
+		{8E09C05F-B634-49BE-96C9-64682605DFB0} = {329569F4-D659-4E23-9B29-791CA85BF28F}
+		{F6CBEC4C-BA8E-46F5-9A69-B164E393E074} = {4A3350D6-C44E-40F3-9274-DCC201D5613E}
+		{329569F4-D659-4E23-9B29-791CA85BF28F} = {4A3350D6-C44E-40F3-9274-DCC201D5613E}
 	EndGlobalSection
 EndGlobal
diff --git a/general/echo/umdf/WUDFEchoDriver.inx b/general/echo/umdf/WUDFEchoDriver.inx
index 03f727ee..ad6e9bf4 100644
--- a/general/echo/umdf/WUDFEchoDriver.inx
+++ b/general/echo/umdf/WUDFEchoDriver.inx
diff --git a/general/echo/umdf/WUDFEchoDriver.vcxproj b/general/echo/umdf/WUDFEchoDriver.vcxproj
index 8e5f4558..c9a5a638 100644
--- a/general/echo/umdf/WUDFEchoDriver.vcxproj
+++ b/general/echo/umdf/WUDFEchoDriver.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{ED527E05-B9E4-4B58-AEF4-A52994AE2829}</ProjectGuid>
+    <ProjectGuid>{13CC3E04-E27E-4E44-90DE-CFBED92D7130}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{95603758-8BCA-495F-A2B2-13FCC5FF53FD}</SampleGuid>
+    <SampleGuid>{9838DCDC-C817-4EA5-B7E8-B3F97F2B138A}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -81,11 +81,6 @@
       <WppDllMacro>true</WppDllMacro>
       <WppScanConfigurationData>internal.h</WppScanConfigurationData>
     </ClCompile>
-    <Inf Include="WudfEchoDriver.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\WudfEchoDriver.inf</CopyOutput>
-    </Inf>
     <OtherWpp Include="Echo.rc">
       <WppEnabled>true</WppEnabled>
       <WppDllMacro>true</WppDllMacro>
diff --git a/general/echo/umdf/WUDFEchoDriver.vcxproj.Filters b/general/echo/umdf/WUDFEchoDriver.vcxproj.Filters
index 86c4a54a..8a23705a 100644
--- a/general/echo/umdf/WUDFEchoDriver.vcxproj.Filters
+++ b/general/echo/umdf/WUDFEchoDriver.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>{437C2853-EB63-4965-9736-A8FDBF0928A7}</UniqueIdentifier>
+      <UniqueIdentifier>{CF73CF52-2BA2-434D-8E38-8F730D54F150}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{8B078219-E9D2-4EA5-9056-172A3917798B}</UniqueIdentifier>
+      <UniqueIdentifier>{6D44B960-AD87-4EA1-80E4-D63DF6914D51}</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>{936B986E-FAD4-44C8-8D5B-2AA3FA81ADAE}</UniqueIdentifier>
+      <UniqueIdentifier>{9542D238-C8CE-44BC-9307-50CEDCCA5F25}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{66578744-D55B-452B-88ED-8F86F6BACB82}</UniqueIdentifier>
+      <UniqueIdentifier>{D77C3549-2C94-49EB-909E-54EB79474A98}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -39,11 +39,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="WudfEchoDriver.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="Echo.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/general/echo/umdf/echo.sln b/general/echo/umdf/echo.sln
index 376bf830..cc459eea 100644
--- a/general/echo/umdf/echo.sln
+++ b/general/echo/umdf/echo.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}") = "WUDFEchoDriver", "WUDFEchoDriver.vcxproj", "{ED527E05-B9E4-4B58-AEF4-A52994AE2829}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WUDFEchoDriver", "WUDFEchoDriver.vcxproj", "{13CC3E04-E27E-4E44-90DE-CFBED92D7130}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Debug|Win32.Build.0 = Debug|Win32
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Release|Win32.ActiveCfg = Release|Win32
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Release|Win32.Build.0 = Release|Win32
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Debug|x64.ActiveCfg = Debug|x64
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Debug|x64.Build.0 = Debug|x64
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Release|x64.ActiveCfg = Release|x64
-		{ED527E05-B9E4-4B58-AEF4-A52994AE2829}.Release|x64.Build.0 = Release|x64
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Debug|Win32.ActiveCfg = Debug|Win32
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Debug|Win32.Build.0 = Debug|Win32
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Release|Win32.ActiveCfg = Release|Win32
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Release|Win32.Build.0 = Release|Win32
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Debug|x64.ActiveCfg = Debug|x64
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Debug|x64.Build.0 = Debug|x64
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Release|x64.ActiveCfg = Release|x64
+		{13CC3E04-E27E-4E44-90DE-CFBED92D7130}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
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
diff --git a/general/echo/umdfSocketEcho/Driver/SocketEcho.inx b/general/echo/umdfSocketEcho/Driver/SocketEcho.inx
index c7150d7c..b80dee9a 100644
--- a/general/echo/umdfSocketEcho/Driver/SocketEcho.inx
+++ b/general/echo/umdfSocketEcho/Driver/SocketEcho.inx
diff --git a/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj b/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj
index cfe950b0..750422be 100644
--- a/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj
+++ b/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}</ProjectGuid>
+    <ProjectGuid>{353E2F22-BD87-47F3-A211-90DE8D583D26}</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>{57A14DB7-700E-4B8F-BB83-0476F61B04AB}</SampleGuid>
+    <SampleGuid>{CE6B3D79-4604-4FAC-8A53-20B7000101FD}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -82,11 +82,6 @@
       <WppDllMacro>true</WppDllMacro>
       <WppScanConfigurationData>internal.h</WppScanConfigurationData>
     </ClCompile>
-    <Inf Include="SocketEcho.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\SocketEcho.inf</CopyOutput>
-    </Inf>
     <OtherWpp Include="SocketEcho.rc">
       <WppEnabled>true</WppEnabled>
       <WppDllMacro>true</WppDllMacro>
diff --git a/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj.Filters b/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj.Filters
index 7406bc8a..1c5cadc5 100644
--- a/general/echo/umdfSocketEcho/Driver/SocketEcho.vcxproj.Filters
+++ b/general/echo/umdfSocketEcho/Driver/SocketEcho.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>{4634173A-AFBA-4CB0-A38B-3039057FE4C2}</UniqueIdentifier>
+      <UniqueIdentifier>{76642063-E1CB-43C5-8493-5F651D92F60C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{5C46A0BC-B376-47CD-99FF-19195273DC2E}</UniqueIdentifier>
+      <UniqueIdentifier>{4AB44AAB-2BDE-4DA4-A128-40382366A9F5}</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>{368D33EB-7143-4726-935B-5B0A0F2C042A}</UniqueIdentifier>
+      <UniqueIdentifier>{005AFEBA-780E-49DC-BCB8-4163463DE6D5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{3B3E9AC4-246E-4375-BAAE-6F6938AB5BC9}</UniqueIdentifier>
+      <UniqueIdentifier>{FDF16DEE-FA54-49E3-BC76-FCFD47F8BF37}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -39,11 +39,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="SocketEcho.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="SocketEcho.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj b/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj
index e83fa9f9..e648bc34 100644
--- a/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj
+++ b/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B832D7D3-C7DE-4E44-8812-FDB1991E503D}</ProjectGuid>
+    <ProjectGuid>{70A0F94B-0D04-4AB4-A653-733AC0210EBC}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{B28D7831-D20D-4451-9D56-95D026F4AF7F}</SampleGuid>
+    <SampleGuid>{0C41C62B-B1D0-4A46-B431-6DA1A153FDC0}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj.Filters b/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj.Filters
index 71857f2a..daed19de 100644
--- a/general/echo/umdfSocketEcho/Exe/socketechoserver.vcxproj.Filters
+++ b/general/echo/umdfSocketEcho/Exe/socketechoserver.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>{6E35CF09-8803-4962-92AA-CEDE880104E3}</UniqueIdentifier>
+      <UniqueIdentifier>{6F82EFE8-0818-4BAE-A52F-C72D9E63CAD6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{CC742E22-4156-475F-8A37-A96412F8D67C}</UniqueIdentifier>
+      <UniqueIdentifier>{448C5D48-4FD2-4DA5-964C-3EF201A3ED31}</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>{6334BFC0-C39E-48DC-95E5-A3B1997E3C9A}</UniqueIdentifier>
+      <UniqueIdentifier>{439980EC-B0F0-45A7-AF18-E832E564F57D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/echo/umdfSocketEcho/umdfsocketecho.sln b/general/echo/umdfSocketEcho/umdfsocketecho.sln
index 96eb22b6..775550f5 100644
--- a/general/echo/umdfSocketEcho/umdfsocketecho.sln
+++ b/general/echo/umdfSocketEcho/umdfsocketecho.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{A07EE392-4980-445C-B7D5-62A433133943}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{5926AA26-ED89-4B86-ADD3-6415A17996DF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{8B570B91-8F7B-4FC0-B8D7-C169B3B9F3A0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{17E8DD65-7DC7-4D59-96A0-52A20C036403}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SocketEcho", "Driver\SocketEcho.vcxproj", "{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SocketEcho", "Driver\SocketEcho.vcxproj", "{353E2F22-BD87-47F3-A211-90DE8D583D26}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socketechoserver", "Exe\socketechoserver.vcxproj", "{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socketechoserver", "Exe\socketechoserver.vcxproj", "{70A0F94B-0D04-4AB4-A653-733AC0210EBC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Debug|Win32.Build.0 = Debug|Win32
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Release|Win32.ActiveCfg = Release|Win32
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Release|Win32.Build.0 = Release|Win32
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Debug|x64.ActiveCfg = Debug|x64
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Debug|x64.Build.0 = Debug|x64
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Release|x64.ActiveCfg = Release|x64
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B}.Release|x64.Build.0 = Release|x64
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Debug|Win32.Build.0 = Debug|Win32
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Release|Win32.ActiveCfg = Release|Win32
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Release|Win32.Build.0 = Release|Win32
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Debug|x64.ActiveCfg = Debug|x64
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Debug|x64.Build.0 = Debug|x64
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Release|x64.ActiveCfg = Release|x64
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3}.Release|x64.Build.0 = Release|x64
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Debug|Win32.ActiveCfg = Debug|Win32
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Debug|Win32.Build.0 = Debug|Win32
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Release|Win32.ActiveCfg = Release|Win32
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Release|Win32.Build.0 = Release|Win32
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Debug|x64.ActiveCfg = Debug|x64
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Debug|x64.Build.0 = Debug|x64
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Release|x64.ActiveCfg = Release|x64
+		{353E2F22-BD87-47F3-A211-90DE8D583D26}.Release|x64.Build.0 = Release|x64
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Debug|Win32.Build.0 = Debug|Win32
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Release|Win32.ActiveCfg = Release|Win32
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Release|Win32.Build.0 = Release|Win32
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Debug|x64.ActiveCfg = Debug|x64
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Debug|x64.Build.0 = Debug|x64
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Release|x64.ActiveCfg = Release|x64
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E10361E8-3F60-4FA4-9E72-CA0703AF2D4B} = {A07EE392-4980-445C-B7D5-62A433133943}
-		{B5998C0F-42A9-48E6-9CE5-60E65FF79DE3} = {8B570B91-8F7B-4FC0-B8D7-C169B3B9F3A0}
+		{353E2F22-BD87-47F3-A211-90DE8D583D26} = {5926AA26-ED89-4B86-ADD3-6415A17996DF}
+		{70A0F94B-0D04-4AB4-A653-733AC0210EBC} = {17E8DD65-7DC7-4D59-96A0-52A20C036403}
 	EndGlobalSection
 EndGlobal
author	karlf <[email protected]>	2016-08-11 13:28:13 -0700
committer	karlf <[email protected]>	2016-08-11 13:28:13 -0700
commit	96eb96dfb613e4c745db6bd1f53a92fe7e2290fc (patch)
tree	ad5f3ede5cbcd6b598677ce41bcf8318471bdd92 /general/echo
parent	687b274aa38fd05c8c26e3068932121876d7f745 (diff)