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

5 files changed, 17 insertions, 25 deletions

diff --git a/wmi/wmisamp/WmiSamp.vcxproj b/wmi/wmisamp/WmiSamp.vcxproj
index 97c15d36..70763334 100644
--- a/wmi/wmisamp/WmiSamp.vcxproj
+++ b/wmi/wmisamp/WmiSamp.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{AB1C3428-9D78-4226-9A5D-DC92A47C279E}</ProjectGuid>
+    <ProjectGuid>{126FE1F4-434C-496A-A52B-400BBB74AC3B}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{BB241330-87DE-4B07-A649-644EA6B5DD53}</SampleGuid>
+    <SampleGuid>{224F1D35-6CD5-408C-822A-A57A2BAABE53}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -76,11 +76,6 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
   <ItemGroup Label="WrappedTaskItems">
-    <Inf Include=".\WmiSamp.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\WmiSamp.inf</CopyOutput>
-    </Inf>
     <MofComp Include="wmisamp.mof">
       <WmiSyntaxCheck>true</WmiSyntaxCheck>
       <CreateBinaryMofFile>.\$(IntDir)\wmisamp.bmf</CreateBinaryMofFile>
diff --git a/wmi/wmisamp/WmiSamp.vcxproj.Filters b/wmi/wmisamp/WmiSamp.vcxproj.Filters
index 5762f68d..62740dd2 100644
--- a/wmi/wmisamp/WmiSamp.vcxproj.Filters
+++ b/wmi/wmisamp/WmiSamp.vcxproj.Filters
@@ -3,25 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{84DF3964-E443-46B3-B677-E075E77ABFEF}</UniqueIdentifier>
+      <UniqueIdentifier>{A35FAE4A-A10D-4F57-875A-870D11320AB3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{6F32A550-2374-44C0-A563-5FA52662B7D8}</UniqueIdentifier>
+      <UniqueIdentifier>{EE71E8BF-130F-40AC-9AAF-550A55E7168B}</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>{AF19E735-3412-4D30-9744-AB595DBAB93B}</UniqueIdentifier>
+      <UniqueIdentifier>{F1CEAE6E-F3C8-4CA5-A43C-133A6A38B446}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{E5626644-0466-47E1-8470-73B4A040D5F2}</UniqueIdentifier>
+      <UniqueIdentifier>{EDD02E0D-300A-45CC-A637-CC38CECCA39A}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\WmiSamp.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MofComp Include="wmisamp.mof">
       <Filter>Driver Files</Filter>
     </MofComp>
diff --git a/wmi/wmisamp/wmisamp.c b/wmi/wmisamp/wmisamp.c
index 0c8bba71..5bf8bd61 100644
--- a/wmi/wmisamp/wmisamp.c
+++ b/wmi/wmisamp/wmisamp.c
@@ -314,7 +314,7 @@ WmiSampSetEc1(
         return;
     }
 
-    ec1 = ExAllocatePoolWithTag(NonPagedPool, ec1Length, WMI_SAMPLE_TAG);
+    ec1 = ExAllocatePoolWithTag(NonPagedPoolNx, ec1Length, WMI_SAMPLE_TAG);
     if (ec1 != NULL) {
 
         RtlCopyMemory(ec1, Buffer, Length);
@@ -394,7 +394,7 @@ WmiSampSetEc2(
         return;
     }
 
-    ec2 = ExAllocatePoolWithTag(NonPagedPool, ec2Length, WMI_SAMPLE_TAG);
+    ec2 = ExAllocatePoolWithTag(NonPagedPoolNx, ec2Length, WMI_SAMPLE_TAG);
     if (ec2 != NULL) {
 
         RtlCopyMemory(ec2, Buffer, Length);
diff --git a/wmi/wmisamp/wmisamp.inx b/wmi/wmisamp/wmisamp.inx
index 30d83ae8..be89d405 100644
--- a/wmi/wmisamp/wmisamp.inx
+++ b/wmi/wmisamp/wmisamp.inx
diff --git a/wmi/wmisamp/wmisamp.sln b/wmi/wmisamp/wmisamp.sln
index 54c94351..2724504e 100644
--- a/wmi/wmisamp/wmisamp.sln
+++ b/wmi/wmisamp/wmisamp.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}") = "WmiSamp", "WmiSamp.vcxproj", "{AB1C3428-9D78-4226-9A5D-DC92A47C279E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WmiSamp", "WmiSamp.vcxproj", "{126FE1F4-434C-496A-A52B-400BBB74AC3B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Debug|Win32.Build.0 = Debug|Win32
-		{AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Release|Win32.ActiveCfg = Release|Win32
-		{AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Release|Win32.Build.0 = Release|Win32
-		{AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Debug|x64.ActiveCfg = Debug|x64
-		{AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Debug|x64.Build.0 = Debug|x64
-		{AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Release|x64.ActiveCfg = Release|x64
-		{AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Release|x64.Build.0 = Release|x64
+		{126FE1F4-434C-496A-A52B-400BBB74AC3B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{126FE1F4-434C-496A-A52B-400BBB74AC3B}.Debug|Win32.Build.0 = Debug|Win32
+		{126FE1F4-434C-496A-A52B-400BBB74AC3B}.Release|Win32.ActiveCfg = Release|Win32
+		{126FE1F4-434C-496A-A52B-400BBB74AC3B}.Release|Win32.Build.0 = Release|Win32
+		{126FE1F4-434C-496A-A52B-400BBB74AC3B}.Debug|x64.ActiveCfg = Debug|x64
+		{126FE1F4-434C-496A-A52B-400BBB74AC3B}.Debug|x64.Build.0 = Debug|x64
+		{126FE1F4-434C-496A-A52B-400BBB74AC3B}.Release|x64.ActiveCfg = Release|x64
+		{126FE1F4-434C-496A-A52B-400BBB74AC3B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE