[misc] pocketful of enhancement and fixes - part 4

* Fix disappearance of "Start" button when selecting an ISO with
  no target (reported by Sopor)
* Add commented sample ini file
* Add AC_PROG_AR macro in configure.ac
* Update ChangeLog for BETA

ChangeLog.txt

@@ -1,3 +1,20 @@
+o Version 2.0 (2015.03.??)
+    Major UI improvements (improved font, new info field, no separate progress dialog, etc.)
+    Add support for Windows To Go (when Rufus is running on Windows 8 or later)
+    Add support for Grub4DOS and GRUB 2 based images (e.g. FreeNAS) 
+    Add portable application support, through a 'rufus.ini' file
+    Add native decompression support for DD images (.Z, .gz, .lzma, .bz2 and .xz)
+    Add seamless UEFI boot of NTFS partitions, for Windows ISOs with large files (>4GB)
+    Add support for Windows multipart install.swm
+    Add support for non Microsoft VHD drivers
+    Add Norwegian translation, courtesy of JED
+    Fix a crash on image selection when no device is present
+    Fix broken VHD support for non-English version of Windows
+    Fix write error for DD images that are not a multiple of the sector size
+    Fix broken Unicode support
+    Update Syslinux to 6.0.3
+    Other improvements and fixes
+
 o Version 1.4.12 (2014.11.09) [BUGFIX RELEASE]
     Fix support for Red Hat 7 and CentOS 7
     Fix support for Debian 7.x

Makefile.in

@@ -149,6 +149,7 @@ AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

configure

@@ -598,6 +598,7 @@ WINDRES
 RM
 SED
 RANLIB
+AR
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -3283,6 +3284,100 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+# autoconf 2.61 doesn't have AC_PROG_AR, but 2.63 has it
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2

configure.ac

@@ -6,6 +6,9 @@ AM_SILENT_RULES([yes])
 
 AC_PREREQ([2.50])
 AC_PROG_CC
+# autoconf 2.61 doesn't have AC_PROG_AR, but 2.63 has it
+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
+AC_PROG_AR
 AC_PROG_RANLIB
 AC_PROG_SED
 AC_PATH_PROG(RM, rm, rm)

res/localization/Makefile.in

@@ -113,6 +113,7 @@ AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

res/localization/rufus.loc

@@ -913,6 +913,7 @@ s IDS_ADVANCED_OPTIONS_GRP +15,0
 m IDC_NBPASSES +15,0
 m IDC_BOOTTYPE +15,0
 m IDC_SELECT_ISO +15,0
+s IDC_INFO +15,0
 s IDC_LOG +38,0
 s IDC_RUFUS_MBR +15,0
 m IDC_DISK_ID +15,0
@@ -3269,6 +3270,7 @@ t IDC_BOOT "Creëer een opstartbare disk met"
 s IDC_BOOT 19,0
 m IDC_BOOTTYPE 20,0
 m IDC_SELECT_ISO 20,0
+s IDC_INFO 20,0
 t IDC_SET_ICON "Creëer uitgebreide label en icoon bestand"
 t IDC_ABOUT "Over..."
 t IDC_LOG "Log"
@@ -4446,6 +4448,7 @@ m IDC_NBPASSES +30,0
 s IDC_BOOT +32,0
 m IDC_BOOTTYPE +30,0
 m IDC_SELECT_ISO +30,0
+s IDC_INFO +30,0
 m IDC_DISK_ID +30,0
 m IDC_LANG +28,0
 m IDC_START +28,0
@@ -4844,6 +4847,7 @@ s IDC_BOOT +148,0
 m IDC_BOOTTYPE +149,0
 s IDC_BOOTTYPE +4,0
 m IDC_SELECT_ISO +156,0
+s IDC_INFO +156,0
 t IDC_SET_ICON "Δημιουργία εκτεταμένης ετικέτας και εικονιδίων"
 t IDC_ABOUT "Σχετικά..."
 t IDC_LOG "Αρχείο καταγραφής"
@@ -5617,6 +5621,7 @@ m IDC_NBPASSES +66,0
 s IDC_NBPASSES -4,0
 m IDC_START +62,0
 m IDC_SELECT_ISO +62,0
+s IDC_INFO +62,0
 m IDCANCEL +62,0
 
 t IDS_DEVICE_TXT "Perangkat"
@@ -6404,6 +6409,7 @@ s IDC_NBPASSES +30,0
 m IDC_BOOTTYPE +30,0
 s IDC_BOOTTYPE +30,0
 m IDC_SELECT_ISO +60,0
+s IDC_INFO +60,0
 s IDC_RUFUS_MBR +30,0
 m IDC_DISK_ID +30,0
 s IDC_DISK_ID +30,0
