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

4 files changed, 35 insertions, 35 deletions

diff --git a/spb/SkeletonI2C/SkeletonI2C.sln b/spb/SkeletonI2C/SkeletonI2C.sln
index bdd9bf87..029fb5bb 100644
--- a/spb/SkeletonI2C/SkeletonI2C.sln
+++ b/spb/SkeletonI2C/SkeletonI2C.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}") = "skeletoni2c", "skeletoni2c.vcxproj", "{82A2B7D2-6711-4545-8561-EEFBA6A4DD8A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skeletoni2c", "skeletoni2c.vcxproj", "{8C1BB5BA-283E-460F-A682-4548A1DAFA59}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{82A2B7D2-6711-4545-8561-EEFBA6A4DD8A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{82A2B7D2-6711-4545-8561-EEFBA6A4DD8A}.Debug|Win32.Build.0 = Debug|Win32
-		{82A2B7D2-6711-4545-8561-EEFBA6A4DD8A}.Release|Win32.ActiveCfg = Release|Win32
-		{82A2B7D2-6711-4545-8561-EEFBA6A4DD8A}.Release|Win32.Build.0 = Release|Win32
-		{82A2B7D2-6711-4545-8561-EEFBA6A4DD8A}.Debug|x64.ActiveCfg = Debug|x64
-		{82A2B7D2-6711-4545-8561-EEFBA6A4DD8A}.Debug|x64.Build.0 = Debug|x64
-		{82A2B7D2-6711-4545-8561-EEFBA6A4DD8A}.Release|x64.ActiveCfg = Release|x64
-		{82A2B7D2-6711-4545-8561-EEFBA6A4DD8A}.Release|x64.Build.0 = Release|x64
+		{8C1BB5BA-283E-460F-A682-4548A1DAFA59}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8C1BB5BA-283E-460F-A682-4548A1DAFA59}.Debug|Win32.Build.0 = Debug|Win32
+		{8C1BB5BA-283E-460F-A682-4548A1DAFA59}.Release|Win32.ActiveCfg = Release|Win32
+		{8C1BB5BA-283E-460F-A682-4548A1DAFA59}.Release|Win32.Build.0 = Release|Win32
+		{8C1BB5BA-283E-460F-A682-4548A1DAFA59}.Debug|x64.ActiveCfg = Debug|x64
+		{8C1BB5BA-283E-460F-A682-4548A1DAFA59}.Debug|x64.Build.0 = Debug|x64
+		{8C1BB5BA-283E-460F-A682-4548A1DAFA59}.Release|x64.ActiveCfg = Release|x64
+		{8C1BB5BA-283E-460F-A682-4548A1DAFA59}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/spb/SkeletonI2C/device.h b/spb/SkeletonI2C/device.h
index b23a4ade..06d993d2 100644
--- a/spb/SkeletonI2C/device.h
+++ b/spb/SkeletonI2C/device.h
@@ -2,13 +2,13 @@
 
 Copyright (c) Microsoft Corporation.  All rights reserved.
 
-Module Name: 
+Module Name:
 
     device.h
 
 Abstract:
 
-    This module contains the function definitions for the 
+    This module contains the function definitions for the
     WDF device.
 
 Environment:
@@ -109,7 +109,7 @@ PbcDeviceGetInterruptMask(
     _In_  PPBC_DEVICE                pDevice
     )
 /*++
- 
+
   Routine Description:
 
     This routine returns the device context's current
@@ -135,7 +135,7 @@ PbcDeviceSetInterruptMask(
     _In_  ULONG                      InterruptMask
     )
 /*++
- 
+
   Routine Description:
 
     This routine sets the device context's current
@@ -153,7 +153,7 @@ PbcDeviceSetInterruptMask(
 --*/
 {
     InterlockedExchange(
-        (PLONG)&pDevice->InterruptMask, 
+        (PLONG)&pDevice->InterruptMask,
         (LONG)InterruptMask);
 }
 
@@ -164,10 +164,10 @@ PbcDeviceAndInterruptMask(
     _In_  ULONG                      InterruptMask
     )
 /*++
- 
+
   Routine Description:
 
-    This routine performs a logical and between the device 
+    This routine performs a logical and between the device
     context's current interrupt mask and the input parameter.
 
   Arguments:
@@ -182,7 +182,7 @@ PbcDeviceAndInterruptMask(
 --*/
 {
     InterlockedAnd(
-        (PLONG)&pDevice->InterruptMask, 
+        (PLONG)&pDevice->InterruptMask,
         (LONG)InterruptMask);
 }
 
@@ -192,10 +192,10 @@ PbcRequestGetInfoRemaining(
    _In_  PPBC_REQUEST  pRequest
    )
 /*++
- 
+
   Routine Description:
 
-    This is a helper routine used to retrieve the 
+    This is a helper routine used to retrieve the
     number of bytes remaining in the current transfer.
 
   Arguments:
@@ -219,10 +219,10 @@ PbcRequestGetByte(
    _Out_ UCHAR*        pByte
    )
 /*++
- 
+
   Routine Description:
 
-    This is a helper routine used to retrieve the 
+    This is a helper routine used to retrieve the
     specified byte of the current transfer descriptor buffer.
 
   Arguments:
@@ -235,7 +235,7 @@ PbcRequestGetByte(
 
   Return Value:
 
-    STATUS_INFO_LENGTH_MISMATCH if invalid index, 
+    STATUS_INFO_LENGTH_MISMATCH if invalid index,
     otherwise STATUS_SUCCESS
 
 --*/
@@ -259,8 +259,8 @@ PbcRequestGetByte(
             if (currentOffset < mdlByteCount)
             {
                 pBuffer = (PUCHAR) MmGetSystemAddressForMdlSafe(
-                    mdl, 
-                    NormalPagePriority);
+                    mdl,
+                    NormalPagePriority | MdlMappingNoExecute);
 
                 if (pBuffer != NULL)
                 {
@@ -296,10 +296,10 @@ PbcRequestSetByte(
    _In_  UCHAR         Byte
    )
 /*++
- 
+
   Routine Description:
 
-    This is a helper routine used to set the 
+    This is a helper routine used to set the
     specified byte of the current transfer descriptor buffer.
 
   Arguments:
@@ -312,7 +312,7 @@ PbcRequestSetByte(
 
   Return Value:
 
-    STATUS_INFO_LENGTH_MISMATCH if invalid index, 
+    STATUS_INFO_LENGTH_MISMATCH if invalid index,
     otherwise STATUS_SUCCESS
 
 --*/
@@ -336,8 +336,8 @@ PbcRequestSetByte(
             if (currentOffset < mdlByteCount)
             {
                 pBuffer = (PUCHAR) MmGetSystemAddressForMdlSafe(
-                    mdl, 
-                    NormalPagePriority);
+                    mdl,
+                    NormalPagePriority | MdlMappingNoExecute);
 
                 if (pBuffer != NULL)
                 {
diff --git a/spb/SkeletonI2C/skeletoni2c.vcxproj b/spb/SkeletonI2C/skeletoni2c.vcxproj
index a92baf9b..0959033e 100644
--- a/spb/SkeletonI2C/skeletoni2c.vcxproj
+++ b/spb/SkeletonI2C/skeletoni2c.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{82A2B7D2-6711-4545-8561-EEFBA6A4DD8A}</ProjectGuid>
+    <ProjectGuid>{8C1BB5BA-283E-460F-A682-4548A1DAFA59}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{57895255-1229-4122-B78F-CF741B96891B}</SampleGuid>
+    <SampleGuid>{666F5885-C0E7-43DD-AD99-B596AC486945}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/spb/SkeletonI2C/skeletoni2c.vcxproj.Filters b/spb/SkeletonI2C/skeletoni2c.vcxproj.Filters
index 851192f0..cf122cb8 100644
--- a/spb/SkeletonI2C/skeletoni2c.vcxproj.Filters
+++ b/spb/SkeletonI2C/skeletoni2c.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>{FB780344-5D6B-417C-AF29-2AEF28ACDABE}</UniqueIdentifier>
+      <UniqueIdentifier>{1DB6B959-556C-418B-8941-89D785DB9D9D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{E951BA09-BC5C-4109-A597-C43EF84D0C73}</UniqueIdentifier>
+      <UniqueIdentifier>{AEDA4A99-AB5E-48A3-B894-E5F836E5062D}</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>{DA64D74C-5224-42DB-B9FC-91148D4DC554}</UniqueIdentifier>
+      <UniqueIdentifier>{8B843BE9-9726-433C-B120-1381C41CEE1A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{AFA014CD-3F5B-4893-BB99-29C47F1D4B66}</UniqueIdentifier>
+      <UniqueIdentifier>{7CE1D0C2-AED3-49B7-9E48-81DB84B58616}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>