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

5 files changed, 9 insertions, 17 deletions

diff --git a/hid/firefly/driver/device.c b/hid/firefly/driver/device.c
index c6bae721..6ffb648f 100644
--- a/hid/firefly/driver/device.c
+++ b/hid/firefly/driver/device.c
@@ -106,7 +106,7 @@ Return Value:
 
     status = WdfDeviceAllocAndQueryProperty(device,
                                     DevicePropertyPhysicalDeviceObjectName,
-                                    NonPagedPool,
+                                    NonPagedPoolNx,
                                     &attributes,
                                     &memory);
 
diff --git a/hid/firefly/driver/firefly.inx b/hid/firefly/driver/firefly.inx
index ad800da9..fb03d695 100644
--- a/hid/firefly/driver/firefly.inx
+++ b/hid/firefly/driver/firefly.inx
diff --git a/hid/firefly/driver/firefly.vcxproj b/hid/firefly/driver/firefly.vcxproj
index 1f23a2da..05c03248 100644
--- a/hid/firefly/driver/firefly.vcxproj
+++ b/hid/firefly/driver/firefly.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{72EF0AC2-AF89-4FAF-B50B-CFD1CBCFC1FA}</ProjectGuid>
+    <ProjectGuid>{FF968AD9-B8FF-450D-93A0-4CC5AC2B49B5}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{3BBB9A3C-6D04-44EA-94CD-1BCBB6785ABE}</SampleGuid>
+    <SampleGuid>{2DD1A137-CFE3-476C-B434-CE31733A7325}</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=".\firefly.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\firefly.inf</CopyOutput>
-    </Inf>
     <MofComp Include="firefly.mof">
       <CreateBinaryMofFile>".\$(IntDir)\firefly.bmf"</CreateBinaryMofFile>
     </MofComp>
diff --git a/hid/firefly/driver/firefly.vcxproj.Filters b/hid/firefly/driver/firefly.vcxproj.Filters
index 0ebb7840..8f75e32f 100644
--- a/hid/firefly/driver/firefly.vcxproj.Filters
+++ b/hid/firefly/driver/firefly.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>{E4869018-74E3-4289-AD22-20F70C981AE2}</UniqueIdentifier>
+      <UniqueIdentifier>{849BE81A-B9DC-4096-AC00-2D7D742FB0E8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{1F21272C-56E1-4F3E-9CCC-6B4A3A4C789B}</UniqueIdentifier>
+      <UniqueIdentifier>{29531875-8C9E-4110-BBE3-1CFC9D282A6B}</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>{22D17D30-9550-4068-801A-6533F5191361}</UniqueIdentifier>
+      <UniqueIdentifier>{AE3E2BD7-4200-448A-8100-6C69BE4720FE}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{3970B561-8552-40C0-89DC-8AE1A82F3034}</UniqueIdentifier>
+      <UniqueIdentifier>{617E5D49-6208-482D-BEA6-DCF17EDD8033}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\firefly.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
     <MofComp Include="firefly.mof">
       <Filter>Driver Files</Filter>
     </MofComp>
diff --git a/hid/firefly/driver/vfeature.c b/hid/firefly/driver/vfeature.c
index 8b76db1f..5919a5e9 100644
--- a/hid/firefly/driver/vfeature.c
+++ b/hid/firefly/driver/vfeature.c
@@ -138,7 +138,7 @@ Return Value:
     }
 
     preparsedData = (PHIDP_PREPARSED_DATA) ExAllocatePoolWithTag(
-        NonPagedPool, collectionInformation.DescriptorSize, 'ffly');
+        NonPagedPoolNx, collectionInformation.DescriptorSize, 'ffly');
 
     if (preparsedData == NULL) {
         status = STATUS_INSUFFICIENT_RESOURCES;
@@ -178,7 +178,7 @@ Return Value:
     // Create a report to send to the device.
     //
     report = (PCHAR) ExAllocatePoolWithTag(
-        NonPagedPool, caps.FeatureReportByteLength, 'ffly');
+        NonPagedPoolNx, caps.FeatureReportByteLength, 'ffly');
 
     if (report == NULL) {
         goto ExitAndFree;