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

5 files changed, 17 insertions, 28 deletions

diff --git a/storage/ramdisk/ramdisk.sln b/storage/ramdisk/ramdisk.sln
index a94adfd1..ca8409b5 100644
--- a/storage/ramdisk/ramdisk.sln
+++ b/storage/ramdisk/ramdisk.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}") = "WdfRamdisk", "src\WdfRamdisk.vcxproj", "{8BD18F95-E980-494A-9058-F0DA28C0ECB9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WdfRamdisk", "src\WdfRamdisk.vcxproj", "{68CDA2C2-2417-4963-9AEF-CB1B9FEF6069}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Debug|Win32.Build.0 = Debug|Win32
-		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Release|Win32.ActiveCfg = Release|Win32
-		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Release|Win32.Build.0 = Release|Win32
-		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Debug|x64.ActiveCfg = Debug|x64
-		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Debug|x64.Build.0 = Debug|x64
-		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Release|x64.ActiveCfg = Release|x64
-		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Release|x64.Build.0 = Release|x64
+		{68CDA2C2-2417-4963-9AEF-CB1B9FEF6069}.Debug|Win32.ActiveCfg = Debug|Win32
+		{68CDA2C2-2417-4963-9AEF-CB1B9FEF6069}.Debug|Win32.Build.0 = Debug|Win32
+		{68CDA2C2-2417-4963-9AEF-CB1B9FEF6069}.Release|Win32.ActiveCfg = Release|Win32
+		{68CDA2C2-2417-4963-9AEF-CB1B9FEF6069}.Release|Win32.Build.0 = Release|Win32
+		{68CDA2C2-2417-4963-9AEF-CB1B9FEF6069}.Debug|x64.ActiveCfg = Debug|x64
+		{68CDA2C2-2417-4963-9AEF-CB1B9FEF6069}.Debug|x64.Build.0 = Debug|x64
+		{68CDA2C2-2417-4963-9AEF-CB1B9FEF6069}.Release|x64.ActiveCfg = Release|x64
+		{68CDA2C2-2417-4963-9AEF-CB1B9FEF6069}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/storage/ramdisk/src/WdfRamdisk.vcxproj b/storage/ramdisk/src/WdfRamdisk.vcxproj
index 655faf0f..10e35ae1 100644
--- a/storage/ramdisk/src/WdfRamdisk.vcxproj
+++ b/storage/ramdisk/src/WdfRamdisk.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{8BD18F95-E980-494A-9058-F0DA28C0ECB9}</ProjectGuid>
+    <ProjectGuid>{68CDA2C2-2417-4963-9AEF-CB1B9FEF6069}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{E179004E-17AB-4904-B671-B3D996E2E00C}</SampleGuid>
+    <SampleGuid>{D76D15E5-06FE-43C8-A0E5-988E71FD53AB}</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=".\ramdisk.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\ramdisk.inf</CopyOutput>
-    </Inf>
-  </ItemGroup>
+  <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>WdfRamdisk</TargetName>
   </PropertyGroup>
diff --git a/storage/ramdisk/src/WdfRamdisk.vcxproj.Filters b/storage/ramdisk/src/WdfRamdisk.vcxproj.Filters
index d4dc5230..b5fde5b1 100644
--- a/storage/ramdisk/src/WdfRamdisk.vcxproj.Filters
+++ b/storage/ramdisk/src/WdfRamdisk.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{B4C67F3E-3D06-47B0-A09C-4E0740919AF8}</UniqueIdentifier>
+      <UniqueIdentifier>{961D42E9-6D94-4E93-8D32-CF1C674B07B6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{74F7327B-A6C4-481F-998B-5D49FAC38D3D}</UniqueIdentifier>
+      <UniqueIdentifier>{D22FB3CB-1355-4386-84BE-230FFB99DCFE}</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>{1E530CA0-70B5-4B7F-A753-F3CDA9804897}</UniqueIdentifier>
+      <UniqueIdentifier>{28C48AF7-BB6E-4F6A-922D-9BF76BC2AC8A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{7B63C0F9-A06F-453D-8701-3EA7C844F62D}</UniqueIdentifier>
+      <UniqueIdentifier>{576E635F-EBBD-4ECA-8F75-D27C53603644}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\ramdisk.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="forward_progress.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/storage/ramdisk/src/ramdisk.c b/storage/ramdisk/src/ramdisk.c
index ce571706..5411f3a9 100644
--- a/storage/ramdisk/src/ramdisk.c
+++ b/storage/ramdisk/src/ramdisk.c
@@ -484,7 +484,7 @@ Return Value:
     // Allocate memory for the disk image.
     //
     pDeviceExtension->DiskImage = ExAllocatePoolWithTag(
-        NonPagedPool,
+        NonPagedPoolNx,
         pDeviceExtension->DiskRegInfo.DiskSize,
         RAMDISK_TAG
         );
diff --git a/storage/ramdisk/src/ramdisk.inx b/storage/ramdisk/src/ramdisk.inx
index 85210823..cf48a217 100644
--- a/storage/ramdisk/src/ramdisk.inx
+++ b/storage/ramdisk/src/ramdisk.inx