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

14 files changed, 88 insertions, 88 deletions

diff --git a/general/ioctl/kmdf/exe/nonpnpapp.vcxproj b/general/ioctl/kmdf/exe/nonpnpapp.vcxproj
index 2c94c413..beefe967 100644
--- a/general/ioctl/kmdf/exe/nonpnpapp.vcxproj
+++ b/general/ioctl/kmdf/exe/nonpnpapp.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{0EF21B20-E757-4FD0-8A1C-4ABF6FD7E466}</ProjectGuid>
+    <ProjectGuid>{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <KMDF_VERSION_MINOR>11</KMDF_VERSION_MINOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{FF8A5123-63A1-4527-A466-ED494318076D}</SampleGuid>
+    <SampleGuid>{F5414C9C-6CDE-4673-879E-27AD5A30C4C5}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/ioctl/kmdf/exe/nonpnpapp.vcxproj.Filters b/general/ioctl/kmdf/exe/nonpnpapp.vcxproj.Filters
index 221896d4..264eb8eb 100644
--- a/general/ioctl/kmdf/exe/nonpnpapp.vcxproj.Filters
+++ b/general/ioctl/kmdf/exe/nonpnpapp.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>{438A7A19-8784-4ADC-BB59-D3D149EA5459}</UniqueIdentifier>
+      <UniqueIdentifier>{1ABA2FD0-ACFA-4BE3-9294-AD78BDFAFB28}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A4461789-7186-462B-9A53-73365178FC6A}</UniqueIdentifier>
+      <UniqueIdentifier>{B2BBAC2E-0840-44AD-B46B-A87DFD88D9FE}</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>{323846A7-7FFC-4D78-8D57-B470FE54DE4B}</UniqueIdentifier>
+      <UniqueIdentifier>{6F984D8E-34B3-4615-BFC7-A472099FD919}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/ioctl/kmdf/exe/testapp.c b/general/ioctl/kmdf/exe/testapp.c
index a6cd07c1..a645203e 100644
--- a/general/ioctl/kmdf/exe/testapp.c
+++ b/general/ioctl/kmdf/exe/testapp.c
@@ -374,9 +374,9 @@ DoIoctls(
     // Printing Input & Output buffer pointers and size
     //
 
-    printf("InputBuffer Pointer = %p, BufLength = %d\n", InputBuffer,
+    printf("InputBuffer Pointer = %p, BufLength = %Id\n", InputBuffer,
                         sizeof(InputBuffer));
-    printf("OutputBuffer Pointer = %p BufLength = %d\n", OutputBuffer,
+    printf("OutputBuffer Pointer = %p BufLength = %Id\n", OutputBuffer,
                                 sizeof(OutputBuffer));
     //
     // Performing METHOD_BUFFERED
diff --git a/general/ioctl/kmdf/ioctl.sln b/general/ioctl/kmdf/ioctl.sln
index aab61213..33b0a089 100644
--- a/general/ioctl/kmdf/ioctl.sln
+++ b/general/ioctl/kmdf/ioctl.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", "{B028EBDA-6423-4F60-AA5E-FA6D82D7724A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{95163A67-FF5E-4FE5-B291-2CB67B2FD431}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{4DA95BFC-3253-4E4A-92C3-7C8BAE993A05}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{290EBA75-A70E-4C4A-BF59-38FF2BCA1779}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nonpnpapp", "exe\nonpnpapp.vcxproj", "{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nonpnpapp", "exe\nonpnpapp.vcxproj", "{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nonpnp", "sys\nonpnp.vcxproj", "{B622D542-4942-46A1-B976-F530446DD6A5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nonpnp", "sys\nonpnp.vcxproj", "{50EE7E00-D19A-4741-9440-33BECFCF6BED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Debug|Win32.Build.0 = Debug|Win32
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Release|Win32.ActiveCfg = Release|Win32
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Release|Win32.Build.0 = Release|Win32
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Debug|x64.ActiveCfg = Debug|x64
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Debug|x64.Build.0 = Debug|x64
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Release|x64.ActiveCfg = Release|x64
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB}.Release|x64.Build.0 = Release|x64
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Debug|Win32.Build.0 = Debug|Win32
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Release|Win32.ActiveCfg = Release|Win32
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Release|Win32.Build.0 = Release|Win32
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Debug|x64.ActiveCfg = Debug|x64
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Debug|x64.Build.0 = Debug|x64
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Release|x64.ActiveCfg = Release|x64
-		{B622D542-4942-46A1-B976-F530446DD6A5}.Release|x64.Build.0 = Release|x64
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Debug|Win32.ActiveCfg = Debug|Win32
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Debug|Win32.Build.0 = Debug|Win32
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Release|Win32.ActiveCfg = Release|Win32
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Release|Win32.Build.0 = Release|Win32
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Debug|x64.ActiveCfg = Debug|x64
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Debug|x64.Build.0 = Debug|x64
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Release|x64.ActiveCfg = Release|x64
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20}.Release|x64.Build.0 = Release|x64
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Debug|Win32.ActiveCfg = Debug|Win32
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Debug|Win32.Build.0 = Debug|Win32
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Release|Win32.ActiveCfg = Release|Win32
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Release|Win32.Build.0 = Release|Win32
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Debug|x64.ActiveCfg = Debug|x64
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Debug|x64.Build.0 = Debug|x64
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Release|x64.ActiveCfg = Release|x64
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{75AE3580-0818-45CF-B6F0-FBA6FA7BE8EB} = {B028EBDA-6423-4F60-AA5E-FA6D82D7724A}
-		{B622D542-4942-46A1-B976-F530446DD6A5} = {4DA95BFC-3253-4E4A-92C3-7C8BAE993A05}
+		{18A38FF8-1227-4F3B-997B-A83A6E4CFD20} = {95163A67-FF5E-4FE5-B291-2CB67B2FD431}
+		{50EE7E00-D19A-4741-9440-33BECFCF6BED} = {290EBA75-A70E-4C4A-BF59-38FF2BCA1779}
 	EndGlobalSection
 EndGlobal
diff --git a/general/ioctl/kmdf/sys/nonpnp.vcxproj b/general/ioctl/kmdf/sys/nonpnp.vcxproj
index 615ccb8e..65332fb6 100644
--- a/general/ioctl/kmdf/sys/nonpnp.vcxproj
+++ b/general/ioctl/kmdf/sys/nonpnp.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B622D542-4942-46A1-B976-F530446DD6A5}</ProjectGuid>
+    <ProjectGuid>{50EE7E00-D19A-4741-9440-33BECFCF6BED}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{AC100EE8-8981-47E5-ABCA-B8DCCFFA5682}</SampleGuid>
+    <SampleGuid>{45D75B6C-2DA7-499F-A790-DDA070CCE572}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/ioctl/kmdf/sys/nonpnp.vcxproj.Filters b/general/ioctl/kmdf/sys/nonpnp.vcxproj.Filters
index eb46c5bb..ec1df6f7 100644
--- a/general/ioctl/kmdf/sys/nonpnp.vcxproj.Filters
+++ b/general/ioctl/kmdf/sys/nonpnp.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>{D4EF066B-A145-401A-8669-BAAC70BA8F50}</UniqueIdentifier>
+      <UniqueIdentifier>{DE155745-AD64-4A1C-A33A-3CD533BDE541}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{C68D949D-F770-4FF0-883D-729F5284E601}</UniqueIdentifier>
+      <UniqueIdentifier>{8657A752-2DEF-4ECB-A41D-A6A980248883}</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>{724D8E55-13DB-47B2-AB8D-3A86DF521511}</UniqueIdentifier>
+      <UniqueIdentifier>{00DE07D9-312A-4A66-92DE-CC38F3D84EAB}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{A4CB0903-2F69-4A15-8F3D-AF05EFE1323F}</UniqueIdentifier>
+      <UniqueIdentifier>{CCDEE8CB-FD51-470D-96D2-D68CA8D094CF}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/ioctl/wdm/exe/install.c b/general/ioctl/wdm/exe/install.c
index 4b77f0aa..c94693f5 100644
--- a/general/ioctl/wdm/exe/install.c
+++ b/general/ioctl/wdm/exe/install.c
@@ -27,7 +27,7 @@ Environment:
 #include <stdlib.h>
 #include <string.h>
 #include <strsafe.h>
-#include "sioctl.h"
+#include <sys\sioctl.h>
 
 BOOLEAN
 InstallDriver(
diff --git a/general/ioctl/wdm/exe/ioctlapp.vcxproj b/general/ioctl/wdm/exe/ioctlapp.vcxproj
index 9157b73e..aee6cda3 100644
--- a/general/ioctl/wdm/exe/ioctlapp.vcxproj
+++ b/general/ioctl/wdm/exe/ioctlapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}</ProjectGuid>
+    <ProjectGuid>{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{CD28B759-C8BC-4F51-AB5E-AFF59331509B}</SampleGuid>
+    <SampleGuid>{14E9681A-41C8-43B1-885D-6CD8CB06AAD8}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -91,13 +91,13 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <BaseAddress>0x04000000</BaseAddress>
@@ -107,13 +107,13 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <BaseAddress>0x04000000</BaseAddress>
@@ -123,13 +123,13 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <BaseAddress>0x04000000</BaseAddress>
@@ -139,13 +139,13 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\sys</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\</AdditionalIncludeDirectories>
     </Midl>
     <Link>
       <BaseAddress>0x04000000</BaseAddress>
diff --git a/general/ioctl/wdm/exe/ioctlapp.vcxproj.Filters b/general/ioctl/wdm/exe/ioctlapp.vcxproj.Filters
index 4129898e..373592eb 100644
--- a/general/ioctl/wdm/exe/ioctlapp.vcxproj.Filters
+++ b/general/ioctl/wdm/exe/ioctlapp.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>{73262017-91DD-45A8-8A68-9CCCAB2CA1C0}</UniqueIdentifier>
+      <UniqueIdentifier>{49310AE5-27D6-4E5F-8E16-7787FBBFC870}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{744376AF-8B58-45ED-828B-AA01CE10E194}</UniqueIdentifier>
+      <UniqueIdentifier>{10285CDD-3CE2-48BD-9108-C546303EC345}</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>{CB96AC92-B6DE-4B43-A7B4-EEB29C73C2BB}</UniqueIdentifier>
+      <UniqueIdentifier>{4DC87590-E3DB-45A9-8BF6-F0552982B4A7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/ioctl/wdm/exe/testapp.c b/general/ioctl/wdm/exe/testapp.c
index 5a62faa0..7a4e6abd 100644
--- a/general/ioctl/wdm/exe/testapp.c
+++ b/general/ioctl/wdm/exe/testapp.c
@@ -19,7 +19,7 @@ Environment:
 #include <stdlib.h>
 #include <string.h>
 #include <strsafe.h>
-#include "..\sys\sioctl.h"
+#include <sys\sioctl.h>
 
 
 BOOLEAN
@@ -122,9 +122,9 @@ main(
     // Printing Input & Output buffer pointers and size
     //
 
-    printf("InputBuffer Pointer = %p, BufLength = %d\n", InputBuffer,
+    printf("InputBuffer Pointer = %p, BufLength = %Iu\n", InputBuffer,
                         sizeof(InputBuffer));
-    printf("OutputBuffer Pointer = %p BufLength = %d\n", OutputBuffer,
+    printf("OutputBuffer Pointer = %p BufLength = %Iu\n", OutputBuffer,
                                 sizeof(OutputBuffer));
     //
     // Performing METHOD_BUFFERED
diff --git a/general/ioctl/wdm/ioctl.sln b/general/ioctl/wdm/ioctl.sln
index d1d7b7fe..e50c578c 100644
--- a/general/ioctl/wdm/ioctl.sln
+++ b/general/ioctl/wdm/ioctl.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", "{05ABA65F-2F21-4F5E-A1D5-DD008F644663}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{C4575BAC-8843-4B59-88F5-8D142A59F463}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{D5D0F833-0D75-4099-9A7F-B016159FC352}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{52CD4CBC-6018-4367-BE2B-EA5A2864E7BE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ioctlapp", "exe\ioctlapp.vcxproj", "{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ioctlapp", "exe\ioctlapp.vcxproj", "{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sioctl", "sys\sioctl.vcxproj", "{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sioctl", "sys\sioctl.vcxproj", "{29BD96E0-B6C5-42A0-B683-FD9740810699}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Debug|Win32.Build.0 = Debug|Win32
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Release|Win32.ActiveCfg = Release|Win32
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Release|Win32.Build.0 = Release|Win32
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Debug|x64.ActiveCfg = Debug|x64
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Debug|x64.Build.0 = Debug|x64
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Release|x64.ActiveCfg = Release|x64
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725}.Release|x64.Build.0 = Release|x64
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Debug|Win32.Build.0 = Debug|Win32
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Release|Win32.ActiveCfg = Release|Win32
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Release|Win32.Build.0 = Release|Win32
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Debug|x64.ActiveCfg = Debug|x64
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Debug|x64.Build.0 = Debug|x64
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Release|x64.ActiveCfg = Release|x64
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}.Release|x64.Build.0 = Release|x64
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Debug|Win32.Build.0 = Debug|Win32
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Release|Win32.ActiveCfg = Release|Win32
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Release|Win32.Build.0 = Release|Win32
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Debug|x64.ActiveCfg = Debug|x64
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Debug|x64.Build.0 = Debug|x64
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Release|x64.ActiveCfg = Release|x64
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9}.Release|x64.Build.0 = Release|x64
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Debug|Win32.ActiveCfg = Debug|Win32
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Debug|Win32.Build.0 = Debug|Win32
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Release|Win32.ActiveCfg = Release|Win32
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Release|Win32.Build.0 = Release|Win32
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Debug|x64.ActiveCfg = Debug|x64
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Debug|x64.Build.0 = Debug|x64
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Release|x64.ActiveCfg = Release|x64
+		{29BD96E0-B6C5-42A0-B683-FD9740810699}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{2B0BDC9E-ABF1-48DD-9814-7553B8D52725} = {05ABA65F-2F21-4F5E-A1D5-DD008F644663}
-		{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0} = {D5D0F833-0D75-4099-9A7F-B016159FC352}
+		{61899E58-10C2-4EB1-9508-58AE7DC3B3A9} = {C4575BAC-8843-4B59-88F5-8D142A59F463}
+		{29BD96E0-B6C5-42A0-B683-FD9740810699} = {52CD4CBC-6018-4367-BE2B-EA5A2864E7BE}
 	EndGlobalSection
 EndGlobal
diff --git a/general/ioctl/wdm/sys/sioctl.c b/general/ioctl/wdm/sys/sioctl.c
index 7eae2971..4f0a8539 100644
--- a/general/ioctl/wdm/sys/sioctl.c
+++ b/general/ioctl/wdm/sys/sioctl.c
@@ -473,7 +473,7 @@ Return Value:
         // system overhead for large size buffers.
         //
 
-        buffer = MmGetSystemAddressForMdlSafe(mdl, NormalPagePriority );
+        buffer = MmGetSystemAddressForMdlSafe( mdl, NormalPagePriority | MdlMappingNoExecute );
 
         if (!buffer) {
                 ntStatus = STATUS_INSUFFICIENT_RESOURCES;
@@ -527,7 +527,7 @@ Return Value:
         }
 
 
-        buffer = MmGetSystemAddressForMdlSafe(mdl, NormalPagePriority );
+        buffer = MmGetSystemAddressForMdlSafe( mdl, NormalPagePriority | MdlMappingNoExecute );
 
         if (!buffer) {
             MmUnlockPages(mdl);
@@ -588,7 +588,7 @@ Return Value:
         // from the application to the driver.
         //
 
-        buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority);
+        buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority | MdlMappingNoExecute);
 
         if (!buffer) {
             ntStatus = STATUS_INSUFFICIENT_RESOURCES;
@@ -641,7 +641,7 @@ Return Value:
         // from the driver to the application.
         //
 
-        buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority);
+        buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority | MdlMappingNoExecute);
 
         if (!buffer) {
             ntStatus = STATUS_INSUFFICIENT_RESOURCES;
diff --git a/general/ioctl/wdm/sys/sioctl.vcxproj b/general/ioctl/wdm/sys/sioctl.vcxproj
index 8b12549a..a5ac0ef3 100644
--- a/general/ioctl/wdm/sys/sioctl.vcxproj
+++ b/general/ioctl/wdm/sys/sioctl.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{8A61FFBC-9D75-43B0-9715-B75E1BD3BFC0}</ProjectGuid>
+    <ProjectGuid>{29BD96E0-B6C5-42A0-B683-FD9740810699}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{57EBFE5D-4194-4628-B3DB-243FA7D03AC9}</SampleGuid>
+    <SampleGuid>{A08AE94A-35FF-4A31-B152-5E3A43CE78A0}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/general/ioctl/wdm/sys/sioctl.vcxproj.Filters b/general/ioctl/wdm/sys/sioctl.vcxproj.Filters
index 4f493adc..2a2486b1 100644
--- a/general/ioctl/wdm/sys/sioctl.vcxproj.Filters
+++ b/general/ioctl/wdm/sys/sioctl.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>{E9EE9FFB-2EBC-4879-8005-029F0C26829C}</UniqueIdentifier>
+      <UniqueIdentifier>{70613DC7-CE18-48E4-A282-83BAD5F14DB8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{7C81EF4D-3554-45D3-A116-B443830349FD}</UniqueIdentifier>
+      <UniqueIdentifier>{61600929-B133-4CE1-A15E-E4E6B15BAFDD}</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>{4B6FECB8-7A2A-4AFD-95F2-94D7C452E97E}</UniqueIdentifier>
+      <UniqueIdentifier>{E7360814-7364-44AA-933C-DD4BFBF95E8D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{D4A26FDD-3685-4E62-BFD4-51FD89171C68}</UniqueIdentifier>
+      <UniqueIdentifier>{CF3AF6D6-43D2-4102-8996-8EF19621C095}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>