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

6 files changed, 48 insertions, 34 deletions

diff --git a/general/event/eventsample.sln b/general/event/eventsample.sln
index fd6ce73a..3bb164b2 100644
--- a/general/event/eventsample.sln
+++ b/general/event/eventsample.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}") = "Exe", "Exe", "{A9909D6D-8A29-406C-A968-49D288571564}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{2FC03CC0-1C79-456A-9014-274D87327B9A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wdm", "Wdm", "{6D384D47-52EE-4445-9F2F-A5947E8D36BE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wdm", "Wdm", "{D1C7DC44-3DC6-475C-A445-CBDF807DC810}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "exe\event.vcxproj", "{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "exe\event.vcxproj", "{43F430EA-B1A7-4A80-B390-121C1C5A99C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "wdm\event.vcxproj", "{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event", "wdm\event.vcxproj", "{21F8EA86-F950-4D2D-B256-721B3151157A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Debug|Win32.Build.0 = Debug|Win32
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Release|Win32.ActiveCfg = Release|Win32
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Release|Win32.Build.0 = Release|Win32
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Debug|x64.ActiveCfg = Debug|x64
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Debug|x64.Build.0 = Debug|x64
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Release|x64.ActiveCfg = Release|x64
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}.Release|x64.Build.0 = Release|x64
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Debug|Win32.Build.0 = Debug|Win32
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Release|Win32.ActiveCfg = Release|Win32
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Release|Win32.Build.0 = Release|Win32
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Debug|x64.ActiveCfg = Debug|x64
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Debug|x64.Build.0 = Debug|x64
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Release|x64.ActiveCfg = Release|x64
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}.Release|x64.Build.0 = Release|x64
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Debug|Win32.Build.0 = Debug|Win32
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Release|Win32.ActiveCfg = Release|Win32
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Release|Win32.Build.0 = Release|Win32
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Debug|x64.ActiveCfg = Debug|x64
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Debug|x64.Build.0 = Debug|x64
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Release|x64.ActiveCfg = Release|x64
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4}.Release|x64.Build.0 = Release|x64
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Debug|Win32.Build.0 = Debug|Win32
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Release|Win32.ActiveCfg = Release|Win32
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Release|Win32.Build.0 = Release|Win32
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Debug|x64.ActiveCfg = Debug|x64
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Debug|x64.Build.0 = Debug|x64
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Release|x64.ActiveCfg = Release|x64
+		{21F8EA86-F950-4D2D-B256-721B3151157A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA} = {A9909D6D-8A29-406C-A968-49D288571564}
-		{D93E9D2A-3306-4650-ADB5-BB6720C58FDB} = {6D384D47-52EE-4445-9F2F-A5947E8D36BE}
+		{43F430EA-B1A7-4A80-B390-121C1C5A99C4} = {2FC03CC0-1C79-456A-9014-274D87327B9A}
+		{21F8EA86-F950-4D2D-B256-721B3151157A} = {D1C7DC44-3DC6-475C-A445-CBDF807DC810}
 	EndGlobalSection
 EndGlobal
diff --git a/general/event/exe/event.vcxproj b/general/event/exe/event.vcxproj
index c766e610..59df0e8b 100644
--- a/general/event/exe/event.vcxproj
+++ b/general/event/exe/event.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A35911F0-5F6A-425B-90C8-1B6A25B0B6AA}</ProjectGuid>
+    <ProjectGuid>{43F430EA-B1A7-4A80-B390-121C1C5A99C4}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{F9033692-F4E7-4095-BC2B-D5BADC007D30}</SampleGuid>
+    <SampleGuid>{BF9BBA5B-7BCF-4527-B357-39679BBF1DBA}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/event/exe/event.vcxproj.Filters b/general/event/exe/event.vcxproj.Filters
index 086ec75c..24066c0a 100644
--- a/general/event/exe/event.vcxproj.Filters
+++ b/general/event/exe/event.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>{4A49E5E2-7CFB-4C09-A2FC-0DFC1BDF6F29}</UniqueIdentifier>
+      <UniqueIdentifier>{55A3C741-9CBD-4AA7-98D2-AB032642C676}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{9B2A6E91-192B-4E3B-8FEB-CB07E83DC175}</UniqueIdentifier>
+      <UniqueIdentifier>{1F31A1C8-AAB4-41AA-9353-F91A6A185B2F}</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>{89F7E440-8EFA-40ED-869F-A9B66BAFD9CE}</UniqueIdentifier>
+      <UniqueIdentifier>{88F38F8A-D5F3-4C24-A9E8-9B6A574D60C6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/event/wdm/event.c b/general/event/wdm/event.c
index 64bae443..8900d722 100644
--- a/general/event/wdm/event.c
+++ b/general/event/wdm/event.c
@@ -107,7 +107,13 @@ Return Value:
 
     UNREFERENCED_PARAMETER(RegistryPath);
 
-    DebugPrint(("==>DriverEntry\n"));
+	DebugPrint(("==>DriverEntry\n")); DbgBreakPoint();
+
+    //
+    // Opt-in to using non-executable pool memory on Windows 8 and later.
+    // https://msdn.microsoft.com/en-us/library/windows/hardware/hh920402(v=vs.85).aspx
+    //
+    ExInitializeDriverRuntime(DrvRtPoolNxOptIn);
 
     //
     // Create the device object
diff --git a/general/event/wdm/event.vcxproj b/general/event/wdm/event.vcxproj
index e04e27f4..507a3b57 100644
--- a/general/event/wdm/event.vcxproj
+++ b/general/event/wdm/event.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{D93E9D2A-3306-4650-ADB5-BB6720C58FDB}</ProjectGuid>
+    <ProjectGuid>{21F8EA86-F950-4D2D-B256-721B3151157A}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{4CDA076B-602B-41D2-B44E-C5A30A5FAEC9}</SampleGuid>
+    <SampleGuid>{CB8CC3B6-AB82-4CC0-A34E-F410EECB74B1}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -89,24 +89,28 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
@@ -117,24 +121,28 @@
   </ItemGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);POOL_NX_OPTIN=1</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
diff --git a/general/event/wdm/event.vcxproj.Filters b/general/event/wdm/event.vcxproj.Filters
index 51e6e7a2..0b3ee89a 100644
--- a/general/event/wdm/event.vcxproj.Filters
+++ b/general/event/wdm/event.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>{FBA431BE-C574-4FA3-A9A7-AC53BC5FA3D8}</UniqueIdentifier>
+      <UniqueIdentifier>{E8EC7AB7-4A52-40EF-AE2C-2407B7383221}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{59F6A01C-DE89-40FA-974F-C7A4F9FE7382}</UniqueIdentifier>
+      <UniqueIdentifier>{1F009C6F-D429-4D66-99E1-3728B7F559FE}</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>{3030B68B-29A8-42DA-97F3-9E142944B42D}</UniqueIdentifier>
+      <UniqueIdentifier>{7428ED65-F559-4708-A24F-FE39C1B3C86B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{FE8A95D1-C7A7-4574-95F7-8A2D87F51FC9}</UniqueIdentifier>
+      <UniqueIdentifier>{C55E0ADA-91DE-4876-88FD-3FF9ED492D70}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>