mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-06-05 17:14:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[core] fix abort if we can't display the "drive in use" message

Browse source 
* Also display the current MUI on startup and set version to rufus-next
This commit is contained in:
Pete Batard 2018-12-14 18:19:33 +00:00
parent 52dd78ea34
commit f94d2f479f
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
7 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/rufus.c
View file

@ -1557,7 +1557,7 @@ static void InitDialog(HWND hDlg)
uprintf("Syslinux versions: %s%s, %s%s", embedded_sl_version_str[0], embedded_sl_version_ext[0],
embedded_sl_version_str[1], embedded_sl_version_ext[1]);
uprintf("Grub versions: %s, %s", GRUB4DOS_VERSION, GRUB2_PACKAGE_VERSION);
uprintf("System locale ID: 0x%04X", GetUserDefaultUILanguage());
uprintf("System locale ID: 0x%04X (%s)", GetUserDefaultUILanguage(), GetCurrentMUI());
ubflush();
if (selected_locale->ctrl_id & LOC_NEEDS_UPDATE) {
uprintf("NOTE: The %s translation requires an update, but the current translator hasn't submitted "
@ -1841,6 +1841,9 @@ static BOOL CheckDriveAccess(DWORD dwTimeOut)
ComboBox_GetTextU(hDeviceList, title, sizeof(title));
proceed = Notification(MSG_WARNING_QUESTION, NULL, NULL, title, message);
free(message);
} else {
proceed = Notification(MSG_WARNING_QUESTION, NULL, NULL, title,
"This drive is in use. Do you want to format it anyway?");
}
}
ret = proceed;

12
src/rufus.rc
View file

@ -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 3.4.1430"
CAPTION "Rufus 3.5.1431"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -394,8 +394,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,4,1430,0
PRODUCTVERSION 3,4,1430,0
FILEVERSION 3,5,1431,0
PRODUCTVERSION 3,5,1431,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -413,13 +413,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.4.1430"
VALUE "FileVersion", "3.5.1431"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.4.exe"
VALUE "OriginalFilename", "rufus-3.5.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.4.1430"
VALUE "ProductVersion", "3.5.1431"
END
END
BLOCK "VarFileInfo"

2
src/stdlg.c
View file

@ -1955,7 +1955,7 @@ BOOL SetFormatPromptHook(void)
if (fp_weh != NULL)
return TRUE; // No need to set again if active
// Fetch the localized strings in the relevant
// Fetch the localized strings in the relevant MUI
static_sprintf(mui_path, "%s\\%s\\shell32.dll.mui", system_dir, GetCurrentMUI());
mui_lib = LoadLibraryU(mui_path);
if (mui_lib != NULL) {