From 0def2bacef0b4fed7c2f7810f3570d9c3f0f1fab Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 30 Mar 2014 00:55:30 +1100 Subject: [PATCH] [core] fix VHD detection for Windows 7 * Windows 8 or later uses "Microsoft Virtual Disk" whereas Windows 7 uses "Msft Virtual Disk SCSI Disk Device", so we just search for a "Virtual Disk" substring. * Closes #306 --- src/rufus.c | 4 ++-- src/rufus.h | 1 + src/rufus.rc | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/rufus.c b/src/rufus.c index a156810a..78404524 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -633,7 +633,7 @@ static BOOL GetUSBDevices(DWORD devnum) // The rest are the vendor UASP drivers I know of so far - list may be incomplete! const char* storage_name[] = { "USBSTOR", "UASPSTOR", "VUSBSTOR", "ETRONSTOR" }; const char* scsi_name = "SCSI"; - const char* vhd_name = "Microsoft Virtual Disk"; + const char* vhd_name = "Virtual Disk"; char letter_name[] = " (?:)"; BOOL found = FALSE, is_SCSI, is_UASP, is_VHD; HDEVINFO dev_info = NULL; @@ -713,7 +713,7 @@ static BOOL GetUSBDevices(DWORD devnum) uprintf("SetupDiGetDeviceRegistryProperty (Friendly Name) failed: %s\n", WindowsErrorString()); // We can afford a failure on this call - just replace the name with "USB Storage Device (Generic)" safe_strcpy(buffer, sizeof(buffer), lmprintf(MSG_045)); - } else if (safe_stricmp(buffer, vhd_name) == 0) { + } else if (safe_strstr(buffer, vhd_name) != NULL) { is_VHD = TRUE; } else { // Get the VID:PID of the device. We could avoid doing this lookup every time by keeping diff --git a/src/rufus.h b/src/rufus.h index 61d75111..dc06307c 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -82,6 +82,7 @@ #define safe_strncat(dst, dst_max, src, count) strncat(dst, src, safe_min(count, dst_max - safe_strlen(dst) - 1)) #define safe_strcat(dst, dst_max, src) safe_strncat(dst, dst_max, src, safe_strlen(src)+1) #define safe_strcmp(str1, str2) strcmp(((str1==NULL)?"":str1), ((str2==NULL)?"":str2)) +#define safe_strstr(str1, str2) strstr(((str1==NULL)?"":str1), ((str2==NULL)?"":str2)) #define safe_stricmp(str1, str2) _stricmp(((str1==NULL)?"":str1), ((str2==NULL)?"":str2)) #define safe_strncmp(str1, str2, count) strncmp(((str1==NULL)?"":str1), ((str2==NULL)?"":str2), count) #define safe_strnicmp(str1, str2, count) _strnicmp(((str1==NULL)?"":str1), ((str2==NULL)?"":str2), count) diff --git a/src/rufus.rc b/src/rufus.rc index aef702e9..236d9fa2 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.4.7.446" +CAPTION "Rufus 1.4.7.447" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 @@ -165,7 +165,7 @@ END RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.4.7.446" +CAPTION "Rufus 1.4.7.447" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 @@ -427,8 +427,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,7,446 - PRODUCTVERSION 1,4,7,446 + FILEVERSION 1,4,7,447 + PRODUCTVERSION 1,4,7,447 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -445,13 +445,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.4.7.446" + VALUE "FileVersion", "1.4.7.447" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.4.7.446" + VALUE "ProductVersion", "1.4.7.447" END END BLOCK "VarFileInfo"