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

5 files changed, 8 insertions, 18 deletions

diff --git a/hid/hidusbfx2/sys/driver.c b/hid/hidusbfx2/sys/driver.c
index 8aaaf294..825c803f 100644
--- a/hid/hidusbfx2/sys/driver.c
+++ b/hid/hidusbfx2/sys/driver.c
@@ -86,7 +86,7 @@ Return Value:
     WPP_INIT_TRACING( DriverObject, RegistryPath );
 
     TraceEvents(TRACE_LEVEL_INFORMATION, DBG_INIT,
-        "HIDUSBFX2 Driver Sample Built %s %s\n", __DATE__, __TIME__);
+        "HIDUSBFX2 Driver Sample\n");
 
     WDF_DRIVER_CONFIG_INIT(&config, HidFx2EvtDeviceAdd);
 
diff --git a/hid/hidusbfx2/sys/hidusbfx2.inx b/hid/hidusbfx2/sys/hidusbfx2.inx
index da8e8831..e8c28f32 100644
--- a/hid/hidusbfx2/sys/hidusbfx2.inx
+++ b/hid/hidusbfx2/sys/hidusbfx2.inx
diff --git a/hid/hidusbfx2/sys/hidusbfx2.vcxproj b/hid/hidusbfx2/sys/hidusbfx2.vcxproj
index 41260039..65cb0d6e 100644
--- a/hid/hidusbfx2/sys/hidusbfx2.vcxproj
+++ b/hid/hidusbfx2/sys/hidusbfx2.vcxproj
@@ -19,14 +19,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{0C56E492-CEB9-49C4-B127-FE437B55A879}</ProjectGuid>
+    <ProjectGuid>{831A5B8C-BA01-4783-8A86-A289730FF224}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{FFEC78A4-6826-4649-94F7-7886ABCAA11A}</SampleGuid>
+    <SampleGuid>{E8A0DAC7-C9B1-4606-A518-046158990EE3}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -84,11 +84,6 @@
       <WppTraceFunction>TraceEvents(LEVEL,FLAGS,MSG,...)</WppTraceFunction>
       <WppGenerateUsingTemplateFile>{km-WdfDefault.tpl}*.tmh</WppGenerateUsingTemplateFile>
     </ClCompile>
-    <Inf Include=".\hidusbfx2.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\hidusbfx2.inf</CopyOutput>
-    </Inf>
     <OtherWpp Include="hidusbfx2.rc">
       <WppEnabled>true</WppEnabled>
       <WppKernelMode>true</WppKernelMode>
diff --git a/hid/hidusbfx2/sys/hidusbfx2.vcxproj.Filters b/hid/hidusbfx2/sys/hidusbfx2.vcxproj.Filters
index 82e40241..f15cb23e 100644
--- a/hid/hidusbfx2/sys/hidusbfx2.vcxproj.Filters
+++ b/hid/hidusbfx2/sys/hidusbfx2.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>{962D8603-CE23-4D62-A83B-90CEFA6AC176}</UniqueIdentifier>
+      <UniqueIdentifier>{DB53288F-E176-4DC0-8F73-39456F6F740A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{538F2C38-4B67-4B18-BBC4-35B05919B868}</UniqueIdentifier>
+      <UniqueIdentifier>{C730C6E8-C5FF-4224-AE1D-ADD4FE7D0712}</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>{53D44B18-A36F-437E-8732-300635680D6F}</UniqueIdentifier>
+      <UniqueIdentifier>{AF7A8D98-A63D-4901-8362-F4921505042E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{942D8837-E92B-4E87-8730-98BC45059E2D}</UniqueIdentifier>
+      <UniqueIdentifier>{A71AE4B4-6581-48A8-9734-E02C32F71580}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -30,11 +30,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\hidusbfx2.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="hidusbfx2.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/hid/hidusbfx2/sys/usb.c b/hid/hidusbfx2/sys/usb.c
index ca5feff0..50f1a03b 100644
--- a/hid/hidusbfx2/sys/usb.c
+++ b/hid/hidusbfx2/sys/usb.c
@@ -147,7 +147,7 @@ Return Value:
     attributes.ParentObject = Device;
     status = WdfMemoryCreate(
                              &attributes,
-                             NonPagedPool,
+                             NonPagedPoolNx,
                              0,
                              sizeof(USB_DEVICE_DESCRIPTOR),
                              &devContext->DeviceDescriptor,