From 9d2f9faa7077198c788a60a27c52c4d2c2820946 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 12 Jan 2012 18:55:30 +0000 Subject: [PATCH] [sl] add chain.c32 module for embedding * also minor updates --- _release.sh | 2 +- res/syslinux/chain.c32 | Bin 0 -> 20704 bytes res/syslinux/readme.txt | 5 +++-- src/resource.h | 1 + src/rufus.rc | 14 ++++++++------ src/syslinux.c | 9 +++++++-- 6 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 res/syslinux/chain.c32 diff --git a/_release.sh b/_release.sh index 2434a9fb..aa963ff8 100644 --- a/_release.sh +++ b/_release.sh @@ -1,6 +1,6 @@ #!/bin/sh rm -f rufus*.exe -./configure --without-freedos +./configure --without-freedos --without-syslinux make clean make release -j2 ./configure --with-freedos diff --git a/res/syslinux/chain.c32 b/res/syslinux/chain.c32 new file mode 100644 index 0000000000000000000000000000000000000000..5787c807f8c4b21cc733e473fdeb425397b09778 GIT binary patch literal 20704 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 Z5sxzP%fc@ozYX|3f?q9ut@zR3{|9K0azFq8 literal 0 HcmV?d00001 diff --git a/res/syslinux/readme.txt b/res/syslinux/readme.txt index f31b6ee1..46216b8f 100644 --- a/res/syslinux/readme.txt +++ b/res/syslinux/readme.txt @@ -1,2 +1,3 @@ -o ldlinux.bss and ldlinux.sys were extracted from syslinux-4.05/core/ - http://www.kernel.org/pub/linux/utils/boot/syslinux/ +o ldlinux.bss and ldlinux.sys were extracted from syslinux-4.05/core/ + and chain.c32 from syslinux-4.05/com32/modules: + http://www.kernel.org/pub/linux/utils/boot/syslinux/ diff --git a/src/resource.h b/src/resource.h index 37614ea5..49a0caec 100644 --- a/src/resource.h +++ b/src/resource.h @@ -37,6 +37,7 @@ #define IDR_FD_EGA18_CPX 326 #define IDR_SL_LDLINUX_BSS 400 #define IDR_SL_LDLINUX_SYS 401 +#define IDR_SL_CHAIN_C32 402 #define IDC_DEVICE 1001 #define IDC_FILESYSTEM 1002 #define IDC_START 1003 diff --git a/src/rufus.rc b/src/rufus.rc index 35a417ab..a4ff50e1 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 | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.0.7.117" +CAPTION "Rufus v1.0.7.118" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 @@ -69,7 +69,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.0.7 (Build 117)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.0.7 (Build 118)",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 @@ -159,6 +159,7 @@ BEGIN "#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" + "IDR_SL_CHAIN_C32 RCDATA ""../res/syslinux/chain.c32""\r\n" "#endif\r\n" "\r\n" "// Must reference a manifest for visual styles and elevation\r\n" @@ -206,8 +207,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,7,117 - PRODUCTVERSION 1,0,7,117 + FILEVERSION 1,0,7,118 + PRODUCTVERSION 1,0,7,118 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -224,13 +225,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.7.117" + VALUE "FileVersion", "1.0.7.118" 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.0.7.117" + VALUE "ProductVersion", "1.0.7.118" END END BLOCK "VarFileInfo" @@ -292,6 +293,7 @@ IDR_FD_EGA18_CPX RCDATA "../res/freedos/ega18.cpx" #if defined(WITH_SYSLINUX) IDR_SL_LDLINUX_BSS RCDATA "../res/syslinux/ldlinux.bss" IDR_SL_LDLINUX_SYS RCDATA "../res/syslinux/ldlinux.sys" +IDR_SL_CHAIN_C32 RCDATA "../res/syslinux/chain.c32" #endif // Must reference a manifest for visual styles and elevation diff --git a/src/syslinux.c b/src/syslinux.c index bcc8c5eb..e46d0581 100644 --- a/src/syslinux.c +++ b/src/syslinux.c @@ -61,7 +61,10 @@ int libfat_readfile(intptr_t pp, void *buf, size_t secsize, return (int)secsize; } -// TODO: set format errors +/* + * Extract the ldlinux.sys and ldlinux.bss from resources, + * then patch and install them + */ BOOL InstallSyslinux(DWORD num, const char* drive_name) { HANDLE f_handle = INVALID_HANDLE_VALUE; @@ -186,7 +189,7 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name) /* Close file */ safe_closehandle(f_handle); - /* Make the syslinux boot sector */ + /* Read existing FAT data into boot sector */ if (SetFilePointer(d_handle, 0, NULL, FILE_BEGIN) != 0 || !ReadFile(d_handle, sectbuf, SECTOR_SIZE, &bytes_read, NULL) @@ -195,8 +198,10 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name) goto out; } + /* Make the syslinux boot sector */ syslinux_make_bootsect(sectbuf); + /* Write boot sector back */ if (SetFilePointer(d_handle, 0, NULL, FILE_BEGIN) != 0 || !WriteFile(d_handle, sectbuf, SECTOR_SIZE, &bytes_written, NULL)