nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[enum] add workaround for the lousy ASMedia USB 3.0 stack

Browse source 
* This occurs on Windows 7 with the ASMedia proprietary USB 3.0
  controller drivers.
This commit is contained in:
Pete Batard 2017-01-12 11:47:28 +00:00
parent e62ab37e38
commit fd093127d2
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/dev.c
View file

@ -92,9 +92,15 @@ static BOOL GetUSBProperties(char* parent_path, char* device_id, usb_device_prop
goto out; goto out;
} }
props->vid = conn_info.DeviceDescriptor.idVendor; // Some poorly written proprietary Windows 7 USB 3.0 controller drivers (<cough>ASMedia<cough>)
props->pid = conn_info.DeviceDescriptor.idProduct; // have a screwed up implementation of IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX that succeeds
props->speed = conn_info.Speed + 1; // but returns zeroed data => Add a workaround so that we don't lose our VID:PID...
if ((conn_info.DeviceDescriptor.idVendor != 0) || (conn_info.DeviceDescriptor.idProduct != 0)) {
props->vid = conn_info.DeviceDescriptor.idVendor;
props->pid = conn_info.DeviceDescriptor.idProduct;
props->speed = conn_info.Speed + 1;
r = TRUE;
}
// In their great wisdom, Microsoft decided to BREAK the USB speed report between Windows 7 and Windows 8 // In their great wisdom, Microsoft decided to BREAK the USB speed report between Windows 7 and Windows 8
if (nWindowsVersion >= WINDOWS_8) { if (nWindowsVersion >= WINDOWS_8) {
@ -111,7 +117,6 @@ static BOOL GetUSBProperties(char* parent_path, char* device_id, usb_device_prop
props->is_LowerSpeed = TRUE; props->is_LowerSpeed = TRUE;
} }
} }
r = TRUE;
out: out:
safe_closehandle(handle); safe_closehandle(handle);

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376 IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 2.12.1018" CAPTION "Rufus 2.12.1019"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -334,8 +334,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,12,1018,0 FILEVERSION 2,12,1019,0
PRODUCTVERSION 2,12,1018,0 PRODUCTVERSION 2,12,1019,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -352,13 +352,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.12.1018" VALUE "FileVersion", "2.12.1019"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.12.1018" VALUE "ProductVersion", "2.12.1019"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"