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

7 files changed, 52 insertions, 55 deletions

diff --git a/general/pcidrv/kmdf/HW/PCIDRV.vcxproj b/general/pcidrv/kmdf/HW/PCIDRV.vcxproj
index f37c79b1..fdf14d4d 100644
--- a/general/pcidrv/kmdf/HW/PCIDRV.vcxproj
+++ b/general/pcidrv/kmdf/HW/PCIDRV.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{147B5094-8C9D-4C84-B266-297D1E03D038}</ProjectGuid>
+    <ProjectGuid>{3DC6A380-6A31-4460-B934-83E1BAC700EE}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{31AFCCDA-DE2F-4533-AFB7-F8D0C668C5AE}</SampleGuid>
+    <SampleGuid>{CE26AF24-DCC9-47E5-A4EF-F27522A31C90}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -186,11 +186,6 @@
       <PreCompiledHeader>Use</PreCompiledHeader>
       <PreCompiledHeaderOutputFile>$(IntDir)\precomp.pch</PreCompiledHeaderOutputFile>
     </ClCompile>
-    <Inf Include="..\genpci.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\genpci.inf</CopyOutput>
-    </Inf>
     <MofComp Include="..\pcidrv.mof">
       <CreateBinaryMofFile>".\$(IntDir)\pcidrv.bmf"</CreateBinaryMofFile>
     </MofComp>
@@ -284,54 +279,54 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;POOL_NX_OPTIN=1</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/general/pcidrv/kmdf/HW/PCIDRV.vcxproj.Filters b/general/pcidrv/kmdf/HW/PCIDRV.vcxproj.Filters
index ceed7571..5b231159 100644
--- a/general/pcidrv/kmdf/HW/PCIDRV.vcxproj.Filters
+++ b/general/pcidrv/kmdf/HW/PCIDRV.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>{0952D163-791F-4123-BCD0-F58AFDBD257F}</UniqueIdentifier>
+      <UniqueIdentifier>{DB96CB22-6A66-43CC-85A1-595B666359FA}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{AF230497-BE0C-4FA2-95A2-9BD4EFC3EB49}</UniqueIdentifier>
+      <UniqueIdentifier>{A2E37450-3BB8-4654-83E7-A2D4C6389188}</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>{38573357-97D6-4F88-9261-F38ABE26C075}</UniqueIdentifier>
+      <UniqueIdentifier>{BED5B461-9900-4B64-AA62-7EB31CBAD465}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{8DB6212C-6D77-4437-87CE-60D7E13C7314}</UniqueIdentifier>
+      <UniqueIdentifier>{45FBFCD5-F036-411A-84A3-0EAF7388567B}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -57,9 +57,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="..\genpci.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MofComp Include="..\pcidrv.mof">
       <Filter>Driver Files</Filter>
     </MofComp>
diff --git a/general/pcidrv/kmdf/PCIDRV.C b/general/pcidrv/kmdf/PCIDRV.C
index 41a71b3c..e3f65678 100644
--- a/general/pcidrv/kmdf/PCIDRV.C
+++ b/general/pcidrv/kmdf/PCIDRV.C
@@ -111,6 +111,11 @@ Return Value:
     PDRIVER_CONTEXT        driverContext;
 
     //
+    // Allow NonPagedPool to be mapped to NonPagedPoolNx on WIN8 and newer OS's 
+    //
+    ExInitializeDriverRuntime(DrvRtPoolNxOptIn);
+
+    //
     // Initialize WPP Tracing
     //
     WPP_INIT_TRACING( DriverObject, RegistryPath );
