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

9 files changed, 46 insertions, 79 deletions

diff --git a/usb/kmdf_fx2/driver/Device.c b/usb/kmdf_fx2/driver/Device.c
index 87ead857..8516ef09 100644
--- a/usb/kmdf_fx2/driver/Device.c
+++ b/usb/kmdf_fx2/driver/Device.c
@@ -970,7 +970,7 @@ Return Value:
 
     status = WdfDeviceAllocAndQueryProperty(Device,
                                             DevicePropertyFriendlyName,
-                                            NonPagedPool,
+                                            NonPagedPoolNx,
                                             &objectAttributes,
                                             &deviceNameMemory);
 
@@ -978,7 +978,7 @@ Return Value:
     {
         status = WdfDeviceAllocAndQueryProperty(Device,
                                                 DevicePropertyDeviceDescription,
-                                                NonPagedPool,
+                                                NonPagedPoolNx,
                                                 &objectAttributes,
                                                 &deviceNameMemory);
     }
@@ -1000,7 +1000,7 @@ Return Value:
 
     status = WdfDeviceAllocAndQueryProperty(Device,
                                             DevicePropertyLocationInformation,
-                                            NonPagedPool,
+                                            NonPagedPoolNx,
                                             WDF_NO_OBJECT_ATTRIBUTES,
                                             &locationMemory);
 
diff --git a/usb/kmdf_fx2/driver/driver.c b/usb/kmdf_fx2/driver/driver.c
index d3b44573..44939a3b 100644
--- a/usb/kmdf_fx2/driver/driver.c
+++ b/usb/kmdf_fx2/driver/driver.c
@@ -114,9 +114,6 @@ Return Value:
     TraceEvents(TRACE_LEVEL_INFORMATION, DBG_INIT,
                        "OSRUSBFX2 Driver Sample - Driver Framework Edition.\n");
 
-    TraceEvents(TRACE_LEVEL_INFORMATION, DBG_INIT,
-                "Built %s %s\n", __DATE__, __TIME__);
-
     //
     // IRP activity ID functions are available on some versions, save them into
     // globals (or NULL if not available)
diff --git a/usb/kmdf_fx2/driver/osrusbfx2.inx b/usb/kmdf_fx2/driver/osrusbfx2.inx
index 6bb5ccc5..d515de34 100644
--- a/usb/kmdf_fx2/driver/osrusbfx2.inx
+++ b/usb/kmdf_fx2/driver/osrusbfx2.inx
diff --git a/usb/kmdf_fx2/driver/osrusbfx2.vcxproj b/usb/kmdf_fx2/driver/osrusbfx2.vcxproj
index 29fe9c3a..2db1f7c1 100644
--- a/usb/kmdf_fx2/driver/osrusbfx2.vcxproj
+++ b/usb/kmdf_fx2/driver/osrusbfx2.vcxproj
@@ -19,18 +19,20 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{E7ECAF21-2522-4E7D-8475-67C4A5E43F70}</ProjectGuid>
+    <ProjectGuid>{837F98CF-D3A4-472C-BACC-47950340E57B}</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>{95AAF552-36F7-487B-A556-B969D823DC9F}</SampleGuid>
+    <SampleGuid>{3EBA8CBF-2E65-4819-9EEA-E10825BB0705}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -38,7 +40,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -46,7 +48,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -54,7 +56,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -82,11 +84,6 @@
       <WppTraceFunction>TraceEvents(LEVEL,FLAGS,MSG,...)</WppTraceFunction>
       <WppGenerateUsingTemplateFile>{km-WdfDefault.tpl}*.tmh</WppGenerateUsingTemplateFile>
     </ClCompile>
-    <Inf Include=".\osrusbfx2.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\osrusbfx2.inf</CopyOutput>
-    </Inf>
     <MessageCompile Include="osrusbfx2.man">
       <GenerateKernelModeLoggingMacros>true</GenerateKernelModeLoggingMacros>
       <GenerateMofFile>true</GenerateMofFile>
