nerd
/
rufus
mirror of https://github.com/pbatard/rufus.git
1
1
Fork 0
Code Issues 1 Projects Releases Wiki Activity

[grub] update Grub4DOS to latest 

* Closes #516
This commit is contained in:
Pete Batard 2015-05-28 19:14:14 +01:00
parent ac213a16e9
commit 93d0cf7fbe
5 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -5,6 +5,7 @@ o Version 2.2 (2015.05.??)
Fix an USB detection issue and add support for ASUS UASP Turbo Mode
Fix prevention of Windows shutdown when Rufus is idle
Improve UI on high DPI monitors
Update Grub4DOS to 0.4.6a [2015.05.18]
Other UI improvements and fixes
o Version 2.1 (2015.03.23)

BIN
res/grub/grldr.mbr
View File

Binary file not shown.

4
res/grub/readme.txt
View File

@ -1,7 +1,7 @@
This directory contains the Grub4DOS boot records that are used by Rufus
* grldr.mbr was taken from the official 2015.02.15 release from
http://grub4dos.chenall.net/downloads/grub4dos-0.4.6a-2015-02-15/
* grldr.mbr was taken from the official 2015.05.18 release from
http://grub4dos.chenall.net/downloads/grub4dos-0.4.6a-2015-05-18/
* Note that, for convenience reasons, the first 512 bytes from this grldr.mbr are
*not* the ones that Rufus processes when writing the actual MBR (first 512 bytes).

41
src/ms-sys/inc/mbr_grub.h
View File

