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

7 files changed, 37 insertions, 48 deletions

diff --git a/usb/usbsamp/exe/usbsamp.vcxproj b/usb/usbsamp/exe/usbsamp.vcxproj
index 5c27d51c..eea0d3e9 100644
--- a/usb/usbsamp/exe/usbsamp.vcxproj
+++ b/usb/usbsamp/exe/usbsamp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{82B15C8E-818A-41C0-AE62-1AEA7270E8B6}</ProjectGuid>
+    <ProjectGuid>{623636B5-DD4A-4473-93C4-7F548F4F661C}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{D84698F9-5D22-4B3F-ADC9-A65171DA8464}</SampleGuid>
+    <SampleGuid>{63EE6B90-F399-4C68-9C86-5A3C71ED4A9C}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/usb/usbsamp/exe/usbsamp.vcxproj.Filters b/usb/usbsamp/exe/usbsamp.vcxproj.Filters
index d838bfe3..1f025d7a 100644
--- a/usb/usbsamp/exe/usbsamp.vcxproj.Filters
+++ b/usb/usbsamp/exe/usbsamp.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{EE38233A-C328-44AC-A845-0B8F28FBE8F3}</UniqueIdentifier>
+      <UniqueIdentifier>{EDAA5E88-8B8F-4E77-A983-EF46C5B66EC6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{F6CE757F-951D-4785-A12E-D52DE74A7231}</UniqueIdentifier>
+      <UniqueIdentifier>{F27EFB8E-EA0A-4FEC-B062-39268EE9A727}</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>{9044173D-AE9F-4798-9138-C397123B741F}</UniqueIdentifier>
+      <UniqueIdentifier>{6AC21D38-62BA-4580-88B3-62FD7291113E}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/usbsamp/sys/device.c b/usb/usbsamp/sys/device.c
index a710a476..85e825e9 100644
--- a/usb/usbsamp/sys/device.c
+++ b/usb/usbsamp/sys/device.c
@@ -554,7 +554,7 @@ Return Value:
     attributes.ParentObject = pDeviceContext->WdfUsbTargetDevice;
 
     status = WdfMemoryCreate(&attributes,
-                             NonPagedPool,
+                             NonPagedPoolNx,
                              POOL_TAG,
                              size,
                              &memory,
diff --git a/usb/usbsamp/sys/driver/usbsamp.inx b/usb/usbsamp/sys/driver/usbsamp.inx
index 88db6c19..4dc3fad2 100644
--- a/usb/usbsamp/sys/driver/usbsamp.inx
+++ b/usb/usbsamp/sys/driver/usbsamp.inx
diff --git a/usb/usbsamp/sys/driver/usbsamp.vcxproj b/usb/usbsamp/sys/driver/usbsamp.vcxproj
index 0d96425a..ae4b4a66 100644
--- a/usb/usbsamp/sys/driver/usbsamp.vcxproj
+++ b/usb/usbsamp/sys/driver/usbsamp.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA}</ProjectGuid>
+    <ProjectGuid>{EA4EE96E-A970-43CE-A269-514909A10BAB}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{D2F4B3C2-A1FA-433C-A698-DEF22D5B8A75}</SampleGuid>
+    <SampleGuid>{AA7C10D7-2E56-440D-8A5B-FFFA0FF2BB6C}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -75,13 +75,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems">
-    <Inf Include=".\usbsamp.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\usbsamp.inf</CopyOutput>
-    </Inf>
-  </ItemGroup>
+  <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>usbsamp</TargetName>
   </PropertyGroup>
diff --git a/usb/usbsamp/sys/driver/usbsamp.vcxproj.Filters b/usb/usbsamp/sys/driver/usbsamp.vcxproj.Filters
index 18f603d0..c98c2f71 100644
--- a/usb/usbsamp/sys/driver/usbsamp.vcxproj.Filters
+++ b/usb/usbsamp/sys/driver/usbsamp.vcxproj.Filters
@@ -3,27 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{D6BF3D48-CBBA-42B5-B745-30ECADE8EC41}</UniqueIdentifier>
+      <UniqueIdentifier>{AD2988D8-6DA0-4869-9A1F-EFE79039AF5C}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{DB8B8A2E-77FA-4567-8AA8-B36DE48FDC76}</UniqueIdentifier>
+      <UniqueIdentifier>{ED3E81C6-62FB-41AB-951A-E31D29B1D57A}</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>{122D039B-46C3-41E1-AC33-2B0AFE33A066}</UniqueIdentifier>
+      <UniqueIdentifier>{496635AE-7630-4081-84FA-2AF8B9142237}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{EA2F6E70-5FFD-4177-A858-FCEA368FFBB1}</UniqueIdentifier>
+      <UniqueIdentifier>{7714C5D6-7632-4B05-BC97-BA989667B1BB}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\usbsamp.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="..\bulkrwr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/usb/usbsamp/usbsamp.sln b/usb/usbsamp/usbsamp.sln
index 8be6bd1a..a267027e 100644
--- a/usb/usbsamp/usbsamp.sln
+++ b/usb/usbsamp/usbsamp.sln
@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{49A076C1-4A83-4A1D-9D0B-71543A6621D0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{80AD724E-BFE1-47E0-B6FA-E932D5FCEB30}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{B3E94C51-B2D9-4787-95EF-4E9DFDEE5A6E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{DF74B27B-D7BB-46F6-823D-45F57C939E3F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{4305B583-BDD8-4C8B-BA67-EAD701F97A92}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{3049F8D5-4880-4493-A013-918EF97E262F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usbsamp", "exe\usbsamp.vcxproj", "{82B15C8E-818A-41C0-AE62-1AEA7270E8B6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usbsamp", "exe\usbsamp.vcxproj", "{623636B5-DD4A-4473-93C4-7F548F4F661C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usbsamp", "sys\driver\usbsamp.vcxproj", "{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usbsamp", "sys\driver\usbsamp.vcxproj", "{EA4EE96E-A970-43CE-A269-514909A10BAB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,29 +21,29 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{82B15C8E-818A-41C0-AE62-1AEA7270E8B6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{82B15C8E-818A-41C0-AE62-1AEA7270E8B6}.Debug|Win32.Build.0 = Debug|Win32
-		{82B15C8E-818A-41C0-AE62-1AEA7270E8B6}.Release|Win32.ActiveCfg = Release|Win32
-		{82B15C8E-818A-41C0-AE62-1AEA7270E8B6}.Release|Win32.Build.0 = Release|Win32
-		{82B15C8E-818A-41C0-AE62-1AEA7270E8B6}.Debug|x64.ActiveCfg = Debug|x64
-		{82B15C8E-818A-41C0-AE62-1AEA7270E8B6}.Debug|x64.Build.0 = Debug|x64
-		{82B15C8E-818A-41C0-AE62-1AEA7270E8B6}.Release|x64.ActiveCfg = Release|x64
-		{82B15C8E-818A-41C0-AE62-1AEA7270E8B6}.Release|x64.Build.0 = Release|x64
-		{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA}.Debug|Win32.Build.0 = Debug|Win32
-		{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA}.Release|Win32.ActiveCfg = Release|Win32
-		{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA}.Release|Win32.Build.0 = Release|Win32
-		{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA}.Debug|x64.ActiveCfg = Debug|x64
-		{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA}.Debug|x64.Build.0 = Debug|x64
-		{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA}.Release|x64.ActiveCfg = Release|x64
-		{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA}.Release|x64.Build.0 = Release|x64
+		{623636B5-DD4A-4473-93C4-7F548F4F661C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{623636B5-DD4A-4473-93C4-7F548F4F661C}.Debug|Win32.Build.0 = Debug|Win32
+		{623636B5-DD4A-4473-93C4-7F548F4F661C}.Release|Win32.ActiveCfg = Release|Win32
+		{623636B5-DD4A-4473-93C4-7F548F4F661C}.Release|Win32.Build.0 = Release|Win32
+		{623636B5-DD4A-4473-93C4-7F548F4F661C}.Debug|x64.ActiveCfg = Debug|x64
+		{623636B5-DD4A-4473-93C4-7F548F4F661C}.Debug|x64.Build.0 = Debug|x64
+		{623636B5-DD4A-4473-93C4-7F548F4F661C}.Release|x64.ActiveCfg = Release|x64
+		{623636B5-DD4A-4473-93C4-7F548F4F661C}.Release|x64.Build.0 = Release|x64
+		{EA4EE96E-A970-43CE-A269-514909A10BAB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EA4EE96E-A970-43CE-A269-514909A10BAB}.Debug|Win32.Build.0 = Debug|Win32
+		{EA4EE96E-A970-43CE-A269-514909A10BAB}.Release|Win32.ActiveCfg = Release|Win32
+		{EA4EE96E-A970-43CE-A269-514909A10BAB}.Release|Win32.Build.0 = Release|Win32
+		{EA4EE96E-A970-43CE-A269-514909A10BAB}.Debug|x64.ActiveCfg = Debug|x64
+		{EA4EE96E-A970-43CE-A269-514909A10BAB}.Debug|x64.Build.0 = Debug|x64
+		{EA4EE96E-A970-43CE-A269-514909A10BAB}.Release|x64.ActiveCfg = Release|x64
+		{EA4EE96E-A970-43CE-A269-514909A10BAB}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{82B15C8E-818A-41C0-AE62-1AEA7270E8B6} = {49A076C1-4A83-4A1D-9D0B-71543A6621D0}
-		{6395CFC7-A0E1-40D8-A744-D1DC7B6513BA} = {B3E94C51-B2D9-4787-95EF-4E9DFDEE5A6E}
-		{B3E94C51-B2D9-4787-95EF-4E9DFDEE5A6E} = {4305B583-BDD8-4C8B-BA67-EAD701F97A92}
+		{623636B5-DD4A-4473-93C4-7F548F4F661C} = {80AD724E-BFE1-47E0-B6FA-E932D5FCEB30}
+		{EA4EE96E-A970-43CE-A269-514909A10BAB} = {DF74B27B-D7BB-46F6-823D-45F57C939E3F}
+		{DF74B27B-D7BB-46F6-823D-45F57C939E3F} = {3049F8D5-4880-4493-A013-918EF97E262F}
 	EndGlobalSection
 EndGlobal