diff --git a/README.txt b/README.txt index 65eb9059..d45e1b68 100644 --- a/README.txt +++ b/README.txt @@ -17,7 +17,7 @@ Compilation: ms-config.h (Visual Studio, WDK) or running "./configure --help" (MinGW). Additional information: - Rufus provides extensive information abour what it is doing through the Windows + Rufus provides extensive information about what it is doing through the Windows debug facility. This info can be accessed with an application such as DebugView. More info: diff --git a/res/syslinux/ldlinux.bss b/res/syslinux/ldlinux.bss index 5eb02306..884c5a8e 100644 Binary files a/res/syslinux/ldlinux.bss and b/res/syslinux/ldlinux.bss differ diff --git a/res/syslinux/ldlinux.sys b/res/syslinux/ldlinux.sys index cabcd6c4..cee0f82f 100644 Binary files a/res/syslinux/ldlinux.sys and b/res/syslinux/ldlinux.sys differ diff --git a/res/syslinux/readme.txt b/res/syslinux/readme.txt index a8c60fd8..9afa759b 100644 --- a/res/syslinux/readme.txt +++ b/res/syslinux/readme.txt @@ -1,5 +1,3 @@ -o ldlinux.bss and ldlinux.sys were compiled from the syslinux git tree retreived - on 2012.02.13 from git://git.kernel.org/pub/scm/boot/syslinux/syslinux.git - with the included .diff applied to be able to use unmodified isolinux config. -o chain.c32 is from syslinux-4.05/com32/modules: +o ldlinux.bss and ldlinux.sys are from syslinux-4.05/core/ +o chain.c32 (currently unused) is from syslinux-4.05/com32/modules/ http://www.kernel.org/pub/linux/utils/boot/syslinux/ \ No newline at end of file diff --git a/res/syslinux/syslinux.diff b/res/syslinux/syslinux.diff deleted file mode 100644 index 8af3d7f5..00000000 --- a/res/syslinux/syslinux.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/core/fs/lib/loadconfig.c b/core/fs/lib/loadconfig.c -index c9652b6..8ed301e 100644 ---- a/core/fs/lib/loadconfig.c -+++ b/core/fs/lib/loadconfig.c -@@ -10,6 +10,8 @@ - * This searches for extlinux.conf and syslinux.cfg in the install - * directory, followed by a set of fallback directories. If found, - * set the current working directory to match. -+ * isolinux configuration values are added for the case where ISO -+ * content has been duplicated to a disk (typically bootable USB). - */ - int generic_load_config(void) - { -@@ -18,11 +20,14 @@ int generic_load_config(void) - "/boot/syslinux", - "/syslinux", - "/", -+ "/boot/isolinux", -+ "/isolinux", - NULL - }; - static const char *filenames[] = { - "extlinux.conf", - "syslinux.cfg", -+ "isolinux.cfg", - NULL - }; - diff --git a/res/usb.ico b/res/usb.ico new file mode 100644 index 00000000..02a07fed Binary files /dev/null and b/res/usb.ico differ diff --git a/src/rufus.rc b/src/rufus.rc index 150d67b0..db7138ff 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.139" +CAPTION "Rufus v1.1.1.140" 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 139)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.1.1 (Build 140)",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 @@ -220,8 +220,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,1,139 - PRODUCTVERSION 1,1,1,139 + FILEVERSION 1,1,1,140 + PRODUCTVERSION 1,1,1,140 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -238,13 +238,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.1.1.139" + VALUE "FileVersion", "1.1.1.140" 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.139" + VALUE "ProductVersion", "1.1.1.140" END END BLOCK "VarFileInfo" diff --git a/src/syslinux.c b/src/syslinux.c index c4ff8b33..6e947759 100644 --- a/src/syslinux.c +++ b/src/syslinux.c @@ -2,7 +2,7 @@ * * Copyright 2003 Lars Munch Christensen - All Rights Reserved * Copyright 1998-2008 H. Peter Anvin - All Rights Reserved - * Copyright 2011 Pete Batard + * Copyright 2012 Pete Batard * * Based on the Linux installer program for SYSLINUX by H. Peter Anvin *