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

4 files changed, 18 insertions, 18 deletions

diff --git a/usb/usbview/usbview.sln b/usb/usbview/usbview.sln
index 5993209e..bc2819c4 100644
--- a/usb/usbview/usbview.sln
+++ b/usb/usbview/usbview.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}") = "usbview", "usbview.vcxproj", "{3C291787-8A37-4E8C-86D5-0B739A1CEA74}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usbview", "usbview.vcxproj", "{287B60C4-636F-4CE7-91C2-04E03A01B9C5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3C291787-8A37-4E8C-86D5-0B739A1CEA74}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3C291787-8A37-4E8C-86D5-0B739A1CEA74}.Debug|Win32.Build.0 = Debug|Win32
-		{3C291787-8A37-4E8C-86D5-0B739A1CEA74}.Release|Win32.ActiveCfg = Release|Win32
-		{3C291787-8A37-4E8C-86D5-0B739A1CEA74}.Release|Win32.Build.0 = Release|Win32
-		{3C291787-8A37-4E8C-86D5-0B739A1CEA74}.Debug|x64.ActiveCfg = Debug|x64
-		{3C291787-8A37-4E8C-86D5-0B739A1CEA74}.Debug|x64.Build.0 = Debug|x64
-		{3C291787-8A37-4E8C-86D5-0B739A1CEA74}.Release|x64.ActiveCfg = Release|x64
-		{3C291787-8A37-4E8C-86D5-0B739A1CEA74}.Release|x64.Build.0 = Release|x64
+		{287B60C4-636F-4CE7-91C2-04E03A01B9C5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{287B60C4-636F-4CE7-91C2-04E03A01B9C5}.Debug|Win32.Build.0 = Debug|Win32
+		{287B60C4-636F-4CE7-91C2-04E03A01B9C5}.Release|Win32.ActiveCfg = Release|Win32
+		{287B60C4-636F-4CE7-91C2-04E03A01B9C5}.Release|Win32.Build.0 = Release|Win32
+		{287B60C4-636F-4CE7-91C2-04E03A01B9C5}.Debug|x64.ActiveCfg = Debug|x64
+		{287B60C4-636F-4CE7-91C2-04E03A01B9C5}.Debug|x64.Build.0 = Debug|x64
+		{287B60C4-636F-4CE7-91C2-04E03A01B9C5}.Release|x64.ActiveCfg = Release|x64
+		{287B60C4-636F-4CE7-91C2-04E03A01B9C5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/usb/usbview/usbview.vcxproj b/usb/usbview/usbview.vcxproj
index bccb6d76..556eb823 100644
--- a/usb/usbview/usbview.vcxproj
+++ b/usb/usbview/usbview.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{3C291787-8A37-4E8C-86D5-0B739A1CEA74}</ProjectGuid>
+    <ProjectGuid>{287B60C4-636F-4CE7-91C2-04E03A01B9C5}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{0B5874D8-CA5A-4459-9471-A4D9CBD82977}</SampleGuid>
+    <SampleGuid>{54E86405-9C3D-4F0F-B65C-AB86DE455DD7}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/usb/usbview/usbview.vcxproj.Filters b/usb/usbview/usbview.vcxproj.Filters
index ee2d7801..41638088 100644
--- a/usb/usbview/usbview.vcxproj.Filters
+++ b/usb/usbview/usbview.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>{24B15DD5-41FB-4742-A3C7-A074316B3FFD}</UniqueIdentifier>
+      <UniqueIdentifier>{C777FB60-2F35-4F70-B010-42EB0481E0AB}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{52B35399-50CE-420D-B0C6-D6D79A82EF43}</UniqueIdentifier>
+      <UniqueIdentifier>{41539DC2-1C1B-4226-A94A-11E183276E61}</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>{5DBEED0A-531F-4DD9-8C19-89D7EF22449E}</UniqueIdentifier>
+      <UniqueIdentifier>{F94D0D21-B95F-4E74-BB7A-11C427D0D82F}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/usbview/xmlhelper.cpp b/usb/usbview/xmlhelper.cpp
index cf39a87d..fc58840e 100644
--- a/usb/usbview/xmlhelper.cpp
+++ b/usb/usbview/xmlhelper.cpp
@@ -340,11 +340,11 @@ HRESULT XmlAddHostController(PSTR hcName, PUSBHOSTCONTROLLERINFO hcInfo)
             }
             else
             {
-                USB_CONTROLLER_FLAVOR flavor = hcInfo->ControllerInfo->ControllerFlavor;
-
                 // If protocol lookup failed based on service name, try Controller flavor
                 if(NULL != hcInfo->ControllerInfo)
                 {
+                    USB_CONTROLLER_FLAVOR flavor = hcInfo->ControllerInfo->ControllerFlavor;
+
                     if(flavor == USB_HcGeneric)
                     {
                         hc->UsbProtocol = gcnew String(USB_GENERIC);
@@ -353,11 +353,11 @@ HRESULT XmlAddHostController(PSTR hcName, PUSBHOSTCONTROLLERINFO hcInfo)
                     {
                         hc->UsbProtocol = gcnew String(USB_1_1);
                     }
-                    else if(flavor >= UHCI_Generic && flavor < EHCI_Generic)
+                    else if(flavor >= UHCI_Generic && flavor <= EHCI_Generic)
                     {
                         hc->UsbProtocol = gcnew String(USB_2_0);
                     }
-                    else if(flavor >= EHCI_Generic)
+                    else if(flavor > EHCI_Generic)
                     {
                         hc->UsbProtocol = gcnew String(USB_3_0);
                     }