From a352ad019dea43d48b3dedc1dc55dc797a51aeec Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sun, 4 Nov 2012 00:29:24 +0000 Subject: [PATCH] [sl] update to syslinux 4.06 * Also fixes MSVC 64 bit warnings in format.c and iso.c --- res/syslinux/ldlinux.bss | Bin 512 -> 512 bytes res/syslinux/ldlinux.sys | Bin 31205 -> 36180 bytes res/syslinux/readme.txt | 2 +- src/format.c | 2 +- src/iso.c | 2 +- src/rufus.rc | 12 +++++----- src/syslinux/libinstaller/syslxint.h | 33 ++++++++++++++++++++------- src/syslinux/libinstaller/syslxmod.c | 2 -- 8 files changed, 34 insertions(+), 19 deletions(-) diff --git a/res/syslinux/ldlinux.bss b/res/syslinux/ldlinux.bss index 884c5a8e5cebb8ea1558f89479e7684b05194637..b33699fde8f691eacb87ce5d1affde73c3701dd4 100644 GIT binary patch delta 16 XcmZo*X<*r)&&cw<*d%YVG2>YPE8+!> delta 16 XcmZo*X<*r)&&Xn&7EmzRnDHzCCK&|U diff --git a/res/syslinux/ldlinux.sys b/res/syslinux/ldlinux.sys index cee0f82ffadde50dacf85f68532a10d6fe309470..6aa59cb74fe61407d8063bbd72071bea28fea15e 100644 GIT binary patch delta 21398 zcmZU430M;&`R&8t5wiAPuRz+|j|H1eDp6C0XfAY+nyPTQ3pZh!Kp84Yi zc$kiQA&+wj+=fomqi|MSxWUwktwhC%z{J0fAM zd&pG5a7K4eRcqRg0|3EyQqLb-4*=Y{_b-TRD4};C{20Wrv#FEe0-iP9X1GDTLeo12 zy5M6r4t+YwVa>6HOzNHwm;bv3Uyd#q@7MBF^=(!+D_h#UcNm zqyATjC9Wkf@yykf!*oZUd`B!cZDA_Go2Ca$?-#66*9KXF-TF0c}|F6KOIKlN}h zXt5Z=AEW}hCz;rIwHfFoz7(qQAW6GAG$=T1{p=L=dE^EFs5LPVS+>TM#ByTC3b6@d zgD}rBK&VY6EM-ItM>~^X35j&Bg`e5I`#XXy#Df4of+Fl5>L9GH-DF+HT^DEeQ-E%= zguh)Eo4=kggg+sRwd?-&JK`4;o$WI9JJ)I}(5oHv>p4ntoezu8P-|)?TU=%eXQQCR zl+Shm7ns(wlfY8bMRr{D<*qc6ORdRdkxcs>vbl9905wj-gIa>s7}6h&0ERxK`t5_R z^*`Y@w^Gq7WNA((i38KS!{Uj3)4Mmeo0pgr9ADYoljd10;*JyXeyTO-cn6Ws)p--3 zvnrH&yhHm;ZME4Gtfi5pIav2w7ID(4oBo*Wblm1<>Wf2W^+Xo2oJ)La>f?lgIUn12 z=$q*3>T%ztrKQ~3S&R?Cm20@QLWa86{NEgaTWk9vO7i(}YbgwiFoXDwuGY9v$fhLm z^N15nqL*jB`nLP|cf{&x=67#1GysoA@R(gdmH+)bwdUPq&xrZe;{d{~c{Jf(9XA7?#RBX)F>A-%&i3S?=gY*t-F_=GWSo6_YK6jxB&w(0xB{P!}kXolX;DK zl7Sdx?{@<+z^x9lT6q$DJ&*94viyI-@~9*&EHRG-r?p;6NJ)kvi>9^qSn|< z_Wwv#kIclA1!~QK$*KA+rxfxZB{S6|Pv3{J*< zhJT=jybBK0w$mRrxNkA#IJoEw;IY2OWU_j^TOt1q2>`P8JOChjae}M_9>X{9ar_U@ z*QdyKfn*NZ-(hs_)*9gRFM_B4r#++?BTm`5k}g?!-TxYcKxpe8Dw*7TPCoe zox$pZ+k=Ug_tewLV)Ij78kBzVW`6r5)r-kNnG?7cK zXF`o{CIuJSHRLPId>fO+QKa8zO91cG=K;VGP^?vsKV>f>i+TQ`a4ek8Q2yt%R`j_TU{!!=q z_xRuZ!JY_sLmaSEFEOLkZn%?pZdVoleWgIlB-{`=A+hbFnkmDplr1e@#MgT+Giu~cdH|A-VV!@noHFD)aJiiek*mN>;zKS&fO zQ=5~>rMw-V`(M#xp&R;mlP}53?#oOgdB6MHsQ?7ErZneDibHcBDI0G)2ZEI*rb{3= z)3m^4imkHwe52fg_EVpR(gvtcLX%7@T&AJzOv`jUs6pP30Nsu9^V^dCy8-%8iJEuX z^MtqQu!|eBsvW(rou+7TuQT0pnFm&xxYMQvZ)qPEJ`8@yZR(l0{8qiB?=7*Kb<*|+ zM_n{N{lf##4+Mt238l^s)43QkDZ{Ox_Ce(2DqAuw1e#!)TBdDrt7Ew_3lTy_ z=@u;fRw^k6iBzDBd!Bxu5KpGw$HE6EnT80y>Ab5GC^h};D$##fz*nI@1!4OpuY{}a zJT}Aeruy|`H8`ZkT*%}%<9Q{}hfoW6J}lwC-MI()?^O5*(t#?H&G5f6H$lXWvB_jB z^-*dc(K*hoxdo)DCs$K#JF$Jd#Gfb|Ck~94c&Wu{MD=(HozRREACHsL?S9o?+@8OX z`tU97^}kg=W{qIeYfYaCg|;>A3WF6cqu%%nKL;RKc$H~T7!_38{`a3%e^#~9Nj$gk zeO37Jc0g;}PbJADgd(?o5<6Xd+c!Y1Y6k$amUX~lvH_-ebS_w9sz#F`c-(XYbpW55 z{z9igZ%&%1qDXapJMj&pk0=F*6R)*JCF5aY?Z2e7ILa2Px$Sp}SED7FSlHRe>NWMkH*XDGp~-D9*P2jSGQqY&@sP_3r=TuaD_c=kSpqW zN;x3}It9SC$u&N>?cp|p%--JSf0Ja8OiVHanG(ffFv7G}>`1rk@ExGqb*wcR#ZzFr zjvCXKVhKsxOxMLO2*1O8-}JY*2@EvVN>uZBUz38+@?H)8s0Oe1o$3GD3{R+)YTUOq zSgpyQ#8lVct8A zn;6VDG29n}8q-Sm81RIt%{`VB2V?G@%w-*&5bp|H;f^}LZLtL*@4~8Z?RV84Y;Y2gFH!HO^(l@YCDFheRi9ent3GhN!&iND8!t}^&t}!=MM&qCkO_t-HKZ50E%j*$yMeSnM|EC%{~ z)m9Rh`&Ls=b`Zn9YJ+22N6^zr1&o*&Q8)Wej>Dk0(dqvnwQY~KJ?(DqAR4TM-n8Dw zjnpQZeO&Z3QnmTtzd|5gGr3<{=a{|&0FB>i@}*TIgW)3YBbmg%=R8ox1G>h^efPz& z^SodH=sH3D5T4}h!bz$4;#l9P%nQ>sS^_lCRTZH76HaXRS!8XtT%=|Vw7r2YN z(L1J*bBwS)e)A3^BLMK!;oxN9`P_D`M0h6QJNe8{AmQZH#(whpw`(a`4`aQ_Y0wo<<+$31h;`T^ise*pX&>;a~NLhvfMJK*3yAY{5W`={xW zG=NlH|F14P+s}XYOn<+bvja@M0bjEg?_Rch@$S-X>p$-PZd0H=IJ2T@OH;$n$$wMR zCrvF)UpEPMh3!h;HJMVnEB=a&gI;~{Ybw&B=(HcCkm=V>Y6byd z=(D>)uc#nNcYfnXJ~#B4{T2{_NxJ+;5I{)UO#d>Oq9+55-#iphNt!yFN~MuBwyD2| zPSR`0Kjc&hKA@fF_}5*sfUF*ntZ3B%d8_6j0K~Su_rEK+NTy$z{rJ}9)MuX^8BBS8 zjig<9k8c6Mn$NIH8q%sz`5Et*ILC)1pA7@x+#~6qLGz|PAn8l&(mj1e2h#FouKf>x zk_rE?0U&I?*MWa0X}H&c7n5{>*MXOlRO)r$)g+DZIxsp(BfSp1o}^J;2gW98wAX?0 zNhR7mn}6N3|Vd?(M%4p2Iv9E zWg;<6pXUbtX^Nf~FEAYffMa;;dl7OA@!MKhs@89jaadfRvTt^Zr`<;3()#DFOkiVGLeB?Z9v& z52)+WQmun^Jvtk;VSdGT^3Xg`UuzF$q+xy15P-tQ2EFcB7}Ai-rAU1`Y;E9EYj5gC zHi7*J%vqP$Ai(2uH91mfZn%Imp7mAFOpfCqYDF}i!|k}6xavN;x^E;S29H|CdP6K*#KbNsW9_eU{cq;lN_IlD zJnSy97@m{|du*5{>HMks>~g@oJdK)GJ-i0Qr`6kY?C}I)-4!j1tl3@b4fDZtUmEcd zIW%=W-1=P#u*DwXayxpAD(j4ukb%ZUwCpVI!*q3|n`PDUX`oa{d>ReKAXX`8a99gr zk-}W0GaY)0bXntAF!qS3pRlT2*;-mv1!A40rRe(+WR`UPT6jIBvmB5@AYhCG_fZW! zk{D`J)WeD{*_&4ozi)885EXQ@9A(d--_)|X9T(zO^{^>b4iOO>qa0{NNH*8M zr;nYS%W;mL4KncfK&dN}cY0EiT5r4_+*|!f147tfAHg|60S>w09;d_NVX#wqDKSO_K@&UQL})3IdBW#Q_mG*{fzk%X+GKf3>Pe2!o%0l zU*9A(GxUNIL_mn0w2@u0dBaSeYNqK(IO<=`t@)%Jgkl6ZU$Tn+@LfqVlUMxHLfLxSrJU z*Gw6RNfMmVe$2Jl8^R={i7(q~wff(;P|g79pTu_Z(B~;h<8dmGAV8I=aDlUaPu7Fl4OM?z=?81xZTcyj6@}u@Mzj;k$>5+%ZO|i1kY}Svl#504sJG zkg_%Q^2#NMg_%%_sM51x3c*gd&!ST{059ToERf2!Sro-ifq%}S6xHkLG@O@Rkjn4U z%#jO_yV>TjOaM^9`a{_uU{y%A%6XcOL>=)s0j8-=OP2>k{o*`Gaqxt`!a2$WY8o@`f>GJ7u!*#0 zLf!*eNr5m&!(qb2+%$%IAS!MOh;0%sDsYQurRt-d=VXJ9_`GbU5Ko}gj76{zBR|n* z%2i|hl@wLvVYbS13wV3Ns}9V&$X?u{#(_D%LxN`xX%xG@OANM*f!8r;#k2E|{`x)t z+(xRQa`9h0!zHTi`(jl#sC#bSq}h&Kwbni3)|M81bZVOtgqYwsJEg*&+Gf4M;OObO zDepG4*pwoRgjU)NqI$8MEnkwizZO(Mi;8*t5|fWaQvg*3&(hgNMt%RDEj}8ia#2wu zvJe$Ow}7z?w6Iy)aqNBOJ%)Kh<rM^VP|!Dj`4@YtU~(NF$&x*rdo)aFWxkF&mDhD8O=B(v$<`tX#W1iuZkxB}fO8 zd1hWNP@6I3AK=|F8Xdbw0)`YHtY0@ZCD0^SbCC!*_N9%Ws$71Sjr0Svq{bu=PnWQX%V|+{a6hnX2T>nQO<0isPI^Dj z+gu@+X4L+cn+3%{f;{9boig39nTK#|cdl#9xFjx)qinMI)k0YW_}~AO5sWl>@hTX4 zNJk%#AsdfXKhwn7^uC8yK09{w=ux8*+r_lI z#FZ?-kZlKO8BMHvyZ$B~l|$qxV}pi^{Kj1%_QL!qE~sI>lzO}brh|jTy!VB_Y_LDS zY#>Tf&Y>C-J*5_R?1DPM=wI05H#${Hrvp?z79}w(^E{uOzU%Xw*ih!HheYQx`-jBu zInF2p4TGNe-@I0Y3?{6)$*#W8Krf-^y3u1>28o~|huBxP_=f}JuL#JShbff8{?vKcoF%kQH3N584_H&VpIMT3N{|IRMP^`eh`TH_QW6#rmk!en1kW6q zlajZ_v`^-e!vgPwjFbrRRC>r&of*qfQU!Y?NtKQ~lDOGQ0>1-R6Kw>pq^#(-f00^M7v~aysglwU) z3~b1?R=pLL-45y1+Es0^&eE}sDb|n+T1pId!}7N=2DDK6K_DV7X6Uu5-YzbMNr&z2 z6A@gBWScoM_m6z(*roDDNX1LUa&j7rzGeg(#z1Y+48s`2t*w#TE&R3aQy{;Mb;AM< z;Yn=l*P*}ttzs1g#Qw#`v$nKEIGHxbPGLxwgLJUZB0XmMG*$p{&8E&+Z#|OdJ{)>( zsz5X{L-fEeT?*q1C74{2Lsd^(=!w4d!!!9wFp|>>(eX5XXSqLR=%FzhvJMfs5HIIa z!Yf_~i^Vli(qKHQfXUD_$mtC3iNT?#qrE~cf(%>Pj4>0Tv4Rp_jy*K=2eyizWn&hNg=8~Ic``(i_&1+W zN|!-czh!7Z>Mn;jGlnGS*_mln?%@l_%(G0?D;Sp9*hkxNu&6jJO^zcHEGpf<$0GQJ z&dH_6WUb<6dVy)_EWRwXh#6e+`ydxA7>Lq*{34uyRzMH^Z+gxLi#YbhmEMAGZ|n~@ z-P}HCA6|^w2k`I=dKybMj44O(%@Qo>$$*T|FrW}6Q6`A4GokUB`o-kbfJEU72nqTl zYE(@CJ{