diff --git a/general/pcidrv/kmdf/genpci.inx b/general/pcidrv/kmdf/genpci.inx
index 9711236b..b278dcd8 100644
--- a/general/pcidrv/kmdf/genpci.inx
+++ b/general/pcidrv/kmdf/genpci.inx
diff --git a/general/pcidrv/pcidrv.sln b/general/pcidrv/pcidrv.sln
index d7720b8e..5f93e524 100644
--- a/general/pcidrv/pcidrv.sln
+++ b/general/pcidrv/pcidrv.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}") = "Test", "Test", "{C5095E94-8EC9-45BE-9EDF-B080381F0ABE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{81C106DF-8695-4395-B58E-31F0EF3496FC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HW", "HW", "{4926BA95-0E65-44E7-9A0D-0FB3190E4141}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HW", "HW", "{203C7FF1-146A-41D9-A2B4-AB21B38DF232}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kmdf", "Kmdf", "{18525246-BE0C-4DA9-91ED-74DD067860C8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kmdf", "Kmdf", "{78452B5A-06CB-41D0-AB5F-42E59F5A3209}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myping", "test\myping.vcxproj", "{B04477EF-85F2-47B6-A669-39E90D52DFB9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myping", "test\myping.vcxproj", "{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PCIDRV", "kmdf\HW\PCIDRV.vcxproj", "{147B5094-8C9D-4C84-B266-297D1E03D038}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PCIDRV", "kmdf\HW\PCIDRV.vcxproj", "{3DC6A380-6A31-4460-B934-83E1BAC700EE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,29 +21,29 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Debug|Win32.Build.0 = Debug|Win32
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Release|Win32.ActiveCfg = Release|Win32
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Release|Win32.Build.0 = Release|Win32
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Debug|x64.ActiveCfg = Debug|x64
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Debug|x64.Build.0 = Debug|x64
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Release|x64.ActiveCfg = Release|x64
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9}.Release|x64.Build.0 = Release|x64
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Debug|Win32.ActiveCfg = Debug|Win32
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Debug|Win32.Build.0 = Debug|Win32
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Release|Win32.ActiveCfg = Release|Win32
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Release|Win32.Build.0 = Release|Win32
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Debug|x64.ActiveCfg = Debug|x64
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Debug|x64.Build.0 = Debug|x64
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Release|x64.ActiveCfg = Release|x64
-		{147B5094-8C9D-4C84-B266-297D1E03D038}.Release|x64.Build.0 = Release|x64
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Debug|Win32.Build.0 = Debug|Win32
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Release|Win32.ActiveCfg = Release|Win32
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Release|Win32.Build.0 = Release|Win32
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Debug|x64.ActiveCfg = Debug|x64
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Debug|x64.Build.0 = Debug|x64
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Release|x64.ActiveCfg = Release|x64
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}.Release|x64.Build.0 = Release|x64
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Debug|Win32.Build.0 = Debug|Win32
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Release|Win32.ActiveCfg = Release|Win32
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Release|Win32.Build.0 = Release|Win32
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Debug|x64.ActiveCfg = Debug|x64
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Debug|x64.Build.0 = Debug|x64
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Release|x64.ActiveCfg = Release|x64
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B04477EF-85F2-47B6-A669-39E90D52DFB9} = {C5095E94-8EC9-45BE-9EDF-B080381F0ABE}
-		{147B5094-8C9D-4C84-B266-297D1E03D038} = {4926BA95-0E65-44E7-9A0D-0FB3190E4141}
-		{4926BA95-0E65-44E7-9A0D-0FB3190E4141} = {18525246-BE0C-4DA9-91ED-74DD067860C8}
+		{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B} = {81C106DF-8695-4395-B58E-31F0EF3496FC}
+		{3DC6A380-6A31-4460-B934-83E1BAC700EE} = {203C7FF1-146A-41D9-A2B4-AB21B38DF232}
+		{203C7FF1-146A-41D9-A2B4-AB21B38DF232} = {78452B5A-06CB-41D0-AB5F-42E59F5A3209}
 	EndGlobalSection
 EndGlobal
diff --git a/general/pcidrv/test/myping.vcxproj b/general/pcidrv/test/myping.vcxproj
index 921944fc..c5d03091 100644
--- a/general/pcidrv/test/myping.vcxproj
+++ b/general/pcidrv/test/myping.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B04477EF-85F2-47B6-A669-39E90D52DFB9}</ProjectGuid>
+    <ProjectGuid>{E5CE48A7-8BCC-4888-9A2E-C47DBC70771B}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{7BAACFF2-0887-4947-85E0-1A609F5CAA8A}</SampleGuid>
+    <SampleGuid>{A5C4D92B-0C39-42B8-9B1E-DA4A2583C1CC}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/pcidrv/test/myping.vcxproj.Filters b/general/pcidrv/test/myping.vcxproj.Filters
index c3c1c20d..0af44f95 100644
--- a/general/pcidrv/test/myping.vcxproj.Filters
+++ b/general/pcidrv/test/myping.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>{E227B2E2-02E5-416E-87EA-041459F6A688}</UniqueIdentifier>
+      <UniqueIdentifier>{CB89C3D8-5D89-4E0E-921B-0A352CFF9B62}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{3723BC8D-C247-4CC3-9752-9E4A013C403A}</UniqueIdentifier>
+      <UniqueIdentifier>{39480465-BA23-4466-9C53-BC0F48547978}</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>{82B8C96C-7352-4531-A71B-137B4FD15E6C}</UniqueIdentifier>
+      <UniqueIdentifier>{A1734800-97BC-489E-934F-051BC44DE1F1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>