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 /serial
parent: 687b274aa38fd05c8c26e3068932121876d7f745 (diff)
26 files changed, 117 insertions, 182 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
diff --git a/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj b/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj
index 3b3a3606..9d739c58 100644
--- a/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj
+++ b/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C376D98-E44B-44C6-BA97-C41F501548E6}</ProjectGuid>
+    <ProjectGuid>{65A037CB-9245-442A-A791-5CFC34E97BF7}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{C1C1FD00-5B5C-4F07-AB92-50461FEE885F}</SampleGuid>
+    <SampleGuid>{D3E77C62-C6F0-4210-824E-1875C7B48EC5}</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="VirtualSerial2um.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\VirtualSerial2um.inf</CopyOutput>
-    </Inf>
-  </ItemGroup>
+  <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>VirtualSerial2um</TargetName>
   </PropertyGroup>
@@ -180,7 +174,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/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj.Filters b/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj.Filters
index de01b778..7025cdf3 100644
--- a/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj.Filters
+++ b/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj.Filters
@@ -3,30 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{74E463E8-2208-4136-9C1D-4160F1D7A44A}</UniqueIdentifier>
+      <UniqueIdentifier>{75562F82-D2DC-4C96-8D1E-01C195D61A2C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{86516042-B85B-4491-8ACF-5B7E87D1FB11}</UniqueIdentifier>
+      <UniqueIdentifier>{0748F304-5FE6-4C01-B27A-3CD7B1A268B7}</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>{1B09240F-68FE-4973-8631-0BFDDF0CEAB9}</UniqueIdentifier>
+      <UniqueIdentifier>{87F14B94-F7A4-42E8-9931-8ADDA3989EBD}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{85FCBC36-920C-4155-96D9-7C492514995E}</UniqueIdentifier>
+      <UniqueIdentifier>{30F678DB-C12C-461E-8128-CE409AAC9C42}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include=".\Debug\\VirtualSerial2um.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
-    <Inf Include="VirtualSerial2um.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="..\device.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/serial/VirtualSerial2/ComPort/virtualserial2um.inx b/serial/VirtualSerial2/ComPort/virtualserial2um.inx
index 312c950c..6d95d795 100644
--- a/serial/VirtualSerial2/ComPort/virtualserial2um.inx
+++ b/serial/VirtualSerial2/ComPort/virtualserial2um.inx
diff --git a/serial/VirtualSerial2/FakeModem/fakemodem2um.inx b/serial/VirtualSerial2/FakeModem/fakemodem2um.inx
index 31fe730d..4487f0a6 100644
--- a/serial/VirtualSerial2/FakeModem/fakemodem2um.inx
+++ b/serial/VirtualSerial2/FakeModem/fakemodem2um.inx
diff --git a/serial/VirtualSerial2/FakeModem/fakemodem2um.vcxproj b/serial/VirtualSerial2/FakeModem/fakemodem2um.vcxproj
index 584aa824..5adc985c 100644
--- a/serial/VirtualSerial2/FakeModem/fakemodem2um.vcxproj
+++ b/serial/VirtualSerial2/FakeModem/fakemodem2um.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{6F515009-0F48-480C-8EDC-4423269D1076}</ProjectGuid>
+    <ProjectGuid>{CD78D78F-B132-4E6F-A11F-B62185A6152A}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{69E9B9C0-51CD-40CF-BFBA-291563913487}</SampleGuid>
+    <SampleGuid>{3E00ED06-5DB5-444F-8FFA-D098A0218DF2}</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="fakemodem2um.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\fakemodem2um.inf</CopyOutput>
-    </Inf>
-  </ItemGroup>
+  <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>fakemodem2um</TargetName>
   </PropertyGroup>
@@ -180,7 +174,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/VirtualSerial2/FakeModem/fakemodem2um.vcxproj.Filters b/serial/VirtualSerial2/FakeModem/fakemodem2um.vcxproj.Filters
index 5067a79b..4d54300e 100644
--- a/serial/VirtualSerial2/FakeModem/fakemodem2um.vcxproj.Filters
+++ b/serial/VirtualSerial2/FakeModem/fakemodem2um.vcxproj.Filters
@@ -3,30 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{6E68FD79-4D9F-4503-A0B5-3EFA5BC16118}</UniqueIdentifier>
+      <UniqueIdentifier>{5A926099-4361-4BDC-BF0F-D98AD6F55C3A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{009A35E7-F389-45E7-87EF-C71F6ED40D4A}</UniqueIdentifier>
+      <UniqueIdentifier>{9C5FC831-BCE8-4E84-8BED-0B1182AA7358}</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>{6351F996-859F-4432-9FE1-82A5C2B6D89B}</UniqueIdentifier>
+      <UniqueIdentifier>{43B83C13-0033-4A5E-A0DB-F0BA1B304FB0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{42391772-ED65-4368-9478-D821892B39BA}</UniqueIdentifier>
+      <UniqueIdentifier>{83A3125A-7FA1-4416-B24A-FA9C1EECAAF0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include=".\Debug\\fakemodem2um.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
-    <Inf Include="fakemodem2um.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="..\device.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/serial/VirtualSerial2/VirtualSerial.sln b/serial/VirtualSerial2/VirtualSerial.sln
index 79e3f2b0..79d6c48f 100644
--- a/serial/VirtualSerial2/VirtualSerial.sln
+++ b/serial/VirtualSerial2/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", "{69B24279-DAE7-4F6B-AB01-D5399C616D6F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComPort", "ComPort", "{F7F21610-DDE7-4709-9C48-68A0ABD1FF65}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FakeModem", "FakeModem", "{231410A2-76BA-4213-95C7-523B902B21E1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FakeModem", "FakeModem", "{704FA9C6-88FA-4381-8FA5-3407E62FAF20}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VirtualSerial2um", "ComPort\VirtualSerial2um.vcxproj", "{9C376D98-E44B-44C6-BA97-C41F501548E6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VirtualSerial2um", "ComPort\VirtualSerial2um.vcxproj", "{65A037CB-9245-442A-A791-5CFC34E97BF7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fakemodem2um", "FakeModem\fakemodem2um.vcxproj", "{6F515009-0F48-480C-8EDC-4423269D1076}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fakemodem2um", "FakeModem\fakemodem2um.vcxproj", "{CD78D78F-B132-4E6F-A11F-B62185A6152A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9C376D98-E44B-44C6-BA97-C41F501548E6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9C376D98-E44B-44C6-BA97-C41F501548E6}.Debug|Win32.Build.0 = Debug|Win32
-		{9C376D98-E44B-44C6-BA97-C41F501548E6}.Release|Win32.ActiveCfg = Release|Win32
-		{9C376D98-E44B-44C6-BA97-C41F501548E6}.Release|Win32.Build.0 = Release|Win32
-		{9C376D98-E44B-44C6-BA97-C41F501548E6}.Debug|x64.ActiveCfg = Debug|x64
-		{9C376D98-E44B-44C6-BA97-C41F501548E6}.Debug|x64.Build.0 = Debug|x64
-		{9C376D98-E44B-44C6-BA97-C41F501548E6}.Release|x64.ActiveCfg = Release|x64
-		{9C376D98-E44B-44C6-BA97-C41F501548E6}.Release|x64.Build.0 = Release|x64
-		{6F515009-0F48-480C-8EDC-4423269D1076}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6F515009-0F48-480C-8EDC-4423269D1076}.Debug|Win32.Build.0 = Debug|Win32
-		{6F515009-0F48-480C-8EDC-4423269D1076}.Release|Win32.ActiveCfg = Release|Win32
-		{6F515009-0F48-480C-8EDC-4423269D1076}.Release|Win32.Build.0 = Release|Win32
-		{6F515009-0F48-480C-8EDC-4423269D1076}.Debug|x64.ActiveCfg = Debug|x64
-		{6F515009-0F48-480C-8EDC-4423269D1076}.Debug|x64.Build.0 = Debug|x64
-		{6F515009-0F48-480C-8EDC-4423269D1076}.Release|x64.ActiveCfg = Release|x64
-		{6F515009-0F48-480C-8EDC-4423269D1076}.Release|x64.Build.0 = Release|x64
+		{65A037CB-9245-442A-A791-5CFC34E97BF7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{65A037CB-9245-442A-A791-5CFC34E97BF7}.Debug|Win32.Build.0 = Debug|Win32
+		{65A037CB-9245-442A-A791-5CFC34E97BF7}.Release|Win32.ActiveCfg = Release|Win32
+		{65A037CB-9245-442A-A791-5CFC34E97BF7}.Release|Win32.Build.0 = Release|Win32
+		{65A037CB-9245-442A-A791-5CFC34E97BF7}.Debug|x64.ActiveCfg = Debug|x64
+		{65A037CB-9245-442A-A791-5CFC34E97BF7}.Debug|x64.Build.0 = Debug|x64
+		{65A037CB-9245-442A-A791-5CFC34E97BF7}.Release|x64.ActiveCfg = Release|x64
+		{65A037CB-9245-442A-A791-5CFC34E97BF7}.Release|x64.Build.0 = Release|x64
+		{CD78D78F-B132-4E6F-A11F-B62185A6152A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CD78D78F-B132-4E6F-A11F-B62185A6152A}.Debug|Win32.Build.0 = Debug|Win32
+		{CD78D78F-B132-4E6F-A11F-B62185A6152A}.Release|Win32.ActiveCfg = Release|Win32
+		{CD78D78F-B132-4E6F-A11F-B62185A6152A}.Release|Win32.Build.0 = Release|Win32
+		{CD78D78F-B132-4E6F-A11F-B62185A6152A}.Debug|x64.ActiveCfg = Debug|x64
+		{CD78D78F-B132-4E6F-A11F-B62185A6152A}.Debug|x64.Build.0 = Debug|x64
+		{CD78D78F-B132-4E6F-A11F-B62185A6152A}.Release|x64.ActiveCfg = Release|x64
+		{CD78D78F-B132-4E6F-A11F-B62185A6152A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9C376D98-E44B-44C6-BA97-C41F501548E6} = {69B24279-DAE7-4F6B-AB01-D5399C616D6F}
-		{6F515009-0F48-480C-8EDC-4423269D1076} = {231410A2-76BA-4213-95C7-523B902B21E1}
+		{65A037CB-9245-442A-A791-5CFC34E97BF7} = {F7F21610-DDE7-4709-9C48-68A0ABD1FF65}
+		{CD78D78F-B132-4E6F-A11F-B62185A6152A} = {704FA9C6-88FA-4381-8FA5-3407E62FAF20}
 	EndGlobalSection
 EndGlobal
diff --git a/serial/VirtualSerial2/device.c b/serial/VirtualSerial2/device.c
index 78bd463b..82f9f9a6 100644
--- a/serial/VirtualSerial2/device.c
+++ b/serial/VirtualSerial2/device.c
@@ -257,7 +257,7 @@ DeviceGetPdoName(
     status = WdfDeviceAllocAndQueryProperty(
                             device,
                             DevicePropertyPhysicalDeviceObjectName,
-                            NonPagedPool,
+                            NonPagedPoolNx,
                             &attributes,
                             &memory);
     if (!NT_SUCCESS(status)) {
diff --git a/serial/serenum/SerEnum_sample.vcxproj b/serial/serenum/SerEnum_sample.vcxproj
index c7d3b6ed..67b49f45 100644
--- a/serial/serenum/SerEnum_sample.vcxproj
+++ b/serial/serenum/SerEnum_sample.vcxproj
@@ -19,17 +19,17 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{85657CCC-F271-4F62-B992-708E9B68D043}</ProjectGuid>
+    <ProjectGuid>{E21F5E1E-B4B0-4823-B4EF-2DC1A18CEAC5}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{CD6B9A4D-86E9-453F-A2B1-B73D11DDB875}</SampleGuid>
+    <SampleGuid>{CA983E6E-0A05-4429-AC0C-24F5FC55B505}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <DriverType>WDM</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -37,7 +37,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <DriverType>WDM</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -45,7 +45,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <DriverType>WDM</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -53,7 +53,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <DriverType>WDM</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -205,7 +205,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/serenum/SerEnum_sample.vcxproj.Filters b/serial/serenum/SerEnum_sample.vcxproj.Filters
index 77002c01..c2e41a09 100644
--- a/serial/serenum/SerEnum_sample.vcxproj.Filters
+++ b/serial/serenum/SerEnum_sample.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>{D57D43F2-64D0-43E4-B935-81E0A951D524}</UniqueIdentifier>
+      <UniqueIdentifier>{F9838302-4AD6-4744-8C48-09B825121D6A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{CA2B31D9-E351-4F8B-AA0B-DCC95839874B}</UniqueIdentifier>
+      <UniqueIdentifier>{A261F534-1DA6-4158-B6B4-69589AE5A0A7}</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>{511C0F53-35B0-40BA-8992-FE665F0F6C69}</UniqueIdentifier>
+      <UniqueIdentifier>{49753394-3753-4AB0-A5B8-7E9DDC20D045}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{96BE96BE-26EF-481B-B9F1-FF8D065F76E3}</UniqueIdentifier>
+      <UniqueIdentifier>{971699DC-DEF7-4D2E-9BF0-769468BBD1DF}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/serial/serenum/pnp.c b/serial/serenum/pnp.c
index 878c9a7a..597b693d 100644
--- a/serial/serenum/pnp.c
+++ b/serial/serenum/pnp.c
@@ -1460,10 +1460,10 @@ VOID SerenumStartDeviceWorker(
     }else{
         RtlZeroMemory(QueryTable,sizeof(RTL_QUERY_REGISTRY_TABLE)*2);
         QueryTable[0].QueryRoutine = NULL;
-        QueryTable[0].Flags         = RTL_QUERY_REGISTRY_DIRECT;
+        QueryTable[0].Flags         = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_TYPECHECK;;
         QueryTable[0].EntryContext = &commonData->DebugLevel;
         QueryTable[0].Name      = L"DebugLevel";
-        QueryTable[0].DefaultType   = REG_DWORD;
+        QueryTable[0].DefaultType = (REG_DWORD << RTL_QUERY_REGISTRY_TYPECHECK_SHIFT) | REG_DWORD;
         QueryTable[0].DefaultData   = &DebugLevelDefault;
         QueryTable[0].DefaultLength= sizeof(ULONG);
 
diff --git a/serial/serenum/serenum.sln b/serial/serenum/serenum.sln
index 4eed4e90..0e92c0d8 100644
--- a/serial/serenum/serenum.sln
+++ b/serial/serenum/serenum.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}") = "SerEnum_sample", "SerEnum_sample.vcxproj", "{85657CCC-F271-4F62-B992-708E9B68D043}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SerEnum_sample", "SerEnum_sample.vcxproj", "{E21F5E1E-B4B0-4823-B4EF-2DC1A18CEAC5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{85657CCC-F271-4F62-B992-708E9B68D043}.Debug|Win32.ActiveCfg = Debug|Win32
-		{85657CCC-F271-4F62-B992-708E9B68D043}.Debug|Win32.Build.0 = Debug|Win32
-		{85657CCC-F271-4F62-B992-708E9B68D043}.Release|Win32.ActiveCfg = Release|Win32
-		{85657CCC-F271-4F62-B992-708E9B68D043}.Release|Win32.Build.0 = Release|Win32
-		{85657CCC-F271-4F62-B992-708E9B68D043}.Debug|x64.ActiveCfg = Debug|x64
-		{85657CCC-F271-4F62-B992-708E9B68D043}.Debug|x64.Build.0 = Debug|x64
-		{85657CCC-F271-4F62-B992-708E9B68D043}.Release|x64.ActiveCfg = Release|x64
-		{85657CCC-F271-4F62-B992-708E9B68D043}.Release|x64.Build.0 = Release|x64
+		{E21F5E1E-B4B0-4823-B4EF-2DC1A18CEAC5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E21F5E1E-B4B0-4823-B4EF-2DC1A18CEAC5}.Debug|Win32.Build.0 = Debug|Win32
+		{E21F5E1E-B4B0-4823-B4EF-2DC1A18CEAC5}.Release|Win32.ActiveCfg = Release|Win32
+		{E21F5E1E-B4B0-4823-B4EF-2DC1A18CEAC5}.Release|Win32.Build.0 = Release|Win32
+		{E21F5E1E-B4B0-4823-B4EF-2DC1A18CEAC5}.Debug|x64.ActiveCfg = Debug|x64
+		{E21F5E1E-B4B0-4823-B4EF-2DC1A18CEAC5}.Debug|x64.Build.0 = Debug|x64
+		{E21F5E1E-B4B0-4823-B4EF-2DC1A18CEAC5}.Release|x64.ActiveCfg = Release|x64
+		{E21F5E1E-B4B0-4823-B4EF-2DC1A18CEAC5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/serial/serial/ioctl.c b/serial/serial/ioctl.c
index ceef711e..339cdc6a 100644
--- a/serial/serial/ioctl.c
+++ b/serial/serial/ioctl.c
@@ -1298,7 +1298,7 @@ Return Value:
 
             reqContext->Type3InputBuffer =
                     ExAllocatePoolWithQuotaTag(
-                        NonPagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE,
+                        NonPagedPoolNx | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE,
                         Rs->InSize,
                         POOL_TAG
                         );
diff --git a/serial/serial/openclos.c b/serial/serial/openclos.c
index a6310440..c59439e9 100644
--- a/serial/serial/openclos.c
+++ b/serial/serial/openclos.c
@@ -149,7 +149,7 @@ SerialDeviceFileCreateWorker (
 
             extension->BufferSize = 4096;
             extension->InterruptReadBuffer = ExAllocatePoolWithTag(
-                                                 NonPagedPool,
+                                                 NonPagedPoolNx,
                                                  extension->BufferSize,
                                                  POOL_TAG
                                                  );
@@ -164,7 +164,7 @@ SerialDeviceFileCreateWorker (
 
             extension->BufferSize = 1024;
             extension->InterruptReadBuffer = ExAllocatePoolWithTag(
-                                                 NonPagedPool,
+                                                 NonPagedPoolNx,
                                                  extension->BufferSize,
                                                  POOL_TAG
                                                  );
@@ -179,7 +179,7 @@ SerialDeviceFileCreateWorker (
 
             extension->BufferSize = 128;
             extension->InterruptReadBuffer = ExAllocatePoolWithTag(
-                                                 NonPagedPool,
+                                                 NonPagedPoolNx,
                                                  extension->BufferSize,
                                                  POOL_TAG
                                                  );
diff --git a/serial/serial/pnp.c b/serial/serial/pnp.c
index d20e47dd..8045303d 100644
--- a/serial/serial/pnp.c
+++ b/serial/serial/pnp.c
@@ -97,6 +97,12 @@ PVOID LocalMmMapIoSpace(
                                PAGE_READWRITE | PAGE_NOCACHE); 
     }
 
+    //
+    // Supress warning that MmMapIoSpace allocates executable memory.
+    // This function is only used if the preferred API, MmMapIoSpaceEx
+    // is not present. MmMapIoSpaceEx is available starting in WIN10.
+    //
+    #pragma warning(suppress: 30029)
     return MmMapIoSpace(PhysicalAddress, NumberOfBytes, MmNonCached); 
 }
 
diff --git a/serial/serial/serial.inx b/serial/serial/serial.inx
index e71feb31..21cae30e 100644
--- a/serial/serial/serial.inx
+++ b/serial/serial/serial.inx
diff --git a/serial/serial/serial.sln b/serial/serial/serial.sln
index 01eed1bf..f1605d94 100644
--- a/serial/serial/serial.sln
+++ b/serial/serial/serial.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}") = "wdfserial", "wdfserial.vcxproj", "{787157F2-E2F3-4ACB-A858-7DBA4400ED38}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wdfserial", "wdfserial.vcxproj", "{E3B48B18-2E53-4ED2-A4BA-EC399764537A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{787157F2-E2F3-4ACB-A858-7DBA4400ED38}.Debug|Win32.ActiveCfg = Debug|Win32
-		{787157F2-E2F3-4ACB-A858-7DBA4400ED38}.Debug|Win32.Build.0 = Debug|Win32
-		{787157F2-E2F3-4ACB-A858-7DBA4400ED38}.Release|Win32.ActiveCfg = Release|Win32
-		{787157F2-E2F3-4ACB-A858-7DBA4400ED38}.Release|Win32.Build.0 = Release|Win32
-		{787157F2-E2F3-4ACB-A858-7DBA4400ED38}.Debug|x64.ActiveCfg = Debug|x64
-		{787157F2-E2F3-4ACB-A858-7DBA4400ED38}.Debug|x64.Build.0 = Debug|x64
-		{787157F2-E2F3-4ACB-A858-7DBA4400ED38}.Release|x64.ActiveCfg = Release|x64
-		{787157F2-E2F3-4ACB-A858-7DBA4400ED38}.Release|x64.Build.0 = Release|x64
+		{E3B48B18-2E53-4ED2-A4BA-EC399764537A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E3B48B18-2E53-4ED2-A4BA-EC399764537A}.Debug|Win32.Build.0 = Debug|Win32
+		{E3B48B18-2E53-4ED2-A4BA-EC399764537A}.Release|Win32.ActiveCfg = Release|Win32
+		{E3B48B18-2E53-4ED2-A4BA-EC399764537A}.Release|Win32.Build.0 = Release|Win32
+		{E3B48B18-2E53-4ED2-A4BA-EC399764537A}.Debug|x64.ActiveCfg = Debug|x64
+		{E3B48B18-2E53-4ED2-A4BA-EC399764537A}.Debug|x64.Build.0 = Debug|x64
+		{E3B48B18-2E53-4ED2-A4BA-EC399764537A}.Release|x64.ActiveCfg = Release|x64
+		{E3B48B18-2E53-4ED2-A4BA-EC399764537A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/serial/serial/wdfserial.vcxproj b/serial/serial/wdfserial.vcxproj
index 2c25e2e1..4361e805 100644
--- a/serial/serial/wdfserial.vcxproj
+++ b/serial/serial/wdfserial.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{787157F2-E2F3-4ACB-A858-7DBA4400ED38}</ProjectGuid>
+    <ProjectGuid>{E3B48B18-2E53-4ED2-A4BA-EC399764537A}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{368172FD-353B-4B6F-983C-DB2CB6D3E37C}</SampleGuid>
+    <SampleGuid>{FDD6C9D3-EA4F-4F2D-B67E-08069B83000B}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -266,11 +266,6 @@
       <PreCompiledHeader>Use</PreCompiledHeader>
       <PreCompiledHeaderOutputFile>$(IntDir)\precomp.pch</PreCompiledHeaderOutputFile>
     </ClCompile>
-    <Inf Include=".\serial.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\serial.inf</CopyOutput>
-    </Inf>
     <OtherWpp Include="serial.rc; serlog.mc">
       <WppEnabled>true</WppEnabled>
       <WppKernelMode>true</WppKernelMode>
@@ -375,7 +370,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/serial/wdfserial.vcxproj.Filters b/serial/serial/wdfserial.vcxproj.Filters
index d46307e6..0a818882 100644
--- a/serial/serial/wdfserial.vcxproj.Filters
+++ b/serial/serial/wdfserial.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>{F6210FA1-03EF-44C9-A049-317C86CB6108}</UniqueIdentifier>
+      <UniqueIdentifier>{4D12751F-90E2-480C-ADCF-EEDAAFFD9C57}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{D2D50F99-E5BE-444B-A65B-9E509A935F45}</UniqueIdentifier>
+      <UniqueIdentifier>{59C993D4-EA02-4442-BBC9-684B51C41C00}</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>{10B8A7EE-C817-424C-A850-E21F7DE8C8B5}</UniqueIdentifier>
+      <UniqueIdentifier>{2A84A485-FE49-4E3D-8AB6-EB5ACCE646C8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{1FDF6179-3D32-4F47-BF5F-D497E58451C2}</UniqueIdentifier>
+      <UniqueIdentifier>{25FFE655-03CE-457C-A01B-9BAB1FB83EBC}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -81,12 +81,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include=".\Debug\\serial.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
-    <Inf Include=".\serial.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MessageCompile Include="serlog.mc">
       <Filter>Driver Files</Filter>
     </MessageCompile>
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 /serial
parent	687b274aa38fd05c8c26e3068932121876d7f745 (diff)