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

10 files changed, 55 insertions, 65 deletions

diff --git a/hid/hidusbfx2/Package/package.VcxProj b/hid/hidusbfx2/Package/package.VcxProj
index 779e4aad..00314af6 100644
--- a/hid/hidusbfx2/Package/package.VcxProj
+++ b/hid/hidusbfx2/Package/package.VcxProj
@@ -20,10 +20,10 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\hidkmdf\hidkmdf.vcxproj">
-      <Project>{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}</Project>
+      <Project>{EC5DCAF5-3514-4E61-8201-10F5F060E096}</Project>
     </ProjectReference>
     <ProjectReference Include="..\sys\hidusbfx2.vcxproj">
-      <Project>{0C56E492-CEB9-49C4-B127-FE437B55A879}</Project>
+      <Project>{831A5B8C-BA01-4783-8A86-A289730FF224}</Project>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="PropertySheets">
@@ -35,8 +35,8 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}</ProjectGuid>
-    <SampleGuid>{065BAC02-7D5D-4099-AB61-0A2F323D7131}</SampleGuid>
+    <ProjectGuid>{D32BA7A3-463D-472E-B414-BE9EA92A508E}</ProjectGuid>
+    <SampleGuid>{F51D99A4-2A65-4406-AA40-A045BC0CCFF4}</SampleGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/hid/hidusbfx2/Package/package.VcxProj.Filters b/hid/hidusbfx2/Package/package.VcxProj.Filters
index 5452b632..98969eae 100644
--- a/hid/hidusbfx2/Package/package.VcxProj.Filters
+++ b/hid/hidusbfx2/Package/package.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>{FB119E32-2776-4AAA-AE28-BB0915F08F14}</UniqueIdentifier>
+      <UniqueIdentifier>{521B9C68-4545-4F66-AAA1-8354E7C8FB1D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A272D3D1-380E-485F-9B54-2C4890966EF6}</UniqueIdentifier>
+      <UniqueIdentifier>{22B4244F-2E85-43D7-8554-CE175F1F92AC}</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>{37428764-C503-4DAC-A17E-ECE3A971BD91}</UniqueIdentifier>
+      <UniqueIdentifier>{2C759DCE-C6C9-48FE-B5E7-898B16C060E8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{C8FCCCAD-C2B7-4697-8144-3FB5D565425E}</UniqueIdentifier>
+      <UniqueIdentifier>{1EC783CB-1FB0-4DED-B3FD-50ECE2AA2F74}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj b/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj
index 5eb7bff2..f31a5dd9 100644
--- a/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj
+++ b/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}</ProjectGuid>
+    <ProjectGuid>{EC5DCAF5-3514-4E61-8201-10F5F060E096}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <SupportsPackaging>false</SupportsPackaging>
     <RequiresPackageProject>true</RequiresPackageProject>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{792ED1CC-8C69-41A2-87D7-773F79512AE6}</SampleGuid>
