From 8e091fdc048e1fe2788ebf11cd9cc846df9e8fd1 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 16 Feb 2012 23:56:31 +0000 Subject: [PATCH] v1.1.1 (#139) * Also make SysLinux non-optional --- README.txt | 2 +- configure | 23 +++-------------------- configure.ac | 14 ++------------ ms-config.h | 3 --- src/rufus.c | 9 ++------- src/rufus.rc | 26 +++++++++++--------------- 6 files changed, 19 insertions(+), 58 deletions(-) diff --git a/README.txt b/README.txt index f661f7a8..65eb9059 100644 --- a/README.txt +++ b/README.txt @@ -3,7 +3,7 @@ Rufus: The Reliable USB Formatting Utility Features: - Formats USB flash drives to FAT/FAT32/NTFS/exFAT - Creates DOS bootable USB drives, with no external files required -- Creates bootable USB drives from ISOs, such as Windows or Linux installation media +- Creates bootable USB drives from bootable ISOs (Windows, Linux, etc.) - Twice as fast as Microsoft's USB/DVD tool or UNetbootin, on ISO->USB (1) - Bad blocks check - Modern UI, with UAC elevation for Windows Vista and later diff --git a/configure b/configure index a86baa63..df9cb199 100644 --- a/configure +++ b/configure @@ -652,7 +652,6 @@ ac_user_opts=' enable_option_checking enable_silent_rules with_freedos -with_syslinux enable_debug ' ac_precious_vars='build_alias @@ -1287,7 +1286,6 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-freedos embed FreeDOS support (default=yes) - --with-syslinux embed Syslinux support (default=yes) Some influential environment variables: CC C compiler command @@ -3452,6 +3450,7 @@ $as_echo "#define _GNU_SOURCE /**/" >>confdefs.h AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501" AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined" +# FreeDOS support # Check whether --with-freedos was given. if test "${with_freedos+set}" = set; then : @@ -3465,18 +3464,6 @@ if test "x$with_freedos" != "xno" ; then EXESUFFIX="f" fi - -# Check whether --with-syslinux was given. -if test "${with_syslinux+set}" = set; then : - withval=$with_syslinux; -else - with_freedos=yes -fi - -if test "x$with_syslinux" != "xno" ; then - AM_RCFLAGS="${AM_RCFLAGS} -DWITH_SYSLINUX" -fi - # Debug symbols # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then : @@ -4740,9 +4727,5 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: -FreeDOS Support : $(test \"x$with_freedos\" != \"xno\" && echo enabled || echo disabled) -Syslinux Support : $(test \"x$with_syslinux\" != \"xno\" && echo enabled || echo disabled)" >&5 -$as_echo "$as_me: -FreeDOS Support : $(test \"x$with_freedos\" != \"xno\" && echo enabled || echo disabled) -Syslinux Support : $(test \"x$with_syslinux\" != \"xno\" && echo enabled || echo disabled)" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeDOS support: $(test \"x$with_freedos\" != \"xno\" && echo enabled || echo disabled)" >&5 +$as_echo "FreeDOS support: $(test \"x$with_freedos\" != \"xno\" && echo enabled || echo disabled)" >&6; } diff --git a/configure.ac b/configure.ac index 28414a28..4cffa896 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,7 @@ AC_DEFINE([_GNU_SOURCE], [], [Use GNU extensions]) AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501" AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined" +# FreeDOS support AC_ARG_WITH([freedos], [AS_HELP_STRING([--with-freedos], [embed FreeDOS support (default=yes)])], @@ -31,15 +32,6 @@ if test "x$with_freedos" != "xno" ; then EXESUFFIX="f" fi -AC_ARG_WITH([syslinux], - [AS_HELP_STRING([--with-syslinux], - [embed Syslinux support (default=yes)])], - [], - [with_freedos=yes]) -if test "x$with_syslinux" != "xno" ; then - AM_RCFLAGS="${AM_RCFLAGS} -DWITH_SYSLINUX" -fi - # Debug symbols AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], @@ -81,6 +73,4 @@ AC_CONFIG_FILES([src/libcdio/udf/Makefile]) AC_CONFIG_FILES([src/libcdio/driver/Makefile]) AC_OUTPUT -AC_MSG_NOTICE([ -FreeDOS Support : $(test "x$with_freedos" != "xno" && echo enabled || echo disabled) -Syslinux Support : $(test "x$with_syslinux" != "xno" && echo enabled || echo disabled)]) +AC_MSG_RESULT([FreeDOS support: $(test "x$with_freedos" != "xno" && echo enabled || echo disabled)]) diff --git a/ms-config.h b/ms-config.h index 4fcb7664..e0006a10 100644 --- a/ms-config.h +++ b/ms-config.h @@ -3,6 +3,3 @@ /* Embed FreeDOS files and allow FreeDOS support */ #define WITH_FREEDOS - -/* SysLinux support, for ISO -> bootable USB */ -#define WITH_SYSLINUX diff --git a/src/rufus.c b/src/rufus.c index c429ca43..91fc451d 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -58,7 +58,7 @@ float fScale = 1.0f; int default_fs; HWND hDeviceList, hCapacity, hFileSystem, hClusterSize, hLabel, hDOSType, hNBPasses; HWND hISOProgressDlg = NULL, hISOProgressBar, hISOFileName; -BOOL bWithFreeDOS, bWithSyslinux; +BOOL bWithFreeDOS; extern char szStatusMessage[256]; static HANDLE format_thid = NULL; @@ -1277,8 +1277,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA IGNORE_RETVAL(ComboBox_SetItemData(hDOSType, ComboBox_AddStringU(hDOSType, "MS-DOS"), DT_WINME)); if (bWithFreeDOS) IGNORE_RETVAL(ComboBox_SetItemData(hDOSType, ComboBox_AddStringU(hDOSType, "FreeDOS"), DT_FREEDOS)); - if (bWithSyslinux) - IGNORE_RETVAL(ComboBox_SetItemData(hDOSType, ComboBox_AddStringU(hDOSType, "ISO Image"), DT_ISO_FAT)); + IGNORE_RETVAL(ComboBox_SetItemData(hDOSType, ComboBox_AddStringU(hDOSType, "ISO Image"), DT_ISO_FAT)); } if (fs == FS_NTFS) { IGNORE_RETVAL(ComboBox_SetItemData(hDOSType, ComboBox_AddStringU(hDOSType, "ISO Image"), DT_ISO_NTFS)); @@ -1471,10 +1470,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine bWithFreeDOS = (FindResource(hMainInstance, MAKEINTRESOURCE(IDR_FD_COMMAND_COM), RT_RCDATA) != NULL) && (FindResource(hMainInstance, MAKEINTRESOURCE(IDR_FD_KERNEL_SYS), RT_RCDATA) != NULL); uprintf("FreeDOS resources are %sembedded with this app\n", bWithFreeDOS?"":"NOT "); - // Find out if the Syslinux resources are embedded in the app - bWithSyslinux = (FindResource(hMainInstance, MAKEINTRESOURCE(IDR_SL_LDLINUX_SYS), RT_RCDATA) != NULL) && - (FindResource(hMainInstance, MAKEINTRESOURCE(IDR_SL_LDLINUX_BSS), RT_RCDATA) != NULL); - uprintf("Syslinux resources are %sembedded with this app\n", bWithSyslinux?"":"NOT "); // Create the main Window if ( (hDlg = CreateDialogA(hInstance, MAKEINTRESOURCEA(IDD_DIALOG), NULL, MainCallback)) == NULL ) { diff --git a/src/rufus.rc b/src/rufus.rc index cd85d11d..150d67b0 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 278 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.1.1.138" +CAPTION "Rufus v1.1.1.139" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 @@ -71,7 +71,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP CONTROL "http://rufus.akeo.ie",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.1.1 (Build 138)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.1.1 (Build 139)",IDC_STATIC,46,19,78,8 PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 @@ -97,7 +97,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Copying ISO files..." FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "",IDC_ISO_FILENAME,8,10,246,13,SS_PATHELLIPSIS + LTEXT "Opening ISO image - please wait...",IDC_ISO_FILENAME,8,10,246,13,SS_PATHELLIPSIS CONTROL "",IDC_ISO_PROGRESS,"msctls_progress32",WS_BORDER,7,26,247,8 PUSHBUTTON "Cancel",IDC_ISO_ABORT,111,43,50,14 END @@ -138,6 +138,8 @@ END 3 TEXTINCLUDE BEGIN "\r\n" + "IDR_SL_LDLINUX_BSS RCDATA ""../res/syslinux/ldlinux.bss""\r\n" + "IDR_SL_LDLINUX_SYS RCDATA ""../res/syslinux/ldlinux.sys""\r\n" "// Only include these in rufus_fd\r\n" "#if defined(WITH_FREEDOS)\r\n" "IDR_FD_COMMAND_COM RCDATA ""../res/freedos/COMMAND.COM""\r\n" @@ -168,10 +170,6 @@ BEGIN "IDR_FD_EGA17_CPX RCDATA ""../res/freedos/ega17.cpx""\r\n" "IDR_FD_EGA18_CPX RCDATA ""../res/freedos/ega18.cpx""\r\n" "#endif\r\n" - "#if defined(WITH_SYSLINUX)\r\n" - "IDR_SL_LDLINUX_BSS RCDATA ""../res/syslinux/ldlinux.bss""\r\n" - "IDR_SL_LDLINUX_SYS RCDATA ""../res/syslinux/ldlinux.sys""\r\n" - "#endif\r\n" "\r\n" "// Must reference a manifest for visual styles and elevation\r\n" "// Oh, and it must happen at the end, or MinGW will ignore it!\r\n" @@ -222,8 +220,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,1,138 - PRODUCTVERSION 1,1,1,138 + FILEVERSION 1,1,1,139 + PRODUCTVERSION 1,1,1,139 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -240,13 +238,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.1.1.138" + VALUE "FileVersion", "1.1.1.139" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.1.1.138" + VALUE "ProductVersion", "1.1.1.139" END END BLOCK "VarFileInfo" @@ -275,6 +273,8 @@ IDI_ICON ICON "../res/rufus.ico" // Generated from the TEXTINCLUDE 3 resource. // +IDR_SL_LDLINUX_BSS RCDATA "../res/syslinux/ldlinux.bss" +IDR_SL_LDLINUX_SYS RCDATA "../res/syslinux/ldlinux.sys" // Only include these in rufus_fd #if defined(WITH_FREEDOS) IDR_FD_COMMAND_COM RCDATA "../res/freedos/COMMAND.COM" @@ -305,10 +305,6 @@ IDR_FD_EGA16_CPX RCDATA "../res/freedos/ega16.cpx" IDR_FD_EGA17_CPX RCDATA "../res/freedos/ega17.cpx" IDR_FD_EGA18_CPX RCDATA "../res/freedos/ega18.cpx" #endif -#if defined(WITH_SYSLINUX) -IDR_SL_LDLINUX_BSS RCDATA "../res/syslinux/ldlinux.bss" -IDR_SL_LDLINUX_SYS RCDATA "../res/syslinux/ldlinux.sys" -#endif // Must reference a manifest for visual styles and elevation // Oh, and it must happen at the end, or MinGW will ignore it!