From 0e59b86abc9d848abd427f4bef9248d68a308cff Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sat, 6 Jun 2015 23:12:12 +0100 Subject: [PATCH] [ui] fix dropdown being populated on ISO selection when no device is present * Also remove unneeded code in libfat.h * Also set rufus-next to 2.3 --- configure | 20 ++++++++++---------- configure.ac | 2 +- src/rufus.c | 3 +++ src/rufus.rc | 16 ++++++++-------- src/syslinux/libfat/libfat.h | 1 - 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/configure b/configure index ce20d917afd..2beff5cf8e6 100644 --- 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 2.2. +# Generated by GNU Autoconf 2.69 for rufus 2.3. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='2.2' -PACKAGE_STRING='rufus 2.2' +PACKAGE_VERSION='2.3' +PACKAGE_STRING='rufus 2.3' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='http://rufus.akeo.ie' @@ -1227,7 +1227,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 2.2 to adapt to many kinds of systems. +\`configure' configures rufus 2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1293,7 +1293,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 2.2:";; + short | recursive ) echo "Configuration of rufus 2.3:";; esac cat <<\_ACEOF @@ -1383,7 +1383,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 2.2 +rufus configure 2.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1438,7 +1438,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 2.2, which was +It was created by rufus $as_me 2.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2301,7 +2301,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='2.2' + VERSION='2.3' cat >>confdefs.h <<_ACEOF @@ -4466,7 +4466,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 2.2, which was +This file was extended by rufus $as_me 2.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4520,7 +4520,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 2.2 +rufus config.status 2.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 08fe6ddfb87..994dc4042a2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [2.2], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) +AC_INIT([rufus], [2.3], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.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/src/rufus.c b/src/rufus.c index 4a1c0b1e034..e492497c347 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -398,6 +398,9 @@ static void SetMBRForUEFI(BOOL replace) { BOOL useCSM = FALSE; + if (ComboBox_GetCurSel(hDeviceList) < 0) + return; + if (image_path != NULL) { if ( (!iso_report.has_efi) || ((iso_report.has_bootmgr) && (!allow_dual_uefi_bios) && (Button_GetCheck(GetDlgItem(hMainDialog, IDC_WINDOWS_TO_GO)) != BST_CHECKED)) ) diff --git a/src/rufus.rc b/src/rufus.rc index 7ff4679c31e..f957ad0f466 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.2.669" +CAPTION "Rufus 2.3.670" 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.2.669" +CAPTION "Rufus 2.3.670" 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.2.669" +CAPTION "Rufus 2.3.670" 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.2.669" +CAPTION "Rufus 2.3.670" 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,2,669,0 - PRODUCTVERSION 2,2,669,0 + FILEVERSION 2,3,670,0 + PRODUCTVERSION 2,3,670,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.2.669" + VALUE "FileVersion", "2.3.670" 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.2.669" + VALUE "ProductVersion", "2.3.670" END END BLOCK "VarFileInfo" diff --git a/src/syslinux/libfat/libfat.h b/src/syslinux/libfat/libfat.h index 60b3654b795..0357510a578 100644 --- a/src/syslinux/libfat/libfat.h +++ b/src/syslinux/libfat/libfat.h @@ -26,7 +26,6 @@ extern uint32_t LIBFAT_SECTOR_SHIFT; extern uint32_t LIBFAT_SECTOR_SIZE; extern uint32_t LIBFAT_SECTOR_MASK; -#define MAX_LIBFAT_SECTOR_SIZE 4096 //#define LIBFAT_SECTOR_SHIFT 9 //#define LIBFAT_SECTOR_SIZE 512 //#define LIBFAT_SECTOR_MASK 511