p?QK*7IqgKA9@JOhT{;o`Zq5 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, "MSWIN4.1", 8); pFAT32BootSect->wBytsPerSec = (WORD) BytesPerSect; - ClusterSize = ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize)); + ClusterSize = (DWORD)ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize)); SectorsPerCluster = ClusterSize / BytesPerSect; pFAT32BootSect->bSecPerClus = (BYTE) SectorsPerCluster ; diff --git a/src/iso.c b/src/iso.c index 9a7083ed..1938cdd4 100644 --- a/src/iso.c +++ b/src/iso.c @@ -459,7 +459,7 @@ out: iso_blocking_status = -1; if (scan_only) { // Remove trailing spaces from the label - for (j=safe_strlen(iso_report.label)-1; ((j>=0)&&(isspace(iso_report.label[j]))); j--) + for (j=(int)safe_strlen(iso_report.label)-1; ((j>=0)&&(isspace(iso_report.label[j]))); j--) iso_report.label[j] = 0; // We use the fact that UDF_BLOCKSIZE and ISO_BLOCKSIZE are the same here iso_report.projected_size = total_blocks * ISO_BLOCKSIZE; diff --git a/src/rufus.rc b/src/rufus.rc index 2682ffdc..b0b55b1e 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 316 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.2.0.186" +CAPTION "Rufus v1.2.0.187" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,278,50,14 @@ -77,7 +77,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.2.0 (Build 186)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.2.0 (Build 187)",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 @@ -237,8 +237,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,0,186 - PRODUCTVERSION 1,2,0,186 + FILEVERSION 1,2,0,187 + PRODUCTVERSION 1,2,0,187 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -255,13 +255,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.2.0.186" + VALUE "FileVersion", "1.2.0.187" 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.2.0.186" + VALUE "ProductVersion", "1.2.0.187" END END BLOCK "VarFileInfo" diff --git a/src/syslinux/libinstaller/syslxint.h b/src/syslinux/libinstaller/syslxint.h index f6d9a4ef..5872c7db 100644 --- a/src/syslinux/libinstaller/syslxint.h +++ b/src/syslinux/libinstaller/syslxint.h @@ -23,6 +23,23 @@ # define X86_MEM 0 #endif +#ifdef __GNUC__ +# ifdef __MINGW32__ + /* gcc 4.7 miscompiles packed structures in MS-bitfield mode */ +# define GNUC_PACKED __attribute__((packed,gcc_struct)) +# else +# define GNUC_PACKED __attribute__((packed)) +# endif +# define PRAGMA_BEGIN_PACKED +# define PRAGMA_END_PACKED +#elif defined(_MSC_VER) +# define GNUC_PACKED +# define PRAGMA_BEGIN_PACKED __pragma(pack(push, 1)) +# define PRAGMA_END_PACKED __pragma(pack(pop)) +#else +# error "Need to define PACKED for this compiler" +#endif + /* * Access functions for littleendian numbers, possibly misaligned. */ @@ -187,11 +204,11 @@ struct ext_patch_area { }; /* Sector extent */ -#pragma pack(push, 1) +PRAGMA_BEGIN_PACKED struct syslinux_extent { uint64_t lba; uint16_t len; -}; +} GNUC_PACKED; /* FAT bootsector format, also used by other disk-based derivatives */ struct fat_boot_sector { @@ -219,7 +236,7 @@ struct fat_boot_sector { char VolumeLabel[11]; char FileSysType[8]; uint8_t Code[442]; - } bs16; + } GNUC_PACKED bs16; struct { uint32_t FATSz32; uint16_t ExtFlags; @@ -235,13 +252,13 @@ struct fat_boot_sector { char VolumeLabel[11]; char FileSysType[8]; uint8_t Code[414]; - } bs32; - }; + } GNUC_PACKED bs32; + } GNUC_PACKED; uint32_t bsMagic; uint16_t bsForwardPtr; uint16_t bsSignature; -}; +} GNUC_PACKED; /* NTFS bootsector format */ struct ntfs_boot_sector { @@ -274,8 +291,8 @@ struct ntfs_boot_sector { uint32_t bsMagic; uint16_t bsForwardPtr; uint16_t bsSignature; -}; -#pragma pack(pop) +} GNUC_PACKED; +PRAGMA_END_PACKED #define FAT_bsHead bsJump #define FAT_bsHeadLen offsetof(struct fat_boot_sector, bsBytesPerSec) diff --git a/src/syslinux/libinstaller/syslxmod.c b/src/syslinux/libinstaller/syslxmod.c index 08acb075..e2a66bc0 100644 --- a/src/syslinux/libinstaller/syslxmod.c +++ b/src/syslinux/libinstaller/syslxmod.c @@ -97,8 +97,6 @@ static inline void *ptr(void *img, uint16_t *offset_p) * Returns the number of modified bytes in ldlinux.sys if successful, * otherwise -1. */ -#define NADV 2 - int syslinux_patch(const sector_t *sectp, int nsectors, int stupid, int raid_mode, const char *subdir, const char *subvol)