From 93d0cf7fbe0a7031ca9402029713a7afb4ed663c Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 28 May 2015 19:14:14 +0100
Subject: [PATCH] [grub] update Grub4DOS to latest

* Closes #516
---
 ChangeLog.txt             |   1 +
 res/grub/grldr.mbr        | Bin 8192 -> 8192 bytes
 res/grub/readme.txt       |   4 ++--
 src/ms-sys/inc/mbr_grub.h |  41 +++++++++++++++++++-------------------
 src/rufus.rc              |  16 +++++++--------
 5 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f3d1063e..5853077a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -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)
diff --git a/res/grub/grldr.mbr b/res/grub/grldr.mbr
index 37f911f0fd6c187db4a31ff747ef0d14dbf2b705..c0051a3c12a495da6468615834a6f4e9a2a2e375 100644
GIT binary patch
delta 942
zcmY*XZERCj7(Q>;o?h#EZ@1Bpb=_?xtm(jAR-%S6%nI2+6J&JCT%6Pq^`=J5NNFKc
z<8CdLjxA*4NciFSK`71;K87Qx*xYnuc8N#=1Vv+j012M12@cUNsJr#H=nwy#bKd89
z-simMeUIdme8c-;YJ{u`?m;2lEJA6$ydUT(lv89GsMeInNszeR+p1%k@~EOfD7UL2
zkH-MGIB%6$^-zp7k*h&u)Q@YuSG+&d)o90*e8NHBLfJnp|BCNhO5*GlB7h4Hl6LrP
zLV-)=bu0wLuE9>XIDcE5-^q4}Wj=;JL;<)V&bPV{Vh|VS$OCq%F@?kvVmuwzeUYZ)
zWGT1Oz6*6p(^@ilM<Wixp>F*s4WdK%#nI4n<b7^MT|_f-QtS#0-E=<WcIOoMp?N18
zN{NNGGh*R|aW39n;9`FAJy&1Rw!nSpSvVidc%rKf54iYU!kN4pahUi_L$HoqG`X!w
z=$G7Mu)t%nC#p=T?>9mQCyAkAm9cG3KIfn<bMkj~+C=;nR^t;Tq-IVotD$BRsaV$k
z@vk9M^smjwB8L1Vgmn^|1nmq?L7^~%&w&Cn_$ag}XP6!yU#!wQLyt?hTEaN-#{hd2
zwic(LjqrK=3SuHw9{148hOK(%pvom!8&bYW2zJyNyQigT90)N*bB4aI6TRtTCKG-#
zN}QD*qdLk?%<KOy!Q`dNW=N9Z%Ei^!?&%-RIewtbo5xPctwBgoA#$Pe6SI0pt8J1p
zzJXTzYcH#wCFZ@V;r}s#&i@$KB0IECG%wl$kKNB@Q%F$DA&1Q#b2^tDM5Rxpa~IeY
z$RiGVoZK+?!3xr4@v6n_wKUabX62hTiAziRuNriXjUP=9w7Tf$vujuWwqt$AIDCyh
zXw1`h2(>t1jOeWE)T|BGw7ME?9w?A!Y)f3rv+^Ast<TD*?ZOOx6}g&(4DLo8wPfXZ
z4K<N>Z650{l=h<YverSb)1v$um8%@|GWp7O1RBVe>Kv?@c;5bo=2@d*W3Nlx*1LUs
zp9=+h!wql0*@pz~tlE2jar+e3__?#+`h#I7t=Gh+nJ>|%ed&EamL%l5LjVUUuU!j2
zk@i{(OcAm6X&54-wFlvM@)X|zhshp(quNUUURHyIgzBeEJ~BKoG0OumV@QkEcWgfP
E4||4jssI20

delta 944
zcmY*XZ){Ul6u+lyZ{O<rUb}zoy6*L5foB12T9TQusVg`{ji{Ycr%2tRJ{L71DJ^D7
z+^eOgqewO`#t+gtAq2#bOh-_*<=IKy3`(*@LNq1}ogZ%71Q&@NihK37=m)>td+z!D
z&YydJNA}D9k;5=ON;>*w6gK1$${3Xt&{L?ODhg1&rHIoYbNgRwiqF-=R29O7*To_p
z2jCLCO=dNt{L)1)51@U<3GfzuKhZW6o+@PiW!-G7uyQ|=HV|Np1mV=EV4PH8p=PZG
zLQ-!kC`v28NGp5U9;wRD&|4@3SEZG10U-u)2`jn5t~V=4IwK`A5yR&h`WaczwL1n;
zubkDB*(IHng7i+~QThr><0p@XA0hj=jdx1Dp@WOAXtgNchyLXD=Tx}Txt9%3Nu{l4
zrPB5ZF7Zr>i$6}j=hj&tSmoXpS1-ip+_8I2H@L*F#BA{qzvUowkxLfQmWCl&9EVjN
zOMNl*EA8uMn8RsevUZs7UsldIY5TJBor7*90jtgIsCep^m8xdSlBjjV(7V5dEwNiW
zPDf3}S%?^9HVyiDJOicDJe~p-=J6PGsb`r!9$%_6y25wJKX*lN@{eJ54EoCg=%aiQ
zKZ}^CjmLd7Yw9<;QW}<I?MVGP>2aW7{JNfIa45`_lQZ-MgXGf$(9FnPG2*Iqn>7`K
zm^c1iag(QNJ0VR*YFnEYt{ZPloOrLwSHvz^)FI^2T;$u@4;r)@-S%0^_=me4&p)l@
ztRQdJjr<P@1^+{YdIvl-*;&5}s`G{14Dx90kdGSN4d)BF6sqixK`gN|po}`{339bz
z5H^tBMxWNqfyPa1zsxI(&B=u|LzhhkulJqoaJN7|$!}@@eb2U@37AH2d5cscw9yIU
z#9(_+i+a?S(N4474L8X>_BDb#rz{z0Yfkyp;hD$JAz_ne4(~)9<#I}*nO2iG>~7mN
zN_V3Rirz`D&@z32Ds@hJk({?52a)V*DnQ5N!;Tkq-hthbyI*~25P7(B+PDMd>qFQa
z;LcqP47}{3>vZuf^96e1Q0CAN6$;5aJ<v*;TDI61mpGE`z}f~M$q3hu)u8^qX{4jy
zkUcGJaF~4D@;>}UHuF7jk{sb5)5aM%!0M1EsTELXZ&yf8uJ8b(f|)sq^k`epj?@1D
DFS>B}

diff --git a/res/grub/readme.txt b/res/grub/readme.txt
index 899d96d8..aac7fc32 100644
--- a/res/grub/readme.txt
+++ b/res/grub/readme.txt
@@ -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).
diff --git a/src/ms-sys/inc/mbr_grub.h b/src/ms-sys/inc/mbr_grub.h
index ddf0a14f..b166c7d2 100644
--- a/src/ms-sys/inc/mbr_grub.h
+++ b/src/ms-sys/inc/mbr_grub.h
@@ -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
 };
diff --git a/src/rufus.rc b/src/rufus.rc
index 18080164..3832339e 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -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"