mirror of
https://github.com/pbatard/rufus.git
synced 2026-10-24 02:28:58 +03:00
[misc] update the Bitdefender VHD detection
* Looks like Bitdefender may have changed the label of their hidden VHD, so use a less subtle approach and filter any VHD under 32 MB that stars with "Bitdefender". * Closes #2953.
This commit is contained in:
@@ -473,7 +473,6 @@ BOOL GetDevices(DWORD devnum)
|
||||
};
|
||||
const char* usb_speed_name[USB_SPEED_MAX] = { "USB", "USB 1.0", "USB 1.1", "USB 2.0", "USB 3.0", "USB 3.1" };
|
||||
const char* windows_sandbox_vhd_label = "PortableBaseLayer";
|
||||
const char* bitdefender_label = "Bitdefender Partition";
|
||||
// Hash table and String Array used to match a Device ID with the parent hub's Device Interface Path
|
||||
htab_table htab_devid = HTAB_EMPTY;
|
||||
StrArray dev_if_path = { 0 };
|
||||
@@ -968,7 +967,7 @@ BOOL GetDevices(DWORD devnum)
|
||||
break;
|
||||
}
|
||||
// Bitdefender now uses a special 32 MB VHD
|
||||
if (props.is_VHD && safe_strcmp(label, bitdefender_label) == 0 && GetDriveSize(drive_index) <= 32 * MB) {
|
||||
if (props.is_VHD && safe_strnicmp(label, "Bitdefender", 11) == 0 && GetDriveSize(drive_index) <= 32 * MB) {
|
||||
uprintf("Device eliminated because it is a Bitdefender VHD");
|
||||
safe_free(devint_detail_data);
|
||||
break;
|
||||
|
||||
10
src/rufus.rc
10
src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
||||
IDD_DIALOG DIALOGEX 12, 12, 232, 326
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_ACCEPTFILES
|
||||
CAPTION "Rufus 4.14.2367"
|
||||
CAPTION "Rufus 4.14.2368"
|
||||
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
|
||||
BEGIN
|
||||
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
|
||||
@@ -409,8 +409,8 @@ END
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 4,14,2367,0
|
||||
PRODUCTVERSION 4,14,2367,0
|
||||
FILEVERSION 4,14,2368,0
|
||||
PRODUCTVERSION 4,14,2368,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -428,13 +428,13 @@ BEGIN
|
||||
VALUE "Comments", "https://rufus.ie"
|
||||
VALUE "CompanyName", "Akeo Consulting"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "4.14.2367"
|
||||
VALUE "FileVersion", "4.14.2368"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011-2026 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
|
||||
VALUE "OriginalFilename", "rufus-4.14.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "4.14.2367"
|
||||
VALUE "ProductVersion", "4.14.2368"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
Reference in New Issue
Block a user