@@ -204,10 +201,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
   </PropertyGroup>
-  <ItemGroup>
-    <FilesToPackage Include="..\deviceMetadata\B4D697F5-1C56-4807-ACCD-B28C09D37FF0.devicemetadata-ms" />
-    <None Include="..\deviceMetadata\B4D697F5-1C56-4807-ACCD-B28C09D37FF0.devicemetadata-ms" />
-  </ItemGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <ExceptionHandling>
@@ -240,27 +233,9 @@
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="*.txt" Exclude="@(None)" />
-    <None Include="*.htm" Exclude="@(None)" />
-    <None Include="*.html" Exclude="@(None)" />
-    <None Include="*.ico" Exclude="@(None)" />
-    <None Include="*.cur" Exclude="@(None)" />
-    <None Include="*.bmp" Exclude="@(None)" />
-    <None Include="*.dlg" Exclude="@(None)" />
-    <None Include="*.rct" Exclude="@(None)" />
-    <None Include="*.gif" Exclude="@(None)" />
-    <None Include="*.jpg" Exclude="@(None)" />
-    <None Include="*.jpeg" Exclude="@(None)" />
-    <None Include="*.wav" Exclude="@(None)" />
-    <None Include="*.jpe" Exclude="@(None)" />
-    <None Include="*.tiff" Exclude="@(None)" />
-    <None Include="*.tif" Exclude="@(None)" />
-    <None Include="*.png" Exclude="@(None)" />
-    <None Include="*.rc2" Exclude="@(None)" />
-    <None Include="*.def" Exclude="@(None)" />
-    <None Include="*.bat" Exclude="@(None)" />
-    <None Include="*.hpj" Exclude="@(None)" />
-    <None Include="*.asmx" Exclude="@(None)" />
+    <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
+    <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
+    <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
diff --git a/usb/kmdf_fx2/driver/osrusbfx2.vcxproj.Filters b/usb/kmdf_fx2/driver/osrusbfx2.vcxproj.Filters
index 296911ee..baf7ab2e 100644
--- a/usb/kmdf_fx2/driver/osrusbfx2.vcxproj.Filters
+++ b/usb/kmdf_fx2/driver/osrusbfx2.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>{50246F0E-8E24-4871-83C5-D835604F0997}</UniqueIdentifier>
+      <UniqueIdentifier>{F859293F-10B7-4E6D-99E2-120A09448FF9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{3A59DDAC-0E70-44F4-BDA7-AF03A36ADAD4}</UniqueIdentifier>
+      <UniqueIdentifier>{3DCE0FEA-C37D-448E-B9E4-B69865E71B5F}</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>{E82DF9C5-AE82-4CFF-A0C5-AA939075A927}</UniqueIdentifier>
+      <UniqueIdentifier>{A1BB449A-54EF-4B2B-BD68-2254963FF387}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{57D03874-86BB-4AC8-B719-A39C7A4EF75F}</UniqueIdentifier>
+      <UniqueIdentifier>{A03D3DFA-E9BD-48A3-BEDE-E8AAED283D03}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -36,11 +36,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include=".\osrusbfx2.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
-  <ItemGroup>
     <MessageCompile Include="osrusbfx2.man">
       <Filter>Resource Files</Filter>
     </MessageCompile>
diff --git a/usb/kmdf_fx2/exe/osrusbfx2.vcxproj b/usb/kmdf_fx2/exe/osrusbfx2.vcxproj
index b2388c67..9da8f04b 100644
--- a/usb/kmdf_fx2/exe/osrusbfx2.vcxproj
+++ b/usb/kmdf_fx2/exe/osrusbfx2.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{7289C9A2-233A-449D-AEEC-0D9FC929E0F0}</ProjectGuid>
+    <ProjectGuid>{6EED5CDD-5526-40DC-97F9-582857E10187}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{6BC89B61-F14B-48F5-93B6-6F897425DDDA}</SampleGuid>
+    <SampleGuid>{F19E45AF-8B05-4204-A66B-9BDBFE333233}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/usb/kmdf_fx2/exe/osrusbfx2.vcxproj.Filters b/usb/kmdf_fx2/exe/osrusbfx2.vcxproj.Filters
index 485e09f4..f9efc3e3 100644
--- a/usb/kmdf_fx2/exe/osrusbfx2.vcxproj.Filters
+++ b/usb/kmdf_fx2/exe/osrusbfx2.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>{2C8645BA-E3D5-49E8-97D5-033593663D52}</UniqueIdentifier>
+      <UniqueIdentifier>{D5BFAD22-1AD2-44F8-AC33-05C04A9C26D9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{F8EADFE4-D5EF-4492-96A2-7C5534C7FEF2}</UniqueIdentifier>
+      <UniqueIdentifier>{14E678C7-EAC3-42F6-9F4B-2CDD17427D73}</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>{61995FA8-8FC0-43EA-A5CA-17AEEA8827B6}</UniqueIdentifier>
+      <UniqueIdentifier>{CEE0A75C-90B6-472A-8FC1-9375F1EAD2C9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/kmdf_fx2/inc/public.h b/usb/kmdf_fx2/inc/public.h
index 12ddf21f..f1fc6be3 100644
--- a/usb/kmdf_fx2/inc/public.h
+++ b/usb/kmdf_fx2/inc/public.h
@@ -119,7 +119,7 @@ typedef struct _SWITCH_STATE {
 #pragma warning(pop)
 
 #define IOCTL_INDEX             0x800
-#define FILE_DEVICE_OSRUSBFX2   0x65500
+#define FILE_DEVICE_OSRUSBFX2   65500U
 
 #define IOCTL_OSRUSBFX2_GET_CONFIG_DESCRIPTOR CTL_CODE(FILE_DEVICE_OSRUSBFX2,     \
                                                      IOCTL_INDEX,     \
diff --git a/usb/kmdf_fx2/kmdf_fx2.sln b/usb/kmdf_fx2/kmdf_fx2.sln
index 59e8e548..1f176bb1 100644
--- a/usb/kmdf_fx2/kmdf_fx2.sln
+++ b/usb/kmdf_fx2/kmdf_fx2.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{219EAF9D-A9F6-4F9D-897D-91AB46B2A71B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{BCB7D745-20C8-48E1-A792-F708EF65B29F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{7E5E361E-E36E-4728-9D4C-E030A0134F40}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{4B2BB962-B51B-42F1-9EF7-06025B7A8E83}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osrusbfx2", "driver\osrusbfx2.vcxproj", "{E7ECAF21-2522-4E7D-8475-67C4A5E43F70}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osrusbfx2", "driver\osrusbfx2.vcxproj", "{CACAC18F-9566-4F5B-AB98-CB50469D850A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osrusbfx2", "exe\osrusbfx2.vcxproj", "{7289C9A2-233A-449D-AEEC-0D9FC929E0F0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osrusbfx2", "exe\osrusbfx2.vcxproj", "{1EDF6B64-0C4A-4481-AD82-D42C0EA2CF58}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,28 +19,28 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E7ECAF21-2522-4E7D-8475-67C4A5E43F70}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E7ECAF21-2522-4E7D-8475-67C4A5E43F70}.Debug|Win32.Build.0 = Debug|Win32
-		{E7ECAF21-2522-4E7D-8475-67C4A5E43F70}.Release|Win32.ActiveCfg = Release|Win32
-		{E7ECAF21-2522-4E7D-8475-67C4A5E43F70}.Release|Win32.Build.0 = Release|Win32
-		{E7ECAF21-2522-4E7D-8475-67C4A5E43F70}.Debug|x64.ActiveCfg = Debug|x64
-		{E7ECAF21-2522-4E7D-8475-67C4A5E43F70}.Debug|x64.Build.0 = Debug|x64
-		{E7ECAF21-2522-4E7D-8475-67C4A5E43F70}.Release|x64.ActiveCfg = Release|x64
-		{E7ECAF21-2522-4E7D-8475-67C4A5E43F70}.Release|x64.Build.0 = Release|x64
-		{7289C9A2-233A-449D-AEEC-0D9FC929E0F0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7289C9A2-233A-449D-AEEC-0D9FC929E0F0}.Debug|Win32.Build.0 = Debug|Win32
-		{7289C9A2-233A-449D-AEEC-0D9FC929E0F0}.Release|Win32.ActiveCfg = Release|Win32
-		{7289C9A2-233A-449D-AEEC-0D9FC929E0F0}.Release|Win32.Build.0 = Release|Win32
-		{7289C9A2-233A-449D-AEEC-0D9FC929E0F0}.Debug|x64.ActiveCfg = Debug|x64
-		{7289C9A2-233A-449D-AEEC-0D9FC929E0F0}.Debug|x64.Build.0 = Debug|x64
-		{7289C9A2-233A-449D-AEEC-0D9FC929E0F0}.Release|x64.ActiveCfg = Release|x64
-		{7289C9A2-233A-449D-AEEC-0D9FC929E0F0}.Release|x64.Build.0 = Release|x64
+		{CACAC18F-9566-4F5B-AB98-CB50469D850A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CACAC18F-9566-4F5B-AB98-CB50469D850A}.Debug|Win32.Build.0 = Debug|Win32
+		{CACAC18F-9566-4F5B-AB98-CB50469D850A}.Release|Win32.ActiveCfg = Release|Win32
+		{CACAC18F-9566-4F5B-AB98-CB50469D850A}.Release|Win32.Build.0 = Release|Win32
+		{CACAC18F-9566-4F5B-AB98-CB50469D850A}.Debug|x64.ActiveCfg = Debug|x64
+		{CACAC18F-9566-4F5B-AB98-CB50469D850A}.Debug|x64.Build.0 = Debug|x64
+		{CACAC18F-9566-4F5B-AB98-CB50469D850A}.Release|x64.ActiveCfg = Release|x64
+		{CACAC18F-9566-4F5B-AB98-CB50469D850A}.Release|x64.Build.0 = Release|x64
+		{1EDF6B64-0C4A-4481-AD82-D42C0EA2CF58}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1EDF6B64-0C4A-4481-AD82-D42C0EA2CF58}.Debug|Win32.Build.0 = Debug|Win32
+		{1EDF6B64-0C4A-4481-AD82-D42C0EA2CF58}.Release|Win32.ActiveCfg = Release|Win32
+		{1EDF6B64-0C4A-4481-AD82-D42C0EA2CF58}.Release|Win32.Build.0 = Release|Win32
+		{1EDF6B64-0C4A-4481-AD82-D42C0EA2CF58}.Debug|x64.ActiveCfg = Debug|x64
+		{1EDF6B64-0C4A-4481-AD82-D42C0EA2CF58}.Debug|x64.Build.0 = Debug|x64
+		{1EDF6B64-0C4A-4481-AD82-D42C0EA2CF58}.Release|x64.ActiveCfg = Release|x64
+		{1EDF6B64-0C4A-4481-AD82-D42C0EA2CF58}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E7ECAF21-2522-4E7D-8475-67C4A5E43F70} = {219EAF9D-A9F6-4F9D-897D-91AB46B2A71B}
-		{7289C9A2-233A-449D-AEEC-0D9FC929E0F0} = {7E5E361E-E36E-4728-9D4C-E030A0134F40}
+		{CACAC18F-9566-4F5B-AB98-CB50469D850A} = {BCB7D745-20C8-48E1-A792-F708EF65B29F}
+		{1EDF6B64-0C4A-4481-AD82-D42C0EA2CF58} = {4B2BB962-B51B-42F1-9EF7-06025B7A8E83}
 	EndGlobalSection
 EndGlobal