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

6 files changed, 16 insertions, 29 deletions

diff --git a/usb/kmdf_enumswitches/inc/public.h b/usb/kmdf_enumswitches/inc/public.h
index 12ddf21f..f1fc6be3 100644
--- a/usb/kmdf_enumswitches/inc/public.h
+++ b/usb/kmdf_enumswitches/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_enumswitches/kmdf_enumswitches.sln b/usb/kmdf_enumswitches/kmdf_enumswitches.sln
index 32b903cb..c1e962bf 100644
--- a/usb/kmdf_enumswitches/kmdf_enumswitches.sln
+++ b/usb/kmdf_enumswitches/kmdf_enumswitches.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kmdf_enumswitches", "sys\kmdf_enumswitches.vcxproj", "{CE94DCE1-20AE-4D06-BFA9-13E9D92D339A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kmdf_enumswitches", "sys\kmdf_enumswitches.vcxproj", "{4F9EF7B8-4C30-4654-B431-B6D64C3A2C56}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CE94DCE1-20AE-4D06-BFA9-13E9D92D339A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CE94DCE1-20AE-4D06-BFA9-13E9D92D339A}.Debug|Win32.Build.0 = Debug|Win32
-		{CE94DCE1-20AE-4D06-BFA9-13E9D92D339A}.Release|Win32.ActiveCfg = Release|Win32
-		{CE94DCE1-20AE-4D06-BFA9-13E9D92D339A}.Release|Win32.Build.0 = Release|Win32
-		{CE94DCE1-20AE-4D06-BFA9-13E9D92D339A}.Debug|x64.ActiveCfg = Debug|x64
-		{CE94DCE1-20AE-4D06-BFA9-13E9D92D339A}.Debug|x64.Build.0 = Debug|x64
-		{CE94DCE1-20AE-4D06-BFA9-13E9D92D339A}.Release|x64.ActiveCfg = Release|x64
-		{CE94DCE1-20AE-4D06-BFA9-13E9D92D339A}.Release|x64.Build.0 = Release|x64
+		{4F9EF7B8-4C30-4654-B431-B6D64C3A2C56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4F9EF7B8-4C30-4654-B431-B6D64C3A2C56}.Debug|Win32.Build.0 = Debug|Win32
+		{4F9EF7B8-4C30-4654-B431-B6D64C3A2C56}.Release|Win32.ActiveCfg = Release|Win32
+		{4F9EF7B8-4C30-4654-B431-B6D64C3A2C56}.Release|Win32.Build.0 = Release|Win32
+		{4F9EF7B8-4C30-4654-B431-B6D64C3A2C56}.Debug|x64.ActiveCfg = Debug|x64
+		{4F9EF7B8-4C30-4654-B431-B6D64C3A2C56}.Debug|x64.Build.0 = Debug|x64
+		{4F9EF7B8-4C30-4654-B431-B6D64C3A2C56}.Release|x64.ActiveCfg = Release|x64
+		{4F9EF7B8-4C30-4654-B431-B6D64C3A2C56}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/usb/kmdf_enumswitches/sys/driver.c b/usb/kmdf_enumswitches/sys/driver.c
index 10586be3..aefc6c2b 100644
--- a/usb/kmdf_enumswitches/sys/driver.c
+++ b/usb/kmdf_enumswitches/sys/driver.c
@@ -106,9 +106,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__);
-
     //
     // Initiialize driver config to control the attributes that
     // are global to the driver. Note that framework by default
diff --git a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx
index 6ecf53ba..52017d13 100644
--- a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx
+++ b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx
diff --git a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj
index 46f1b42e..3230fc6e 100644
--- a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj
+++ b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{96607BB4-3861-408E-B117-CAA8D0B6D372}</ProjectGuid>
+    <ProjectGuid>{4F9EF7B8-4C30-4654-B431-B6D64C3A2C56}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{3017F5B6-A432-4BC6-982C-92EDBF88C56D}</SampleGuid>
+    <SampleGuid>{B11DDDBD-A80C-4105-B342-96834A1D1DA6}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -82,11 +82,6 @@
       <WppTraceFunction>TraceEvents(LEVEL,FLAGS,MSG,...)</WppTraceFunction>
       <WppGenerateUsingTemplateFile>{km-WdfDefault.tpl}*.tmh</WppGenerateUsingTemplateFile>
     </ClCompile>
-    <Inf Include="kmdf_enumswitches.inx">
-      <Architecture>$(InfArch)</Architecture>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <CopyOutput>.\$(IntDir)\kmdf_enumswitches.inf</CopyOutput>
-    </Inf>
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>kmdf_enumswitches</TargetName>
diff --git a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj.Filters b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj.Filters
index 6d286cd3..e772a84c 100644
--- a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj.Filters
+++ b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.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>{51861499-AB32-435D-A5D8-467D00D1A71D}</UniqueIdentifier>
+      <UniqueIdentifier>{DD6C0A8F-CD5A-4780-8FF9-CBB81D0D855E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{407A2F5C-65A7-44BA-AF3B-6543832CDE3F}</UniqueIdentifier>
+      <UniqueIdentifier>{A1497843-5B68-4D99-AAE0-E16180026D77}</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>{CDF3E397-8551-4B6E-BD1F-6E63053324D5}</UniqueIdentifier>
+      <UniqueIdentifier>{3497842A-32EA-48D3-97E5-2EEE032D4AA3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{59DF9552-63A9-4ABC-8DAF-9E8811DE79AE}</UniqueIdentifier>
+      <UniqueIdentifier>{C1A4FA85-8FA5-465E-B288-325A1296C6E9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -32,9 +32,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Inf Include="kmdf_enumswitches.inx">
-      <Filter>Driver Files</Filter>
-    </Inf>
-  </ItemGroup>
 </Project>
\ No newline at end of file