@@ -8047,6 +8053,7 @@ t IDC_BADBLOCKS "Semak peranti untuk blok rosak"
 m IDC_NBPASSES +30,0
 t IDC_QUICKFORMAT "Format pantas"
 m IDC_SELECT_ISO +30,0
+s IDC_INFO +30,0
 m IDC_BOOTTYPE +30,0
 s IDC_BOOT +32,0
 t IDC_BOOT "Cipta disk boleh-but menggunakan"
@@ -11495,6 +11502,7 @@ s IDC_NBPASSES -25,0
 s IDC_DISK_ID -25,0
 m IDC_DISK_ID +30,0
 m IDC_SELECT_ISO +5,0
+s IDC_INFO +5,0
 m IDC_BOOTTYPE +5,0
 
 # About dialog
@@ -12758,6 +12766,7 @@ s IDC_PROGRESS +20,0
 m IDC_NBPASSES +20,0
 m IDC_BOOTTYPE +20,0
 m IDC_SELECT_ISO +20,0
+s IDC_INFO +20,0
 s IDC_BADBLOCKS +20,0
 m IDC_DISK_ID +20,0
 

res/rufus.ini

@@ -0,0 +1,17 @@
+; The following is a sample INI file, as used by Rufus
+; Whenever Rufus detects a 'rufus.ini' in the directory you launched it from
+; (even an EMPTY ONE), it starts in portable mode, and store all its settings
+; there, instead of the Registry.
+; In most cases, you should never have to modify an INI file manually. But if
+; needed, the format of the 'rufus.ini' is documented hereafter:
+
+; The translation used by the Rufus to display its UI (RFC 1766)
+Locale = en-US
+; Internal, to confirm R/W access to these settings
+CommCheck = 20089578
+; Timestamp of the last update check
+LastUpdateCheck = 13068056756
+; Amount of time before Rufus checks for another update (in seconds)
+UpdateCheckInterval = 86400
+; Use this to increases the log verbosity, for the update checks
+VerboseUpdateCheck = 0

src/Makefile.in

@@ -180,6 +180,7 @@ AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

src/bled/Makefile.in

@@ -86,7 +86,6 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -179,6 +178,7 @@ AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

src/libcdio/driver/Makefile.in

@@ -86,7 +86,6 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -162,6 +161,7 @@ AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

src/libcdio/iso9660/Makefile.in

@@ -86,7 +86,6 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -159,6 +158,7 @@ AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

src/libcdio/udf/Makefile.in

@@ -86,7 +86,6 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -159,6 +158,7 @@ AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

src/ms-sys/Makefile.in

@@ -86,7 +86,6 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -160,6 +159,7 @@ AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

src/rufus.c

@@ -1022,6 +1022,9 @@ DWORD WINAPI ISOScanThread(LPVOID param)
 	}
 	
 	// Need to invalidate as we may have changed the UI and may get artifacts if we don't
+	// Oh and we need to invoke BOTH RedrawWindow() and InvalidateRect() because UI refresh
+	// in the Microsoft worlds SUCKS!!!! (we may lose the disabled "Start" button otherwise)
+	RedrawWindow(hMainDialog, NULL, NULL, RDW_ALLCHILDREN | RDW_UPDATENOW);
 	InvalidateRect(hMainDialog, NULL, TRUE);
 
 out:
@@ -1672,7 +1675,7 @@ void InitDialog(HWND hDlg)
 	if (nWindowsVersion == WINDOWS_7) {
 		ResizeMoveCtrl(hDlg, GetDlgItem(hMainDialog, IDS_ADVANCED_OPTIONS_GRP), 0, -1, 0, 2);
 		ResizeMoveCtrl(hDlg, hProgress, 0, 1, 0, 0);
-		ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDC_ADVANCED), -2, 0, 0, 0);
+		ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDC_ADVANCED), -1, 0, 0, 0);
 	}
 
 	// Subclass the Info box so that we can align its text vertically

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.0.612"
+CAPTION "Rufus 2.0.613"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -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.0.612"
+CAPTION "Rufus 2.0.613"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -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.0.612"
+CAPTION "Rufus 2.0.613"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -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.0.612"
+CAPTION "Rufus 2.0.613"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -671,8 +671,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,612,0
+ FILEVERSION 2,0,613,0
- PRODUCTVERSION 2,0,612,0
+ PRODUCTVERSION 2,0,613,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.0.612"
+            VALUE "FileVersion", "2.0.613"
             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.0.612"
+            VALUE "ProductVersion", "2.0.613"
         END
     END
     BLOCK "VarFileInfo"

src/syslinux/libfat/Makefile.in

@@ -86,7 +86,6 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -159,6 +158,7 @@ AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

src/syslinux/libinstaller/Makefile.in

@@ -86,7 +86,6 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -160,6 +159,7 @@ AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@