+    <SampleGuid>{111FD84E-9342-42F9-8519-169121A5AD1F}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj.Filters b/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj.Filters
index d84e2296..2fe80fe0 100644
--- a/hid/hidusbfx2/hidkmdf/hidkmdf.vcxproj.Filters
+++ b/hid/hidusbfx2/hidkmdf/hidkmdf.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>{C5F48F0A-25A4-45EA-BD85-1A3D7F5F6AFC}</UniqueIdentifier>
+      <UniqueIdentifier>{064D2C7A-9F6D-4F79-9D8F-C982F89E5272}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{2E4FEC0E-9752-44A5-A6F3-8E74C3104B63}</UniqueIdentifier>
+      <UniqueIdentifier>{E3923C42-C65E-4B20-A29D-001CFE2CF5B6}</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>{25558E5A-CA73-4F97-B8B5-E71F91EE6D42}</UniqueIdentifier>
+      <UniqueIdentifier>{D9637277-FE12-4840-8B3A-3D9FF46F7A66}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{D86AF2FC-0173-48FE-A3D9-7389EAE4EB60}</UniqueIdentifier>
+      <UniqueIdentifier>{ABF9974D-F593-4FCD-B9CA-40B78F9B4152}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/hid/hidusbfx2/hidusbfx2.sln b/hid/hidusbfx2/hidusbfx2.sln
index cd19d80f..47e5c110 100644
--- a/hid/hidusbfx2/hidusbfx2.sln
+++ b/hid/hidusbfx2/hidusbfx2.sln
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{F992E151-FEAC-4E8C-AF6A-082C91D6E54C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{A5954C4B-95E2-44F4-82C8-0AC139244744}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{6D46B6EF-E350-4AFB-8AE4-470C61F8F756}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{AC716714-8588-41DD-AF15-11F934473649}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hidkmdf", "Hidkmdf", "{9A9322D5-3F21-4358-A801-916E04F462C8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hidkmdf", "Hidkmdf", "{87FA4918-4872-4A6B-A68D-8D5324D76A9A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{D32BA7A3-463D-472E-B414-BE9EA92A508E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidusbfx2", "sys\hidusbfx2.vcxproj", "{0C56E492-CEB9-49C4-B127-FE437B55A879}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidusbfx2", "sys\hidusbfx2.vcxproj", "{831A5B8C-BA01-4783-8A86-A289730FF224}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidkmdf", "hidkmdf\hidkmdf.vcxproj", "{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidkmdf", "hidkmdf\hidkmdf.vcxproj", "{EC5DCAF5-3514-4E61-8201-10F5F060E096}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,37 +23,37 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Debug|Win32.Build.0 = Debug|Win32
-		{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Release|Win32.ActiveCfg = Release|Win32
-		{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Release|Win32.Build.0 = Release|Win32
-		{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Debug|x64.ActiveCfg = Debug|x64
-		{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Debug|x64.Build.0 = Debug|x64
-		{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Release|x64.ActiveCfg = Release|x64
-		{01899CCE-8A2B-4134-85E6-F81E7A9D30BE}.Release|x64.Build.0 = Release|x64
-		{0C56E492-CEB9-49C4-B127-FE437B55A879}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0C56E492-CEB9-49C4-B127-FE437B55A879}.Debug|Win32.Build.0 = Debug|Win32
-		{0C56E492-CEB9-49C4-B127-FE437B55A879}.Release|Win32.ActiveCfg = Release|Win32
-		{0C56E492-CEB9-49C4-B127-FE437B55A879}.Release|Win32.Build.0 = Release|Win32
-		{0C56E492-CEB9-49C4-B127-FE437B55A879}.Debug|x64.ActiveCfg = Debug|x64
-		{0C56E492-CEB9-49C4-B127-FE437B55A879}.Debug|x64.Build.0 = Debug|x64
-		{0C56E492-CEB9-49C4-B127-FE437B55A879}.Release|x64.ActiveCfg = Release|x64
-		{0C56E492-CEB9-49C4-B127-FE437B55A879}.Release|x64.Build.0 = Release|x64
-		{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Debug|Win32.Build.0 = Debug|Win32
-		{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Release|Win32.ActiveCfg = Release|Win32
-		{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Release|Win32.Build.0 = Release|Win32
-		{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Debug|x64.ActiveCfg = Debug|x64
-		{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Debug|x64.Build.0 = Debug|x64
-		{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Release|x64.ActiveCfg = Release|x64
-		{213466E9-93D3-4D42-9BEE-F6DFBDC290BD}.Release|x64.Build.0 = Release|x64
+		{D32BA7A3-463D-472E-B414-BE9EA92A508E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D32BA7A3-463D-472E-B414-BE9EA92A508E}.Debug|Win32.Build.0 = Debug|Win32
+		{D32BA7A3-463D-472E-B414-BE9EA92A508E}.Release|Win32.ActiveCfg = Release|Win32
+		{D32BA7A3-463D-472E-B414-BE9EA92A508E}.Release|Win32.Build.0 = Release|Win32
+		{D32BA7A3-463D-472E-B414-BE9EA92A508E}.Debug|x64.ActiveCfg = Debug|x64
+		{D32BA7A3-463D-472E-B414-BE9EA92A508E}.Debug|x64.Build.0 = Debug|x64
+		{D32BA7A3-463D-472E-B414-BE9EA92A508E}.Release|x64.ActiveCfg = Release|x64
+		{D32BA7A3-463D-472E-B414-BE9EA92A508E}.Release|x64.Build.0 = Release|x64
+		{831A5B8C-BA01-4783-8A86-A289730FF224}.Debug|Win32.ActiveCfg = Debug|Win32
+		{831A5B8C-BA01-4783-8A86-A289730FF224}.Debug|Win32.Build.0 = Debug|Win32
+		{831A5B8C-BA01-4783-8A86-A289730FF224}.Release|Win32.ActiveCfg = Release|Win32
+		{831A5B8C-BA01-4783-8A86-A289730FF224}.Release|Win32.Build.0 = Release|Win32
+		{831A5B8C-BA01-4783-8A86-A289730FF224}.Debug|x64.ActiveCfg = Debug|x64
+		{831A5B8C-BA01-4783-8A86-A289730FF224}.Debug|x64.Build.0 = Debug|x64
+		{831A5B8C-BA01-4783-8A86-A289730FF224}.Release|x64.ActiveCfg = Release|x64
+		{831A5B8C-BA01-4783-8A86-A289730FF224}.Release|x64.Build.0 = Release|x64
+		{EC5DCAF5-3514-4E61-8201-10F5F060E096}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC5DCAF5-3514-4E61-8201-10F5F060E096}.Debug|Win32.Build.0 = Debug|Win32
+		{EC5DCAF5-3514-4E61-8201-10F5F060E096}.Release|Win32.ActiveCfg = Release|Win32
+		{EC5DCAF5-3514-4E61-8201-10F5F060E096}.Release|Win32.Build.0 = Release|Win32
+		{EC5DCAF5-3514-4E61-8201-10F5F060E096}.Debug|x64.ActiveCfg = Debug|x64
+		{EC5DCAF5-3514-4E61-8201-10F5F060E096}.Debug|x64.Build.0 = Debug|x64
+		{EC5DCAF5-3514-4E61-8201-10F5F060E096}.Release|x64.ActiveCfg = Release|x64
+		{EC5DCAF5-3514-4E61-8201-10F5F060E096}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{01899CCE-8A2B-4134-85E6-F81E7A9D30BE} = {F992E151-FEAC-4E8C-AF6A-082C91D6E54C}
-		{0C56E492-CEB9-49C4-B127-FE437B55A879} = {6D46B6EF-E350-4AFB-8AE4-470C61F8F756}
-		{213466E9-93D3-4D42-9BEE-F6DFBDC290BD} = {9A9322D5-3F21-4358-A801-916E04F462C8}
+		{D32BA7A3-463D-472E-B414-BE9EA92A508E} = {A5954C4B-95E2-44F4-82C8-0AC139244744}
+		{831A5B8C-BA01-4783-8A86-A289730FF224} = {AC716714-8588-41DD-AF15-11F934473649}
+		{EC5DCAF5-3514-4E61-8201-10F5F060E096} = {87FA4918-4872-4A6B-A68D-8D5324D76A9A}
 	EndGlobalSection
 EndGlobal
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,