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

Merge 1c50b99bae into 5e7830e961

Browse source
This commit is contained in:
Scott 2014-03-28 12:47:01 +00:00
commit 657aafa32e
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/rufus.c
View file

@ -627,10 +627,13 @@ static BOOL GetUSBDevices(DWORD devnum)
{ {
// The first two are standard Microsoft drivers (including the Windows 8 UASP one). // The first two are standard Microsoft drivers (including the Windows 8 UASP one).
// The rest are the vendor UASP drivers I know of so far - list may be incomplete! // The rest are the vendor UASP drivers I know of so far - list may be incomplete!
const char* usbstor_name[] = { "USBSTOR", "UASPSTOR", "VUSBSTOR", "EtronSTOR" }; // The last is Microsofts VHD Mount driver to mount a VHD to a drive letter.
const char* usbstor_name[] = { "USBSTOR", "UASPSTOR", "VUSBSTOR", "EtronSTOR", "vhdmp" };
const char* scsi_name = "SCSI"; const char* scsi_name = "SCSI";
// Microsoft VHD Loopback Controller name
const char* msvhd_name = "MsVhdHba";
char letter_name[] = " (?:)"; char letter_name[] = " (?:)";
BOOL found = FALSE, is_SCSI, is_UASP; BOOL found = FALSE, is_SCSI, is_UASP, is_MSVHD;
HDEVINFO dev_info = NULL; HDEVINFO dev_info = NULL;
SP_DEVINFO_DATA dev_info_data; SP_DEVINFO_DATA dev_info_data;
SP_DEVICE_INTERFACE_DATA devint_data; SP_DEVICE_INTERFACE_DATA devint_data;
@ -680,7 +683,11 @@ static BOOL GetUSBDevices(DWORD devnum)
for (s=0, i=0; s<ARRAYSIZE(usbstor_name); s++) { for (s=0, i=0; s<ARRAYSIZE(usbstor_name); s++) {
if (list_size[s] > 1) { if (list_size[s] > 1) {
CM_Get_Device_ID_ListA(usbstor_name[s], &devid_list[i], list_size[s], CM_GETIDLIST_FILTER_SERVICE); CM_Get_Device_ID_ListA(usbstor_name[s], &devid_list[i], list_size[s], CM_GETIDLIST_FILTER_SERVICE);
i += list_size[s]-1; // list_size is sometimes larger than required thus we need to find the real end
for (i += list_size[s]; i > 2; i--) {
if ((devid_list[i-2] != '\0') && (devid_list[i-1] == '\0') && (devid_list[i] == '\0'))
break;
}
} }
} }
@ -699,6 +706,7 @@ static BOOL GetUSBDevices(DWORD devnum)
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
vid = 0; pid = 0; vid = 0; pid = 0;
is_UASP = FALSE; is_UASP = FALSE;
is_MSVHD = FALSE;
if (!SetupDiGetDeviceRegistryPropertyA(dev_info, &dev_info_data, SPDRP_FRIENDLYNAME, if (!SetupDiGetDeviceRegistryPropertyA(dev_info, &dev_info_data, SPDRP_FRIENDLYNAME,
&datatype, (LPBYTE)buffer, sizeof(buffer), &size)) { &datatype, (LPBYTE)buffer, sizeof(buffer), &size)) {
uprintf("SetupDiGetDeviceRegistryProperty (Friendly Name) failed: %s\n", WindowsErrorString()); uprintf("SetupDiGetDeviceRegistryProperty (Friendly Name) failed: %s\n", WindowsErrorString());
@ -718,6 +726,10 @@ static BOOL GetUSBDevices(DWORD devnum)
// The ID is in the form USB_VENDOR_BUSID\VID_xxxx&PID_xxxx\... // The ID is in the form USB_VENDOR_BUSID\VID_xxxx&PID_xxxx\...
if (devid[j] == '\\') if (devid[j] == '\\')
post_backslash = TRUE; post_backslash = TRUE;
// Check if this is a VHD
is_MSVHD = (safe_strstr(devid, msvhd_name) != NULL);
if (is_MSVHD)
break;
if (!post_backslash) if (!post_backslash)
continue; continue;
if (devid[j] == '_') { if (devid[j] == '_') {
@ -729,7 +741,7 @@ static BOOL GetUSBDevices(DWORD devnum)
} }
} }
} }
if ((vid == 0) && (pid == 0)) { if ((vid == 0) && (pid == 0) && !is_MSVHD) {
if (is_SCSI) { if (is_SCSI) {
// If we have an SCSI drive and couldn't get a VID:PID, we are most likely // If we have an SCSI drive and couldn't get a VID:PID, we are most likely
// dealing with a system drive => eliminate it! // dealing with a system drive => eliminate it!

1
src/rufus.h
View file

@ -85,6 +85,7 @@
#define safe_stricmp(str1, str2) _stricmp(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2)) #define safe_stricmp(str1, str2) _stricmp(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2))
#define safe_strncmp(str1, str2, count) strncmp(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2), count) #define safe_strncmp(str1, str2, count) strncmp(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2), count)
#define safe_strnicmp(str1, str2, count) _strnicmp(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2), count) #define safe_strnicmp(str1, str2, count) _strnicmp(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2), count)
#define safe_strstr(str1, str2) strstr(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2))
#define safe_closehandle(h) do {if ((h != INVALID_HANDLE_VALUE) && (h != NULL)) {CloseHandle(h); h = INVALID_HANDLE_VALUE;}} while(0) #define safe_closehandle(h) do {if ((h != INVALID_HANDLE_VALUE) && (h != NULL)) {CloseHandle(h); h = INVALID_HANDLE_VALUE;}} while(0)
#define safe_unlockclose(h) do {if ((h != INVALID_HANDLE_VALUE) && (h != NULL)) {UnlockDrive(h); CloseHandle(h); h = INVALID_HANDLE_VALUE;}} while(0) #define safe_unlockclose(h) do {if ((h != INVALID_HANDLE_VALUE) && (h != NULL)) {UnlockDrive(h); CloseHandle(h); h = INVALID_HANDLE_VALUE;}} while(0)
#define safe_sprintf(dst, count, ...) do {_snprintf(dst, count, __VA_ARGS__); (dst)[(count)-1] = 0; } while(0) #define safe_sprintf(dst, count, ...) do {_snprintf(dst, count, __VA_ARGS__); (dst)[(count)-1] = 0; } while(0)