mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[syslinux] reverted Syslinux resources to vanilla 4.0.5
* also added the full usb.ico from PC Unleashed for future reference
This commit is contained in:
parent
8e091fdc04
commit
3e51ed7160
8 changed files with 10 additions and 40 deletions
|
@ -17,7 +17,7 @@ Compilation:
|
||||||
ms-config.h (Visual Studio, WDK) or running "./configure --help" (MinGW).
|
ms-config.h (Visual Studio, WDK) or running "./configure --help" (MinGW).
|
||||||
|
|
||||||
Additional information:
|
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.
|
debug facility. This info can be accessed with an application such as DebugView.
|
||||||
|
|
||||||
More info:
|
More info:
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,5 +1,3 @@
|
||||||
o ldlinux.bss and ldlinux.sys were compiled from the syslinux git tree retreived
|
o ldlinux.bss and ldlinux.sys are from syslinux-4.05/core/
|
||||||
on 2012.02.13 from git://git.kernel.org/pub/scm/boot/syslinux/syslinux.git
|
o chain.c32 (currently unused) is from syslinux-4.05/com32/modules/
|
||||||
with the included .diff applied to be able to use unmodified isolinux config.
|
|
||||||
o chain.c32 is from syslinux-4.05/com32/modules:
|
|
||||||
http://www.kernel.org/pub/linux/utils/boot/syslinux/
|
http://www.kernel.org/pub/linux/utils/boot/syslinux/
|
|
@ -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
|
|
||||||
};
|
|
||||||
|
|
BIN
res/usb.ico
Normal file
BIN
res/usb.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 162 KiB |
12
src/rufus.rc
12
src/rufus.rc
|
@ -33,7 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
|
||||||
IDD_DIALOG DIALOGEX 12, 12, 206, 278
|
IDD_DIALOG DIALOGEX 12, 12, 206, 278
|
||||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||||
EXSTYLE WS_EX_APPWINDOW
|
EXSTYLE WS_EX_APPWINDOW
|
||||||
CAPTION "Rufus v1.1.1.139"
|
CAPTION "Rufus v1.1.1.140"
|
||||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||||
BEGIN
|
BEGIN
|
||||||
DEFPUSHBUTTON "Start",IDC_START,94,236,50,14
|
DEFPUSHBUTTON "Start",IDC_START,94,236,50,14
|
||||||
|
@ -71,7 +71,7 @@ BEGIN
|
||||||
DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP
|
DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP
|
||||||
CONTROL "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL,
|
CONTROL "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL,
|
||||||
"SysLink",WS_TABSTOP,46,47,114,9
|
"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
|
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
|
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
|
LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
|
||||||
|
@ -220,8 +220,8 @@ END
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 1,1,1,139
|
FILEVERSION 1,1,1,140
|
||||||
PRODUCTVERSION 1,1,1,139
|
PRODUCTVERSION 1,1,1,140
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
@ -238,13 +238,13 @@ BEGIN
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "akeo.ie"
|
VALUE "CompanyName", "akeo.ie"
|
||||||
VALUE "FileDescription", "Rufus"
|
VALUE "FileDescription", "Rufus"
|
||||||
VALUE "FileVersion", "1.1.1.139"
|
VALUE "FileVersion", "1.1.1.140"
|
||||||
VALUE "InternalName", "Rufus"
|
VALUE "InternalName", "Rufus"
|
||||||
VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
|
VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
|
||||||
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
||||||
VALUE "OriginalFilename", "rufus.exe"
|
VALUE "OriginalFilename", "rufus.exe"
|
||||||
VALUE "ProductName", "Rufus"
|
VALUE "ProductName", "Rufus"
|
||||||
VALUE "ProductVersion", "1.1.1.139"
|
VALUE "ProductVersion", "1.1.1.140"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* Copyright 2003 Lars Munch Christensen - All Rights Reserved
|
* Copyright 2003 Lars Munch Christensen - All Rights Reserved
|
||||||
* Copyright 1998-2008 H. Peter Anvin - 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
|
* Based on the Linux installer program for SYSLINUX by H. Peter Anvin
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue