From 29588ac6844130e7bd5c616251d50a17fd234706 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Wed, 12 Aug 2015 20:03:51 +0100
Subject: [PATCH] [core] USB detection improvements

* Properly handle errors in GetUSBProperties and fix an issue
  where devices were not being listed as a result
* Add more USB debug messages
---
 src/rufus.rc | 10 +++++-----
 src/usb.c    | 28 ++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/rufus.rc b/src/rufus.rc
index c0e9396d..92a6c000 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.3.696"
+CAPTION "Rufus 2.3.697"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -298,8 +298,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,696,0
- PRODUCTVERSION 2,3,696,0
+ FILEVERSION 2,3,697,0
+ PRODUCTVERSION 2,3,697,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -316,13 +316,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.3.696"
+            VALUE "FileVersion", "2.3.697"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.3.696"
+            VALUE "ProductVersion", "2.3.697"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/usb.c b/src/usb.c
index 3bea222e..071ee00f 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -49,6 +49,7 @@ BOOL usb_debug = FALSE;
  */
 static void GetUSBProperties(char* parent_path, char* device_id, usb_device_props* props)
 {
+	CONFIGRET r;
 	HANDLE handle = INVALID_HANDLE_VALUE;
 	DWORD size;
 	DEVINST device_inst;
@@ -56,15 +57,23 @@ static void GetUSBProperties(char* parent_path, char* device_id, usb_device_prop
 	USB_NODE_CONNECTION_INFORMATION_EX_V2 conn_info_v2;
 	PF_INIT(CM_Get_DevNode_Registry_PropertyA, Cfgmgr32);
 
-	if ((parent_path == NULL) || (device_id == NULL) || (props == NULL)) {
-		return;
+	if ((parent_path == NULL) || (device_id == NULL) || (props == NULL) ||
+		(pfCM_Get_DevNode_Registry_PropertyA == NULL)) {
+		goto out;
+	}
+
+	r = CM_Locate_DevNodeA(&device_inst, device_id, 0);
+	if (r != CR_SUCCESS) {
+		uprintf("Could not get device instance handle for '%s': CR error %d", device_id, r);
+		goto out;
 	}
 
 	props->port = 0;
 	size = sizeof(props->port);
-	if ( (pfCM_Get_DevNode_Registry_PropertyA != NULL) && 
-		 (CM_Locate_DevNodeA(&device_inst, device_id, 0) == CR_SUCCESS) ) {
-		pfCM_Get_DevNode_Registry_PropertyA(device_inst, CM_DRP_ADDRESS, NULL, (PVOID)&props->port, &size, 0);
+	r = pfCM_Get_DevNode_Registry_PropertyA(device_inst, CM_DRP_ADDRESS, NULL, (PVOID)&props->port, &size, 0);
+	if (r != CR_SUCCESS) {
+		uprintf("Could not get port for '%s': CR error %d", device_id, r);
+		goto out;
 	}
 
 	handle = CreateFileA(parent_path, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
@@ -186,6 +195,8 @@ BOOL GetUSBDevices(DWORD devnum)
 						if (CM_Get_Child(&device_inst, dev_info_data.DevInst, 0) == CR_SUCCESS) {
 							device_id[0] = 0;
 							s = StrArrayAdd(&dev_if_path, devint_detail_data->DevicePath);
+							if (usb_debug)
+								uprintf("  Hub[%d] = '%s'", s, devint_detail_data->DevicePath);
 							if ((s>= 0) && (CM_Get_Device_IDA(device_inst, device_id, MAX_PATH, 0) == CR_SUCCESS)) {
 								if ((k = htab_hash(device_id, &htab_devid)) != 0) {
 									htab_devid.table[k].data = (void*)(uintptr_t)s;
@@ -315,8 +326,12 @@ BOOL GetUSBDevices(DWORD devnum)
 						if (usb_debug)
 							uprintf("  Matched with (GP) ID[%03d]: %s", j, device_id);
 					}
-					if ((uintptr_t)htab_devid.table[j].data > 0)
+					if ((uintptr_t)htab_devid.table[j].data > 0) {
+						if (usb_debug)
+							uprintf("  Matched with Hub[%d]: '%s'", (uintptr_t)htab_devid.table[j].data,
+								dev_if_path.String[(uintptr_t)htab_devid.table[j].data]);
 						GetUSBProperties(dev_if_path.String[(uintptr_t)htab_devid.table[j].data], device_id, &props);
+					}
 					if (usb_debug)
 						uprintf("  Props VID:PID = %04X:%04X", props.vid, props.pid);
 
@@ -337,6 +352,7 @@ BOOL GetUSBDevices(DWORD devnum)
 							}
 						}
 					}
+					break;
 				}
 			}
 		}