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

7 files changed, 14 insertions, 13 deletions

diff --git a/pofx/PEP/common/acpinotify.c b/pofx/PEP/common/acpinotify.c
index f9d524ad..ed5fd2b6 100644
--- a/pofx/PEP/common/acpinotify.c
+++ b/pofx/PEP/common/acpinotify.c
@@ -190,7 +190,7 @@ Return Value:
                  RegisterDevice->AcpiDeviceName->Length +
                  sizeof(WCHAR);
 
-    PepInternalDevice = ExAllocatePoolWithTag(NonPagedPool,
+    PepInternalDevice = ExAllocatePoolWithTag(NonPagedPoolNx,
                                               SizeNeeded,
                                               PEP_POOL_TAG);
 
@@ -714,3 +714,4 @@ Return Value:
     PepProcessCompleteWorkRequests(Data);
     return;
 }
+
diff --git a/pofx/PEP/common/driver.c b/pofx/PEP/common/driver.c
index 3a8b1239..d2768b52 100644
--- a/pofx/PEP/common/driver.c
+++ b/pofx/PEP/common/driver.c
@@ -52,8 +52,8 @@ DRIVER_INITIALIZE DriverEntry;
 
 NTSTATUS
 DriverEntry (
-    __in PDRIVER_OBJECT DriverObject,
-    __in PUNICODE_STRING RegistryPath
+    _In_ PDRIVER_OBJECT DriverObject,
+    _In_ PUNICODE_STRING RegistryPath
     )
 
 /*++
@@ -289,7 +289,7 @@ DeviceAddEnd:
 
 VOID
 PepEvtDriverUnload (
-    __in WDFDRIVER Driver
+    _In_ WDFDRIVER Driver
     )
 
 /*++
diff --git a/pofx/PEP/common/pep.c b/pofx/PEP/common/pep.c
index 4204ef16..a80d7953 100644
--- a/pofx/PEP/common/pep.c
+++ b/pofx/PEP/common/pep.c
@@ -21,8 +21,8 @@ Environment:
 //-------------------------------------------------------------------- Includes
 //
 
-#include <initguid.h>
 #include "pch.h"
+#include <initguid.h>
 
 #if defined(EVENT_TRACING)
 #include "pep.tmh"
diff --git a/pofx/PEP/common/pepcommon.vcxproj b/pofx/PEP/common/pepcommon.vcxproj
index 7593fccb..be38697a 100644
--- a/pofx/PEP/common/pepcommon.vcxproj
+++ b/pofx/PEP/common/pepcommon.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{AD3FF770-602D-4C51-B349-5A04033971EB}</ProjectGuid>
+    <ProjectGuid>{76C6ECD6-3794-441E-AFED-2997246045A1}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{D443CDF0-F81C-4D0A-A117-63ADBD6AC9C8}</SampleGuid>
+    <SampleGuid>{9510EEBB-CC1E-4339-96B5-C2632896CBBB}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/pofx/PEP/common/pepcommon.vcxproj.Filters b/pofx/PEP/common/pepcommon.vcxproj.Filters
index 2c3e5ecc..9e44ab71 100644
--- a/pofx/PEP/common/pepcommon.vcxproj.Filters
+++ b/pofx/PEP/common/pepcommon.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>{6DEB6F91-5CCF-4138-B486-6BD5D8886632}</UniqueIdentifier>
+      <UniqueIdentifier>{0AD110A0-D8E0-4993-83D0-1E6DABB6D11B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A73A5236-6C28-49F3-B08E-F25A7563B75E}</UniqueIdentifier>
+      <UniqueIdentifier>{1B12B4E9-F3AC-429C-AC10-B270A69B7E0D}</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>{7CE23150-AE2E-4E12-9575-83512D0FCC07}</UniqueIdentifier>
+      <UniqueIdentifier>{6632D093-C4E5-4D75-8CCD-E13D1D085DDF}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{CE952DA3-FA63-434D-AE32-B870D7C7F0FB}</UniqueIdentifier>
+      <UniqueIdentifier>{27874003-12E4-446F-96AF-EC9D26774021}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/pofx/PEP/common/util.c b/pofx/PEP/common/util.c
index cced8fb1..12be758d 100644
--- a/pofx/PEP/common/util.c
+++ b/pofx/PEP/common/util.c
@@ -835,7 +835,7 @@ Return Value:
                     (ULONG)RequiredSizeAugmented,
                     (ULONG)(*BiosResourcesSize));
 
-        BiosResource = ExAllocatePoolWithTag(NonPagedPool,
+        BiosResource = ExAllocatePoolWithTag(NonPagedPoolNx,
                                              RequiredSize,
                                              PEP_POOL_TAG);
 
diff --git a/pofx/PEP/common/work.c b/pofx/PEP/common/work.c
index 036efc24..0677afde 100644
--- a/pofx/PEP/common/work.c
+++ b/pofx/PEP/common/work.c
@@ -22,8 +22,8 @@ Environment:
 //-------------------------------------------------------------------- Includes
 //
 
-#include <initguid.h>
 #include "pch.h"
+#include <initguid.h>
 
 #if defined(EVENT_TRACING)
 #include "work.tmh"