From f94d2f479ffd40046fc279a0a3be108f19d4b8ad Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Fri, 14 Dec 2018 18:19:33 +0000 Subject: [PATCH] [core] fix abort if we can't display the "drive in use" message * Also display the current MUI on startup and set version to rufus-next --- configure | 20 ++++++++++---------- configure.ac | 2 +- res/appstore/AppxManifest.xml | 2 +- res/appstore/packme.cmd | 2 +- src/rufus.c | 5 ++++- src/rufus.rc | 12 ++++++------ src/stdlg.c | 2 +- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 3d9980a0..dc4dad1e 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for rufus 3.4. +# Generated by GNU Autoconf 2.69 for rufus 3.5. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='3.4' -PACKAGE_STRING='rufus 3.4' +PACKAGE_VERSION='3.5' +PACKAGE_STRING='rufus 3.5' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='https://rufus.ie' @@ -1228,7 +1228,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rufus 3.4 to adapt to many kinds of systems. +\`configure' configures rufus 3.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1294,7 +1294,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 3.4:";; + short | recursive ) echo "Configuration of rufus 3.5:";; esac cat <<\_ACEOF @@ -1385,7 +1385,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 3.4 +rufus configure 3.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1440,7 +1440,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rufus $as_me 3.4, which was +It was created by rufus $as_me 3.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2303,7 +2303,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='3.4' + VERSION='3.5' cat >>confdefs.h <<_ACEOF @@ -4481,7 +4481,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rufus $as_me 3.4, which was +This file was extended by rufus $as_me 3.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4535,7 +4535,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rufus config.status 3.4 +rufus config.status 3.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 2ffca801..05a64ebb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [3.4], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie]) +AC_INIT([rufus], [3.5], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/res/appstore/AppxManifest.xml b/res/appstore/AppxManifest.xml index 3eedf3f9..44d1ca67 100644 --- a/res/appstore/AppxManifest.xml +++ b/res/appstore/AppxManifest.xml @@ -8,7 +8,7 @@ for an interesting struggle, when you also happen to have a comma in one of the fields... --> diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd index ff13afc4..3072aeb7 100644 --- a/res/appstore/packme.cmd +++ b/res/appstore/packme.cmd @@ -1,6 +1,6 @@ @echo off setlocal EnableExtensions DisableDelayedExpansion -set VERSION=3.4 +set VERSION=3.5 del /q *.appx >NUL 2>&1 del /q *.appxbundle >NUL 2>&1 diff --git a/src/rufus.c b/src/rufus.c index 56fa2bde..0d9f78b8 100755 --- a/src/rufus.c +++ b/src/rufus.c @@ -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; diff --git a/src/rufus.rc b/src/rufus.rc index 679db4bf..94fa206b 100644 --- a/src/rufus.rc +++ b/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 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" diff --git a/src/stdlg.c b/src/stdlg.c index 8f4ed7d2..4cf29f21 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -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) {