@ -1,5 +1,5 @@
/*
* First 416 bytes of MBR from Grub4DOS (Converted from res/grub4dos/grldr.mbr)
* First 423 bytes of MBR from Grub4DOS (Converted from res/grub4dos/grldr.mbr)
*/
unsigned char mbr_grub_0x0[] = {
0xEB, 0x5E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@ -14,27 +14,28 @@ unsigned char mbr_grub_0x0[] = {
0xEB, 0x6A, 0x00, 0xC1, 0xEB, 0x04, 0x8C, 0xC8, 0x01, 0xC3, 0x53, 0x68,
0x7B, 0x00, 0xCB, 0x68, 0x00, 0x20, 0x17, 0xBC, 0x00, 0x90, 0x80, 0xFA,
0x00, 0x74, 0x02, 0xB2, 0x80, 0x16, 0x07, 0xB0, 0x10, 0x30, 0xF6, 0x31,
0xDB, 0xE8, 0xBB, 0x00, 0x72, 0x29, 0x0E, 0x1F, 0x31, 0xF6, 0x31, 0xFF,
0xDB, 0xE8, 0xC2, 0x00, 0x72, 0x29, 0x0E, 0x1F, 0x31, 0xF6, 0x31, 0xFF,
0xB9, 0xDF, 0x00, 0xFC, 0xF3, 0xA5, 0xBB, 0xFC, 0x1F, 0x66, 0xB8, 0x47,
0x52, 0x55, 0xAA, 0x66, 0x39, 0x07, 0x75, 0x03, 0xE8, 0x98, 0x19, 0xEA,
0xB8, 0x00, 0x00, 0x20, 0x16, 0x1F, 0x66, 0x39, 0x07, 0x74, 0x1F, 0x80,
0xF2, 0x80, 0x68, 0xC0, 0x07, 0x07, 0xB0, 0x10, 0x30, 0xF6, 0x31, 0xDB,
0xE8, 0x80, 0x00, 0x72, 0x05, 0xEA, 0x00, 0x00, 0xC0, 0x07, 0xBE, 0x8B,
0x01, 0xE8, 0xA8, 0x00, 0xEB, 0xFE, 0xBE, 0xBE, 0x01, 0xE8, 0x04, 0x10,
0xF6, 0x06, 0x9D, 0x01, 0x80, 0x0F, 0x84, 0x6C, 0x19, 0x83, 0xC6, 0x0C,
0x81, 0xFE, 0xFE, 0x01, 0x72, 0xEB, 0x77, 0x26, 0xF6, 0x06, 0xA0, 0x01,
0x01, 0x0F, 0x85, 0x1E, 0x17, 0x80, 0x0E, 0xA0, 0x01, 0x01, 0xF6, 0x06,
0xA0, 0x01, 0x02, 0x75, 0xD4, 0x68, 0x00, 0x7C, 0x07, 0xB0, 0x01, 0x30,
0xF6, 0x31, 0xDB, 0xE8, 0x35, 0x00, 0x72, 0xBA, 0xEB, 0xC0, 0xF6, 0x06,
0xA0, 0x01, 0x01, 0x0F, 0x85, 0xF8, 0x16, 0x80, 0x0E, 0xA0, 0x01, 0x01,
0xE9, 0xD9, 0x16, 0x1E, 0x06, 0x52, 0x56, 0x57, 0x55, 0xF9, 0xCD, 0x13,
0x5D, 0x5F, 0x5E, 0x5A, 0x07, 0x1F, 0xC3, 0xFA, 0xB8, 0x00, 0x20, 0x8E,
0xD0, 0xBC, 0xDC, 0x8F, 0xFB, 0x66, 0x61, 0x07, 0x1F, 0xEB, 0x9E, 0xB4,
0x02, 0xBF, 0x03, 0x00, 0xB9, 0x01, 0x00, 0x60, 0x50, 0x53, 0x51, 0xFE,
0xC8, 0x00, 0xC1, 0xD0, 0xE0, 0x00, 0xC7, 0xB0, 0x01, 0xE8, 0xC7, 0xFF,
0x59, 0x5B, 0x58, 0x72, 0x04, 0xFE, 0xC8, 0x75, 0xE7, 0x61, 0x73, 0x0B,
0x60, 0x31, 0xC0, 0xE8, 0xB5, 0xFF, 0x61, 0x4F, 0x75, 0xD9, 0xF9, 0xC3,
0xB4, 0x0E, 0xCD, 0x10, 0x2E, 0xAC, 0x3C, 0x00, 0x75, 0xF6, 0xC3, 0x0D,
0x0A, 0x4D, 0x69, 0x73, 0x73, 0x69, 0x6E, 0x67, 0x20, 0x68, 0x65, 0x6C,
0x70, 0x65, 0x72, 0x2E, 0x00, 0x00, 0x3F, 0xFF
0xE8, 0x87, 0x00, 0x72, 0x05, 0xEA, 0x00, 0x00, 0xC0, 0x07, 0xBE, 0x92,
0x01, 0xE8, 0xAF, 0x00, 0xEB, 0xFE, 0xBE, 0xBE, 0x01, 0xE8, 0x04, 0x10,
0xF6, 0x06, 0xA4, 0x01, 0x80, 0x0F, 0x84, 0x6C, 0x19, 0x83, 0xC6, 0x0C,
0x81, 0xFE, 0xFE, 0x01, 0x72, 0xEB, 0x77, 0x2D, 0xF6, 0x06, 0xA7, 0x01,
0x01, 0x0F, 0x85, 0x1E, 0x17, 0x80, 0x0E, 0xA7, 0x01, 0x01, 0xF6, 0x06,
0xA7, 0x01, 0x02, 0x75, 0xD4, 0x68, 0x00, 0x0D, 0x07, 0xB0, 0x04, 0x31,
0xD2, 0x31, 0xDB, 0xE8, 0x3C, 0x00, 0x73, 0xC2, 0xBE, 0xAD, 0x1C, 0xE8,
0x69, 0x00, 0xE9, 0xFA, 0x16, 0xF6, 0x06, 0xA7, 0x01, 0x01, 0x0F, 0x85,
0xF1, 0x16, 0x80, 0x0E, 0xA7, 0x01, 0x01, 0xE9, 0xD2, 0x16, 0x1E, 0x06,
0x52, 0x56, 0x57, 0x55, 0xF9, 0xCD, 0x13, 0x5D, 0x5F, 0x5E, 0x5A, 0x07,
0x1F, 0xC3, 0xFA, 0xB8, 0x00, 0x20, 0x8E, 0xD0, 0xBC, 0xDC, 0x8F, 0xFB,
0x66, 0x61, 0x07, 0x1F, 0xEB, 0x97, 0xB4, 0x02, 0xBF, 0x03, 0x00, 0xB9,
0x01, 0x00, 0x60, 0x50, 0x53, 0x51, 0xFE, 0xC8, 0x00, 0xC1, 0xD0, 0xE0,
0x00, 0xC7, 0xB0, 0x01, 0xE8, 0xC7, 0xFF, 0x59, 0x5B, 0x58, 0x72, 0x04,
0xFE, 0xC8, 0x75, 0xE7, 0x61, 0x73, 0x0B, 0x60, 0x31, 0xC0, 0xE8, 0xB5,
0xFF, 0x61, 0x4F, 0x75, 0xD9, 0xF9, 0xC3, 0xB4, 0x0E, 0xCD, 0x10, 0x2E,
0xAC, 0x3C, 0x00, 0x75, 0xF6, 0xC3, 0x0D, 0x0A, 0x4D, 0x69, 0x73, 0x73,
0x69, 0x6E, 0x67, 0x20, 0x68, 0x65, 0x6C, 0x70, 0x65, 0x72, 0x2E, 0x00,
0x00, 0x3F, 0xFF
};

16
src/rufus.rc
View File

@ -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.2.665"
CAPTION "Rufus 2.2.666"
FONT 8, "Segoe UI", 400, 0, 0x1
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -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.2.665"
CAPTION "Rufus 2.2.666"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -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.2.665"
CAPTION "Rufus 2.2.666"
FONT 8, "Segoe UI", 400, 0, 0x1
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -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.2.665"
CAPTION "Rufus 2.2.666"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -671,8 +671,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,665,0
PRODUCTVERSION 2,2,665,0
FILEVERSION 2,2,666,0
PRODUCTVERSION 2,2,666,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.2.665"
VALUE "FileVersion", "2.2.666"
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.2.665"
VALUE "ProductVersion", "2.2.666"
END
END
BLOCK "VarFileInfo"