diff --git a/src/rufus.c b/src/rufus.c index 692c660f..32922a2e 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -2925,9 +2925,12 @@ relaunch: } // Alt-V => Save selected device to *UNCOMPRESSED* VHD if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'V')) { + char vhd_name[128]; int DriveIndex = ComboBox_GetCurSel(hDeviceList); + if (DriveIndex >= 0) + safe_sprintf(vhd_name, sizeof(vhd_name), "%s.vhd", DriveLabel.String[DriveIndex]); if ((DriveIndex != CB_ERR) && (!format_op_in_progress) && (format_thid == NULL)) { - EXT_DECL(vhd_ext, DriveLabel.String[DriveIndex], __VA_GROUP__("*.vhd"), __VA_GROUP__("VHD File")); + EXT_DECL(vhd_ext, vhd_name, __VA_GROUP__("*.vhd"), __VA_GROUP__("VHD File")); ULARGE_INTEGER free_space; VHD_SAVE vhd_save = { (DWORD)ComboBox_GetItemData(hDeviceList, DriveIndex), FileDialog(TRUE, NULL, &vhd_ext, 0) }; if (vhd_save.path != NULL) { diff --git a/src/rufus.rc b/src/rufus.rc index 7f4f2766..6c8fc0dc 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.671" +CAPTION "Rufus 2.3.672" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -157,7 +157,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.3.671" +CAPTION "Rufus 2.3.672" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -283,7 +283,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.3.671" +CAPTION "Rufus 2.3.672" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -415,7 +415,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.3.671" +CAPTION "Rufus 2.3.672" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -671,8 +671,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,3,671,0 - PRODUCTVERSION 2,3,671,0 + FILEVERSION 2,3,672,0 + PRODUCTVERSION 2,3,672,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -689,13 +689,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.3.671" + VALUE "FileVersion", "2.3.672" 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.671" + VALUE "ProductVersion", "2.3.672" END END BLOCK "VarFileInfo" diff --git a/src/vhd.c b/src/vhd.c index 538346d4..c352b3dc 100644 --- a/src/vhd.c +++ b/src/vhd.c @@ -289,9 +289,9 @@ BOOL IsHDImage(const char* path) goto out; } - iso_report.is_bootable_img = IsCompressedBootableImage(path); + iso_report.is_bootable_img = (BOOLEAN)IsCompressedBootableImage(path); if (iso_report.compression_type == BLED_COMPRESSION_NONE) - iso_report.is_bootable_img = AnalyzeMBR(handle, "Image"); + iso_report.is_bootable_img = (BOOLEAN)AnalyzeMBR(handle, "Image"); if (!GetFileSizeEx(handle, &liImageSize)) { uprintf("Could not get image size: %s", WindowsErrorString());