From d14ecfffa6902a0880e5d5e8477a1f3211528e98 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sun, 16 Oct 2011 19:15:40 +0200 Subject: [PATCH] Fixed web-update tool. After the recent update of the Inetc plug-in, the updater was not working anymore. D'oh! --- etc/NSIS/setup.nsi | 13 +++++++++++++ res/tools/wupdate.exe | Bin 381659 -> 381673 bytes src/Config.h | 4 ++-- src/Thread_Initialization.cpp | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index b8d2ad70..e63f1b0a 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -413,14 +413,27 @@ Section "!Install Files" Delete "$INSTDIR\Contributors.txt" Delete "$INSTDIR\FAQ.html" Delete "$INSTDIR\Howto.html" + Delete "$INSTDIR\LameEnc.sys" Delete "$INSTDIR\LameXP.exe" Delete "$INSTDIR\LameXP.exe.sig" Delete "$INSTDIR\License.txt" + Delete "$INSTDIR\Readme.htm" Delete "$INSTDIR\ReadMe.txt" + Delete "$INSTDIR\Settings.cfg" Delete "$INSTDIR\Translate.html" Delete "$INSTDIR\Uninstall.exe" !insertmacro GetExecutableName $R0 + + DeleteOldBinary: + ClearErrors + Delete "$INSTDIR\$R0" + + ${If} ${Errors} + MessageBox MB_TOPMOST|MB_ICONSTOP|MB_RETRYCANCEL 'Could not delete old "$R0" file. Is LameXP still running?' IDRETRY DeleteOldBinary + Abort "Could not delete old binary!" + ${EndIf} + File `/oname=$R0` `${LAMEXP_SOURCE_PATH}\LameXP.exe` File `${LAMEXP_SOURCE_PATH}\*.txt` File `${LAMEXP_SOURCE_PATH}\*.html` diff --git a/res/tools/wupdate.exe b/res/tools/wupdate.exe index 164aa9a5a651e932c87cc6658a011358d8e00639..1c04b6b490f44461b8714889da333892b2a0caf9 100644 GIT binary patch delta 2227 zcmV;k2u%0er5EX?7l4ETv;q_$2|jE90O_&=0DYGoAOaeHmTVG5bcZn*tvGmou6+rf z&2T{&aQ&iVRS{kvYMM+J)!M*`Q3X8_(LhJ2X=dgT`wm_QvUHnTh7Hdv1Z;4kl#7_A z5_!s<`-CqMs@hNT~yUD&up)B;d^ppZy&jeEa0{Bh%*r_dDMO=^S49YI$; z%cf>{sco8n?W?!(BBb*#5WM6r2vZgg>^(j@=3DoU@=X^Q;G#fCGM3l1HId6&#uWVu zdM5$i%?h{=o}xjH>gRY`1(?nplaF7p3I~6I*h9bf^I6CjIc2E$%a(k~&4}K%JOmON z<1mg`T_h<5M$s&xX4hhSlwY?$L4+&PtGO0|bvJ8&^GiU)(?nA>>;OB}GA$hWTudRK zq6ExCNdqmZSXsduo2Au75gaUy-E2ugMj085*7Q*PHE7J}`#8Y3OW!w*&Vs@kSu$)bY5FG`;GY0rgV5>Uup+(RTCm76#>0SBrBi_Vc>1N?m&2md+n7Q@!d&@b! z|0ozk9(9(zZMUxU^c?I+;FK0Mm|8;lyH&Y&Vuj;)T|=-$2^^n!MZlbRnhGdkD?HbK zK|Q#Y6}`HA#i%US$dm$*q#&1$sxJZ;pX?OmsGyT;3pGQe?9$%JoU!QP42_UsS&j_M z#afr5-+8A03ywysOb{SyD9847R0uOBV#Z320?pE5dGwsXY-IHzyNeGM+Exk~fzBH* zx}1G?4>E4avh4w6%8%Gdf=}pQ65c|8hV=8R6!}Q@O~RrZ{ZNndXciRChB(H1MRgg3HS{Ptym4|qb6;KIotXRcos3Ty zMrFC?u8kvibCZZ*Hc&H;ZEhkGGh!w~;~J7qd|t~oV0T7y73XyXP`<-a<7K7}GSRI*pWuI7S|pAe7{xCzG={v9iU z&@37+DU{zfuWT_{2(7D{LLFp(A${|aX0!~b;z?i;+2hxsR2bSgV@B*L?k~+dx39(1 zmwMIQv0Ve#wKA?Z3L3C|CK)=+tU)Fy7r)OP2#v3`2MysgVIPKmLuLG9T9qTOuppK~ zZpg8N{Cl>mAi`x`9v)}h7-TUntm@nf!1Q9{W!H+Bj`oRG|-6f9$ZBaN66Q=rrJ3N`)x z4-E2RD!D(ivuo2d5a--o85s_L0bQliCf5t#vbH%KP8qSx6Uk2^)*-s!TsmFPF5XbQ z)VG2$It#(YVZL*wKU}`$1Y9~GU(4E?)G#Py-OUs>uo!KVyaY_t=ZgR2a!$+?;|m8MlwI~J;9w*SlvnKOdS!8_JZD38F})l zqR+C4OF9i7G9M>m+c?mTSCL3AL*^)LKx&%lvHsquIggmD)8QnjP2)NzRpz7iL6iwy zjE-{@r)!R@&39B};Rjv8X~Z#3_Lr|!)SM2X5kXjy^X<%kmh*e4J;PfCiU!d;LEs-r z{I*LEi*Xws&hQGJG7>*mlfTsnTHm{sQzpP$5Jf+D%HrSOSN`Q1Dd!-#X4cNZXvWPd z^ld(SSYGx=z=c})hG2T~sY2A%y2{W6H{7%cqyc?{!|$^9!J0)Jok&oJW`}ffzaXi$ zyU*3h)(ESAd#I}fKlCECnqEufX-yfykw!HOkp7aeU{2s{pq~G^E|atq#(SLmA^f}T zqsb(q(;|WTfX++G#T&MctCn%=Zirq-vUm5w(foO9$Zx(@y1_^RrzhUlxph@OH*qNn zc~gGw{B>R~e-cqpY2Mc<8j1!?Q*nO0AQ3fQ<`y7-S`c%1dM>_DA2XbFMBmjv!Lo2R zm;H=0VP2S`9}Bb=LA-&kLmff5zYsx({{oFjw10!0V44pdc$S)~*Nw9|-ZoOc zOTkBfY42w^cYoy-mx$n>^m?#9dm?#B5ssynlcGlVW BL4E)L delta 2204 zcmV;N2xIr@r5D?!7l4ETv;q_$38rfR0Nb(y0B@HaAOaeHm5?1nzxC+wpEG7~a^Yk% z%rO!`XI+Dr_R6BWK1oZMjVHUeR$@hw_!?U|Npl%k2ihGfVY)tPtQV29Bim>Q}|EU=osQAu@OLZscyprtJ@go ze_H=9t6QziqGw{c27b@E9$>q?u{(0q8{C>Y^bN!0Rp*uN@vB_fr1Aan2XzOxEf168 zS;&%yEX9v=BdLc&_k>vN{hQhNMz{#LbWS3ld)&T%1=r-0t87SXE5YKGQAy)^d4oFu zjDI4kwKiaFAe#B9kbm69cx_-5u@TJUN;VzA-C3XNqRdYQiJ57ADc8$_QSxEWA+_^&RxL&eiwJ{B<1-^S)kv&=yc8=n-hKPnCYCLwl_ zz?t+vZ++my!47F{ouSo~%ZauXz%gJdY3Rd$jx>5y02L*Ap%jJb8Z>6bBjyxcK)l17 zf-b8~ElljnU~t)oHn^Ipj&JfcBIl+S;4_EF6tBxbNa-6Yol?#58102i{xpo%!!X1; zs023uyu7fkQQ!rSJHo&0Tmz~#5*}XD|0g{NE5W+SCl!;93&f!k8b72hFS66?B_VHr z-s7K`M^!Dy`|e1XwKue6&v&6Ib6j=3>LGc654dJkWXSFJzgXU?W6cK@DzEH+(14eB@G|ialXS$?8=pB!JN2~sMP2BtEctrG zUZ9-$wCm%`PiA}8*4(EK0l;kWcNPBtOh?92HXPNxw;O4>e@HRY#(jCadQeydQQEXH z!IKgYwevF+uvG}5vKSUYeEZ~=kg%u2?K!SBwq*LWP9qB~vS(zf;S|YI7G5KN(rBF= zCCRsOm4$kiN(Q$PZ+;|o6wbWz?#Y40fZv6<<|LZc@(utHoH5?gS>n;o_srR&838^& zkF5BMdVMfhy{_hz!Z)mGuParf%06IdUdbZh-y6xbMP`3@Wjqpz?W3_=JdpV>j<}%g)>IB~oor0VOSlhfeVXatnk~i(F2%YC( z#ByALfT09FXDoc5$Zy%7UusHW#HpTw&WBkM3CWwj;DjH$hN+$1-hF|8kU~%B9ccbX zG^s}zw+NJ9nJE8=oHTcgIRg3x7#|siu^8=U?AQj!1|i~E4KypbJ6cuW9{A2l)V<-N zNsLq^%M`%O_X<_%yL_0jH_+697B;@^7Tal?a8w_9~dgI6`E&U5%v zjWTagH>GUB;zSfm=J9=hdhJ@lK73f|b2xqIJ%esmnkEV~5pi?@K4-1_!44DActVYW zW{J2*||4^N5ncyFU&G^yI89Q5zddc0*u0t>n(04re{OV{vp5LhsGL=qS&;ImE#{p8BthJ%G0ybZHNjJ+z zE9*dI!nXbK<~W?z+Z0c8I|la!3s+v7CgB|Z8iW_4dl^_(>%`9a&9hv=WjZ0-y_X0$ z_bm>Z0-|M&lg&D>3>NbE8(UuT0ZI&uKZ}VaLnT_MK~M+X@4^Ull!jK#%Pm94NVEAc zwr)`Ufo1Q4)tlyjrTs_b#7AMdF3wfF?zO-IJFnSD_b@AgZ(9joiVBLP287K8lXr3? zI5)?yo!fU>Z&PVQ1z5B)Dp`Fh@yJZa?=|S$76umSsj(;2 zO9Ka{zhrjl)d->wGu>0YIS<>t&B{_O0!mBI6Vdx_{603+T46c8p+>=_$v(jAWNw5U4h z_93c=xR>CRWN2g+au~bZm*yF^t~FG12d6L~7g<_=FErTwwQQ(~#|1EAAK}$(Q`X)x zQg=?cC`drfbfAw_P#|Z~vz6$|Ms*T%9R`WEiQb4QQ`|TYG8BA5-vdu_N|XZfara}x zV+mfuq%ISEy8WyTT66|!Gh`7FQn8%=GZb9#xVLMS;DacRnn8V_!w{RzA&tPwYdU`da1muvD-xs$0vam69XXMG6dF$e zTMP~z`PYC}ZyJWc`{fiTMTwFCpXLEpUXQXYmULY3`qHW6mB8eifEjx>0dNz%EL>3$ e^+5>mhn*+_hn*+`hn*+{x1A^jNU8)M)L0@-k2vE1 diff --git a/src/Config.h b/src/Config.h index 62b29e69..2c387721 100644 --- a/src/Config.h +++ b/src/Config.h @@ -29,8 +29,8 @@ #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_TYPE Beta -#define VER_LAMEXP_PATCH 4 -#define VER_LAMEXP_BUILD 740 +#define VER_LAMEXP_PATCH 5 +#define VER_LAMEXP_BUILD 742 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index 11d3ebdf..ba4b6dd9 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -90,7 +90,7 @@ g_lamexp_tools[] = {"875871c942846f6ad163f9e4949bba2f4331bec678ca5aefe58c961b6825bd0d419a078b", CPU_TYPE_ALL_ALL, "valdec.exe", 31}, {"e657331e281840878a37eb4fb357cb79f33d528ddbd5f9b2e2f7d2194bed4720e1af8eaf", CPU_TYPE_ALL_ALL, "wget.exe", 1114}, {"8923cf65e181f8a99f28e9d1ea0d89ace02142241a7f76dae3d540ffd0790495af815644", CPU_TYPE_ALL_ALL, "wma2wav.exe", 20111001}, - {"aa7668d58559f0295cf088cbb6c184470d9b1b3da6028440c58b6edbca0940bf62501f5f", CPU_TYPE_ALL_ALL, "wupdate.exe", 20111014}, + {"bebc3eb0f7378a1f3d54fd75f1112d370f2f6a7fdd78067e6c40a96ce81a6841a1ad8283", CPU_TYPE_ALL_ALL, "wupdate.exe", 20111016}, {"6b053b37d47a9c8659ebf2de43ad19dcba17b9cd868b26974b9cc8c27b6167e8bf07a5a2", CPU_TYPE_ALL_ALL, "wvunpack.exe", 4601}, {NULL, NULL, NULL, NULL} };