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

7 files changed, 34 insertions, 62 deletions

diff --git a/serial/VirtualSerial/ComPort/virtualserial.inx b/serial/VirtualSerial/ComPort/virtualserial.inx
index 4242388c..d7c8f01c 100644
--- a/serial/VirtualSerial/ComPort/virtualserial.inx
+++ b/serial/VirtualSerial/ComPort/virtualserial.inx
diff --git a/serial/VirtualSerial/ComPort/virtualserial.vcxproj b/serial/VirtualSerial/ComPort/virtualserial.vcxproj
index 6aeff0e9..06ff48d6 100644
--- a/serial/VirtualSerial/ComPort/virtualserial.vcxproj
+++ b/serial/VirtualSerial/ComPort/virtualserial.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{24460F70-3AE4-4587-A9C7-095934572855}</ProjectGuid>
+    <ProjectGuid>{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{334C2162-D8A0-4318-9A7B-B53226899B27}</SampleGuid>
+    <SampleGuid>{A88B1CA4-202D-4915-94D1-94E8D74FCFF5}</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="virtualserial.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\virtualserial.inf</CopyOutput>
-    </Inf>
     <OtherWpp Include="virtualserial.rc">
       <WppEnabled>true</WppEnabled>
       <WppDllMacro>true</WppDllMacro>
@@ -242,7 +237,6 @@
   <ItemGroup>
     <Inf Exclude="@(Inf)" Include="*.inf" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
diff --git a/serial/VirtualSerial/ComPort/virtualserial.vcxproj.Filters b/serial/VirtualSerial/ComPort/virtualserial.vcxproj.Filters
index fb625164..d8da803f 100644
--- a/serial/VirtualSerial/ComPort/virtualserial.vcxproj.Filters
+++ b/serial/VirtualSerial/ComPort/virtualserial.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>{F92B6BB2-9116-46B1-9D16-A4B81E90515F}</UniqueIdentifier>
+      <UniqueIdentifier>{FD27BABE-0C58-4B98-AF81-08289AA3B68B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{EC2A81F6-5F0F-4504-86F7-2F303B06F301}</UniqueIdentifier>
+      <UniqueIdentifier>{F310CB18-6DEC-47F7-8CA0-21A1439D1363}</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>{FDACC4A4-3E06-4908-BAF1-FE77087CCD0A}</UniqueIdentifier>
+      <UniqueIdentifier>{52CDBF35-D541-4FFF-A0C5-8C8189885A23}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{9CA0A168-1E88-40BA-9F0E-D3F60623D475}</UniqueIdentifier>
+      <UniqueIdentifier>{51F65D19-3BDF-4759-9AD1-DDA85ACA2524}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -42,14 +42,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include=".\Debug\\virtualserial.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
-    <Inf Include="virtualserial.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="virtualserial.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/serial/VirtualSerial/FakeModem/fakemodem.inx b/serial/VirtualSerial/FakeModem/fakemodem.inx
index be83ca64..5ce13ca1 100644
--- a/serial/VirtualSerial/FakeModem/fakemodem.inx
+++ b/serial/VirtualSerial/FakeModem/fakemodem.inx
diff --git a/serial/VirtualSerial/FakeModem/fakemodem.vcxproj b/serial/VirtualSerial/FakeModem/fakemodem.vcxproj
index c03701e1..9ab1fad8 100644
--- a/serial/VirtualSerial/FakeModem/fakemodem.vcxproj
+++ b/serial/VirtualSerial/FakeModem/fakemodem.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{BCF39170-D785-4372-A97E-AAE0915630BE}</ProjectGuid>
+    <ProjectGuid>{ACC7F2B5-F886-4169-84C0-32E44847E2B3}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>1</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{BB77384F-D084-459A-A05F-FDF65FF05318}</SampleGuid>
+    <SampleGuid>{632318C9-FA2B-44A3-BB8C-3ADC5F2E2A86}</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="fakemodem.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\fakemodem.inf</CopyOutput>
-    </Inf>
     <OtherWpp Include="fakemodem.rc">
       <WppEnabled>true</WppEnabled>
       <WppDllMacro>true</WppDllMacro>
@@ -242,7 +237,6 @@
   <ItemGroup>
     <Inf Exclude="@(Inf)" Include="*.inf" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
diff --git a/serial/VirtualSerial/FakeModem/fakemodem.vcxproj.Filters b/serial/VirtualSerial/FakeModem/fakemodem.vcxproj.Filters
index d3b31071..52ccc10a 100644
--- a/serial/VirtualSerial/FakeModem/fakemodem.vcxproj.Filters
+++ b/serial/VirtualSerial/FakeModem/fakemodem.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>{47091361-E39C-4D26-B87F-90F3718A64D7}</UniqueIdentifier>
+      <UniqueIdentifier>{1F2A9E59-0673-4608-95E9-CF60343773E6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{C1AA6012-3D25-4230-B45A-9C8B8A699985}</UniqueIdentifier>
+      <UniqueIdentifier>{10F80ED7-1AD5-4B8B-B840-DE4146B936E1}</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>{EDF4A55C-BC2C-477F-9B14-1D736F901B53}</UniqueIdentifier>
+      <UniqueIdentifier>{AA21B933-B73E-406C-AD32-1EC06E712F89}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{23FBCF57-F7A0-4114-AE58-3674DB595114}</UniqueIdentifier>
+      <UniqueIdentifier>{842CBD81-76BE-44AA-80B7-0BE49BE0DE56}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -42,14 +42,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include=".\Debug\\fakemodem.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
-    <Inf Include="fakemodem.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="fakemodem.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/serial/VirtualSerial/VirtualSerial.sln b/serial/VirtualSerial/VirtualSerial.sln
index b904e486..8ca42edb 100644
--- a/serial/VirtualSerial/VirtualSerial.sln
+++ b/serial/VirtualSerial/VirtualSerial.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}") = "ComPort", "ComPort", "{76B0904E-842B-44FB-B2E0-8BC932912E20}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComPort", "ComPort", "{56318356-CB41-44F9-9830-F051C326B8C2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FakeModem", "FakeModem", "{388FA684-8FCF-417F-AB70-1E417037B715}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FakeModem", "FakeModem", "{209B0D63-1DB3-4114-9531-FCBDE7CE1B5C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtualserial", "ComPort\virtualserial.vcxproj", "{24460F70-3AE4-4587-A9C7-095934572855}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtualserial", "ComPort\virtualserial.vcxproj", "{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fakemodem", "FakeModem\fakemodem.vcxproj", "{BCF39170-D785-4372-A97E-AAE0915630BE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fakemodem", "FakeModem\fakemodem.vcxproj", "{ACC7F2B5-F886-4169-84C0-32E44847E2B3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{24460F70-3AE4-4587-A9C7-095934572855}.Debug|Win32.ActiveCfg = Debug|Win32
-		{24460F70-3AE4-4587-A9C7-095934572855}.Debug|Win32.Build.0 = Debug|Win32
-		{24460F70-3AE4-4587-A9C7-095934572855}.Release|Win32.ActiveCfg = Release|Win32
-		{24460F70-3AE4-4587-A9C7-095934572855}.Release|Win32.Build.0 = Release|Win32
-		{24460F70-3AE4-4587-A9C7-095934572855}.Debug|x64.ActiveCfg = Debug|x64
-		{24460F70-3AE4-4587-A9C7-095934572855}.Debug|x64.Build.0 = Debug|x64
-		{24460F70-3AE4-4587-A9C7-095934572855}.Release|x64.ActiveCfg = Release|x64
-		{24460F70-3AE4-4587-A9C7-095934572855}.Release|x64.Build.0 = Release|x64
-		{BCF39170-D785-4372-A97E-AAE0915630BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BCF39170-D785-4372-A97E-AAE0915630BE}.Debug|Win32.Build.0 = Debug|Win32
-		{BCF39170-D785-4372-A97E-AAE0915630BE}.Release|Win32.ActiveCfg = Release|Win32
-		{BCF39170-D785-4372-A97E-AAE0915630BE}.Release|Win32.Build.0 = Release|Win32
-		{BCF39170-D785-4372-A97E-AAE0915630BE}.Debug|x64.ActiveCfg = Debug|x64
-		{BCF39170-D785-4372-A97E-AAE0915630BE}.Debug|x64.Build.0 = Debug|x64
-		{BCF39170-D785-4372-A97E-AAE0915630BE}.Release|x64.ActiveCfg = Release|x64
-		{BCF39170-D785-4372-A97E-AAE0915630BE}.Release|x64.Build.0 = Release|x64
+		{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184}.Debug|Win32.Build.0 = Debug|Win32
+		{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184}.Release|Win32.ActiveCfg = Release|Win32
+		{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184}.Release|Win32.Build.0 = Release|Win32
+		{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184}.Debug|x64.ActiveCfg = Debug|x64
+		{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184}.Debug|x64.Build.0 = Debug|x64
+		{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184}.Release|x64.ActiveCfg = Release|x64
+		{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184}.Release|x64.Build.0 = Release|x64
+		{ACC7F2B5-F886-4169-84C0-32E44847E2B3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ACC7F2B5-F886-4169-84C0-32E44847E2B3}.Debug|Win32.Build.0 = Debug|Win32
+		{ACC7F2B5-F886-4169-84C0-32E44847E2B3}.Release|Win32.ActiveCfg = Release|Win32
+		{ACC7F2B5-F886-4169-84C0-32E44847E2B3}.Release|Win32.Build.0 = Release|Win32
+		{ACC7F2B5-F886-4169-84C0-32E44847E2B3}.Debug|x64.ActiveCfg = Debug|x64
+		{ACC7F2B5-F886-4169-84C0-32E44847E2B3}.Debug|x64.Build.0 = Debug|x64
+		{ACC7F2B5-F886-4169-84C0-32E44847E2B3}.Release|x64.ActiveCfg = Release|x64
+		{ACC7F2B5-F886-4169-84C0-32E44847E2B3}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{24460F70-3AE4-4587-A9C7-095934572855} = {76B0904E-842B-44FB-B2E0-8BC932912E20}
-		{BCF39170-D785-4372-A97E-AAE0915630BE} = {388FA684-8FCF-417F-AB70-1E417037B715}
+		{CF30C8F0-084B-4E2D-A9C3-E76B4E9D0184} = {56318356-CB41-44F9-9830-F051C326B8C2}
+		{ACC7F2B5-F886-4169-84C0-32E44847E2B3} = {209B0D63-1DB3-4114-9531-FCBDE7CE1B5C}
 	EndGlobalSection
 EndGlobal