From 53ca639b1765a18955f7659d047fb5f2d1550c64 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Tue, 20 Sep 2016 01:01:40 +0200 Subject: [PATCH] Adapt wingup new version 4.1 to distinguish between 32 and 64 bit for update --- PowerEditor/bin/updater/GUP.exe | Bin 154624 -> 155136 bytes PowerEditor/bin/updater/libcurl.dll | Bin 399360 -> 399360 bytes PowerEditor/src/NppCommands.cpp | 15 ++++++++++++--- PowerEditor/src/winmain.cpp | 10 +++++++--- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/PowerEditor/bin/updater/GUP.exe b/PowerEditor/bin/updater/GUP.exe index a0b70a201e9f385ba9afbdb71e0dbb7d397e669c..d0de5f8e4d6d3237fcdeecd635e7cedd984f4bcd 100755 GIT binary patch delta 24161 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 V#;z$qXRgD6bBCrjYa(};`+wpvLN5RS delta 23591 zcmeIadt6n;_dmS%a2FI*P((yTL{QXozu!PmypVVa@fs%T(NHnL(9A;tiXKUA&~08( zsjRFlRLs;+NvKTGtf;Iotv1Q0s4S_h^Lx)e2c^EB=llHrd;WQLuf&6+i9)~s1` z*~f}b1{56+sN`efF3p(Ad7fsD@PT{~$8G01?n^iG#tSrt&m_%*=qf&j+>D@SNDL_p zp=WuG=GHdIg+PwUdv|DY<7ke{9{y;~ocuW)SG5Mb!;mQg-bII#!F(jm#9tL%Ln6A} zi~zfca9kv?t@?SgfOqVj&vEvmsw7UlTETJC&Rw{0VG(Da?vu>DSu!%26CJF)nUx>8 zSMF!e4nlb@D}RWU+nz&tMW=E*E8oS+t*pF~mFM3p_vk-@^6_GSCcr%pfhipV_H6c= z+VOh9-ptxUZ{O~*tkAc(E~vCNKOjS_ zFQ9tg7;>P1&hlMCW*5*8d?U%+-{>vhh~A@r<2VQwJG{C4V5gtE!p(dd={Jyc{f#F1 zWs%MKbf;ewp}*3%{D$?;`PE%vja0$cU4hT1F27_F_$wXhA5Z9VSUj4HT~3er=Y@DJ zhcRu=)Vot%vP?1jHq``dCbM_bhJbpqbQ#^!Wgr>5j2`O}PokI6<}Q(hNKC&k@>oOO z^zANv>BzvfM4d<959~|Ic2hC%GD%%Z-wImHN7IC^eH=)%v(%%c8dr$N%AJQylF9gXHJ9?ged(j)t}D~$P|r_(04)x zkaI9SB$oH4UAqq@=NC~!cM}nJ)57i#bep?~<1*Q}w@(#U-J(~!FDEq%>6jja$rrIUB;dXkZXB8Q^hZcqw@LBYS(5>Y0`BJ-+_t1l3 zgTT8Owt}3Phjt@qcCP@kbsl}B*GnXP0qxy;1bKW9P3t|8Y|f!Od$*F$7trZ~`%B4?4y zj&W#@jv>J_Xykx9WWsD37Bi95?xpq^XE)6>DLu5Y^pO4;J>_d+bi~ zXD0O-WG7oP>C!(Jbb8zfvLll^YPt{JEq&$ldIs$#h$MG%GqDpF_T$M57YorJzfQA#YEjxd~gzoJ{I9 zB!Or$>2RRHOge2yLR|BMk~i(4zRBEF@rv~3|IqANXZ<<%Y=h6XSJHz+wvsa$)H<|) zjLo3OfIgf+hb0=w*$H%EVi8$6nchl_CQ~QVuEVC2vk%aP!@leOX}TxfHcehX>#q2p zi*(NL43eHstB1D}GJ}3KvKKu!LeVdKy4z*71wKWVhYCh-@GYs$*9RY~%@D(<(;l)} ze%AuAT!>TY3YoQMB}R!kxHi9U@afTB8RCO8XoGA}Py0Q7cQ?P^jA!J%ds^c0 z<}+sV3DrsRekCnbYlv$KJ*>{@-3yV`yt zuZ?*o>1*8u8$zw@#ARRNZf;5gorQT5@e1VvpCXM3c;L{kz z9%*QN1sV@XqoFCS!~WJtPH?8gCc16?kB9LDqB*#9_unp8i-V;K{zO|K9hSPE+zq6c zQ&*C?DRlg(c5*^RM~&V&%pW_6PD=$Q_(WGhP<`rMEDoG#SMi*)kwwat0-qBhv|Cy% zSrtQ7Y0*(xG3fmH*;r}ZVeVOLBy>EQKANVRk_g@BeL3-u0i8rMGQ}Y-jM%-Z$5Z}S z6ZR|rrwJPdFcXM<039`EAo*KC9~m=dKzlUDVa|DT&X1>-ui`h5t6o%i9omnaa=WOK*Z;y;oj2U-~;} zUiog>bAN)E>U_d~efe!r&P!#_{Q+FQjNiP0Pm&tC7+m%aY878Z>CijtkG8UMEE@Fs zxWS=kP~y>6bc)sF3MSCV@lgY1MW1SwFHok7w`xwvu<@&hy5`H8;+C z_vg?iG}Mm_4Tiq@k!<%&Rq5gU!!$j8ke>-wiT*aaGTljT4Wqsf3?QZ9G~s~+;y0d7 zc_1aCFeI7Vmo_DtyH*hNxep^sYghVS^C=3UZ#;0?KMygHAtnr?g%gkw6X}i#>wC3o}`A;g_DMo83}aTqzR-;0{w2%h;Fw1NnFl8SjA;L*&0G) zC&xHWVoo>GC|QdUYg}ar&t9pUjfT^!8P_GC|$(4!c4Cxp$@ZI zsv{YCWw2C7S=;hu7mk})UVaUA*PBxuaPs-oyS!M7a|+m3|8lwTPQ(yQ<#H+h@#-a> zsdu^TjcDZ_&s$vl9(d#L@x(7qvfV-o6r+ky$>+f(0mwDQr%cQeXL&r(a^G?ZFXBYk zPpqS6tTzRL`cfSVgSXa})&^J9mbm}qClsHuf$hqVUWCypFJ%g(15k!|qbD3(YNOj9 zG&^2{rOZZWX(F1gFJ&Rfw#x1dcpy&dxZCV{Nra7GeW?t>Zc62$#0THP?7Z)S`Q4Zc zn4_Sc7yY_&T+0&J;I^g^o_f<4p-Tf?0f7KPL&xr0B61wT%4aL;+36WG{$sM!_gwtOwJ(7g@Oc zAVd+fRGj>a%T>Z$`FBH1X(McO$5ok!X2I>54h_jR_ z$MBb4rPi!?2kSwGy*r{Z)AeC-ovgmJ5**gg^3u(yTwl5i@2t1wSUsy|D+~mn!v0+1Z)fBXb=_*hB8i%(_4SO* zeb3+bxyReAmJ|~rrWjlBUBRV8{n?nZpv0K6QDkE(jb?fI6c&IdkVr5f0Y#?{;+1m* zmwty)^dzg`(o(!gQ^g()H;JzVvJq#Ebj*vP*ciAY3tGB}t1)q~?+dZdM0WFpXc=yC zicf7sn7{@$519=NcLbXh$;_Qs|3-pE$V}|WiyjTVp}}o08u1nFm<66ru|Bizh`+%O zDG^Ic+W$HYy~M|kU}u$%#N+OojCJipC@n8_xXpR$5V~AmdK`bHdGY2HcKOo}Ay<4VA51tW`>zRZ?_@I} zE@P3jK*-$F-&K&(;l*-~7bVeb+ zkVYvS`6$$N^axn4qlfW#YNjhph1NV~Kf+uhg^A?$lZd7Aa>?5hr4r_9lz53hzwwVu ztds=rW#X&8te&)Vi+xZLtJ)AROj+qad)sWAM7YA@4<~WAW4Yvt$tYpV~=j9bGp2$>D5i7l$FjFr5-Rl8&^fGW{%fWJtMVs_R3RJE9+o>8->1 z?U}jGer#J&&;y%|P&)0Q0gi0gB7Vb0;vds@F77$+P2aBK5hO%u`Zh|zdljvSwSLUV z|GVjXZ}xuZnYoiunYj}4T1=B@7Nw$DB3S~GBI{`%CM8AIK&j+jWYxX)kI3?o1n))G z^9UpN)=RvFt`#@9oawi7)??+zRoO$cXE@Val^=-b(8satkQ2f=r6I@^Q?=~cWv{d| z^S{4!EH9U)M-k>ER+^IMr2Wvnx#^jj^n>hh$73ie$9$C%q2#7Cn1*zM{&aI*uop6S z&tum9V;6A)+19;(gj}$wk{Uv;@Rzb>3UiGO9dWN_>=i*QY5xpv=`;v%CyRprha`$o z@a~*LnWEx$zXFGNMDm}c@kNQ0X2>3ilm>=M5(24@#38H8lIKIxPTJ^qG|J5u3?Y!_7U zVeu))f0=HJeC%cLx^yw0Vc!Unts;?9I%C}|ZjTOL*8>xHbWp=UfRms z-LdfedwFqS;N06RY2yn2|1Vp;e{X6>x-0)*ZEAo0r(1oIAv$epUqE29vjW-=34Y4O z(#g@2%(2(|NcOd~f>m@%Iujwnx)=0C_bOQT%Gr@v)DFWgwxf?u>B!{Xcds2J)%S=^ zPUN`b1xsw)xt7iM6&8d-Srv2fafipdEXj0MV{@xH-sKV0#RYZo={8u*&Naubfe?*u zGwatfHrqbduWiL&_MBhKB)HgFZPgqT4@i-s9p_?1 zULs#^Vb=Icthed%#Y_2B^v2?0;gYJc-FbEa${zQ{ao&C!zhsqcDux2{VSQ>V4jOWC zLI`enQvJ)*1HrMapVyXw=p!N0SaY%T^ZdZc6LAf> zi75&yUK1MfXcw18+)52grwwOkIcEdg!@isE>pa7*gv4pV9#e`}hK6K1mxVk^oB`N{ zeb7YDEFDgEH_@M#4k9n^r{Q_!;w7w+n0Bz5UBR?FXuNKC|j>0skUsu!- zOruwW;?9rGWt(79zKM}YNo48@J zHw;2fNWGRJHX$R}L%X5Y`{L)7E*H|l$nvUK4o76JxG;pz@8K?O5To|fyhr0xru>R# zBHb0r+!Z3&?UN)dcb7DX7hwP*<9m18u@INq9_4PECN2-}W9nc={llOh!)X7)-XXc- z`P*nH!`;w{{dC>(*q&@K#7&H!?dBKnr>B<>aWJ2YlfZXA5HjY@r}jLQ_I>xx<$)K) zlU2+Uh_-(ALU1RGB#1}A`Qz%MG!2WCdn9;NEKhA4Q=iH_&fWPm!(H8e5_QCb(81EA zGqr8KG-4j<4l&0?djpeuva=i;&wt5Xv|nXn(>sf?!S-0)j6#pqer}PVjPgxvxW&hC zP2il>YQGH;43u5+ZobBu7m6+X2>NY)&p6h*OtE+1z231~El+INZNXB#n0>T=!LR@p zg5nQ9yIl0EmAxGH)u=gHtm@*aSrAwzMQ6)?EG+KvD}sbHexG0^yB|C655XI&ohi=m zT${yX3r;eg+8i2}YCrpr+U2Nye7X;+mv3SgWr*Y4CiV4qr)j>s(k}NK) z?qR9+?{Kc~`O#DOTYca*n*Z2<0ME>;+(Y*~7B{32cQ@OJsYO1iADxS#bBWy#!WbJf=8{;tgBcTC!h+F0p79#QWjkosm62NZCce58u4j8Q zv1LCKnZlTQsZxHDbhPs15>|k^Yj(0+5`P5uCia<(bx{+{=qX&jgG7wvNwlBJ}lO9@S>rsnwmW(Pd zuVd_@o%HWjwr)$no?Kp@#k#xy89M&)v>sW4$0Uzr(+>Ll<2G`BClwzbKyGZIfveLZ zp52DnPTweAJ|G#u+~rJds88K!qKj82cxR%RUXBi>udWU!X;rjgwR&I<^T;X`AlxF$ z+1zwz%qezO0+*Z?X!H{U_{VAT6S}yw+oi$pCao!O&i)pc>()`HEfhKR9-$_ybYC~BqPb&LY-(CM=z=I8YY@Dn4PCa(~TtV2G z7E=7RSMl%uj}H0eIalmfR=U|)e}a`3w|GAqRNU<4)!>RPy|x?GV#}LYIq*z|Tfqwl zVcJ9gpo2-n9y+ihmZ32fk%O2f9LnDYIs~W!>;hB(HUdfjtM||i6=|VN(&=KFn*pr= zZZG||BFB_d$qMd#iuOW5LR*Jrzq>6P$}F?*l`Lbzn+rkj0@UrLYq$0%IhFK+9 z-YOf!B%mW4C>jtCkO6c68z2oZqmssLOAB>3oDaroz(zo2W%X0r!U?JEPj_vfN}Bsu z|GK?9&-+*V?N~_o`08c5e0Y);O$&FI5qmTxdv24sW7X|@vV2M4o7Iz^dp97;^tz2p zdCkTZ0^SGoIc($N0C|8nUa!`_R_IN*)7910w|P<)UH#(GfxhHmboIrzYP?9>yVdL7 z4&%wT_voJ5349U#p>`B$h^Cq|3;85kd1gAlk^Xr`!ROK8XLk`XnqD}&fPaOm&Mn|? z(Ou`1{6*S$ZV&HIm)30}U(coc&Lq%;cVzsq>gn&K`IEvgtE)bU^5QR6pKE-_YxuTL zY@7&4ZnAO90apQ2KZT`$4*^F3VV~K!E`YB-rN^#*%3r6OKkCQ7O<(=U!9QO;{NqR- zP8s*flZ1EB4?cB~v;p+uXI1!MSe^fQpf`Vk7Ja25Wdo{@e|3TI7>+g^QE!6n+ z`g!vfaNOr#&pLP9F(!$t_fc7sxkn}?aR+1|>V0(hdl#?uJ|<9^lNn_L^*N{mDUwJU z{#HtL$Ab!$L^43Fma0twwO}$$xUr2i4WMUkEG6v&sN&{4GA0FX38k;xRP$Bz#?2AD zllJ^(h$?#&wv4>9O`Hm1+BD<&{K%=|I7Z_Fsuq`CnABZxEd&Z5!HM#>sp1QC**7_S zc=gBMRPy{``q+1R9B^L$?or;WI#yil%j@VfKg{HRra%4=!B@~OKR&<@r_+8MK(b=! z>K_-9KXuahgtW={QPoLpVF9EtraJ3)J0We+^z5I1lI=0oZ{L01JF_e(>3^BZtn|N5 z(k`X`O^LS-6TF;K!|EBeMUWtck-pjU?yM+U_2lN zU_upV#pp05>U1&fm4HKlT9kZOG1na1jg?6A`D#~5-+!CW@hE~>On9>n^h`iW*Ce`b zYm^t5^x)RPB(|Hd#fz84F(H`M1d(Qd2xtSe12`1<1Nx%M;BBKr-HofjF#*N{vb)tJ zd-G<0ay+Ky$sqm`A%BP0ObX_+eE1&1%b~n!@JDLtc*Ay^_zfIqe<>ZyKqNl%+olz_ zn^vgZj6k7V7~h}w7KStAB|H$u_u^Y?=7sTV_`!L-lexFqpId=W_DeY8YAinQZM^g7 zPY=yLmpS!xAuBKJUDKsEU+zPiVuWWS`M>V|PciH_h+o*{!lGEaZXoPc3M&WkYCc_f zZ4f^?D0>4IJ+2peBMucv9G@O^_#>=VpXdAIFqSLKh~szjI^p*?ei;8=&EUak$hU}T zsTEq|`B?s#&^>|g%}*8*5_qj;GnAdfH~B?f#CIB9u4(5Mh1;{3v;qbA4!^$OX7Rjh z+@e6S?h=YIQ~UzYw=BWN9jpXlPXa%V|3dgaf$zuX3;sj+6#k}=K7`lv2ZVJ)_@{!t zD`WZ#ZbCXz2ph^jI{Z=zGaq-hoVXceaWuOml$VbkeM_b>ka?}9LKg}X%DFB~1p zYeKc2*SYuW4i{WQ`DH=h7T?qMLe1(#ezy<*O-+P?U*^Lvui2>Oy@;cE9t?Mm3NiW= zCMR?Gei`CLHz(BSv)aQs>E?tReTqDsm)x94qfd#4v)#>!Hu{u#IBVUUSfkHI4=3Nv z(HVUzJ)DQ9yICfqPnCz2;pW(kJ_kJbu8?quxJ1IC;(Q5*i?bQlh*PE4XmNssW5v-Dju)*GP878gmWd-ItP%%HI8y8{ zVV&4p!X_~oxVX;da;&h4-V!fGygQefk|y4k@OZIR!WrUC2~QEPNjOWqD&d*p1qo-1 zbrQ}IPfFM>9+7aacu2x|VwHsR#a$9E6e}dWTHFZiU`8A(V&S=lv5!e--sKWm#<+Hg z+{nmT61ka?lO(c&k)tJYJ0ndJxr>oE}$xPsj@b#G6ZTncwSHNcrf%vM6K2W1->|#))}oy-wUC zY_jnyd8H7L#Q(xSB>a`cPv!lD2b1}+e6CQL%qQ}jgb$MWbbgM|cO=ZS2o{F=3UfyC zvwHrTf@Wv=V;%A>ejuy0M{63O@oF6R|r0_ZXS>dx3et=KX zEZhtWPe$=!LRc!_C-!6vTd`q&L5LXn2!0|X6K~CAN2^=;_~8+bxLrgaVNxnqnrniP z%8$TWSD(s9_q&h`p#uE8*VBHeIBOB>?2Pr{Sg5>5@z3&0ggvA9QHj0-?zb?1AzBC* z)iY4}+^yV9cM~Dv18#mlA!IbK;S+_?qtSh*kUyH2k4TN~sNYk3&Mwu@pU&#Hu+IY? z6+Oib?xJbJ)zQ2H9`sA&AMxI(cDaN(WB9%S_y+(%Y}6uz9cldDi0`n5JJW-lsqO1| z{EU8mlJ~9dxIxGeX9|(A(UY3;OvpQOSk zgjdJ#3k=)lyIi)6a&Jo}egHC>MQ+IKhi0A2v~!#nHYS*n%HJ|YYk$_2AS~+ydl~kK zKL``X^09$8u-q)_H5=Z4O;|G)3;JH+_*gzJu<#x~MQ9nz58+1&q2u`3fj5z}-SUTp zC&uxM{c{;3=GI!_mvOv<)D9H#$MYIeIZ!w>o*zks%$lFZ^UgqCRr5p^Kh~Fjp{8Lr zujP54W7)ju#gC|Inae*Bz-wz3Eardjj^ncMu!Bz|?E{6)z^Hc0fh`m1;}l|^;wMD> zz7ZSK^q}>;vewpe7{gFJuK_t z%7=GtTH(L=!&?dZ&8bND3 zI#ewm6bkYRJ~T3o6>pJrFdMetm)Kn>%z*@19WFdp!N-xq;lkbuemJ>?4Qd4+*44j5 z)YS4sf$$Sk=HCa(F8|03V#=DH@HA&?NiPrvY~@1-o0!BtNdn>BVrLQ^Cbz=mmqeJH z*GHJSmG4V_%@meS}?G`EbW^d;~2|Z)!O#;hQZ7J-8D1o|Xn^iD6nASW~xg zhb6hVJY8%ll;p*hJP)>eaCYbVH&OrV?@&J|0`=J)SV#Tv7F}mS5rQX}V1_Vm8{a3= zzjGn$%LZ1snrWFSWNhO@sbSn|r_LXyCTI!t}h%#;6dheB=3_5#*YZOdj4E(3PAbi_IKFm$Y9 zI`UYh@lqvE7&7GkFx)Z^zj<_j+idCb0VCN@9$F?`WF-5}+;Y3{9@*lMX!a$#Ww=!D zDkBFSmUOSnX`FV`)LB^8nYk+|@itL4rmrj30GZfTWBN#Oc@@?(i)AIn?bmq_-> zwB@OGsbl!Kh3U1S87y>e?>AtMZ3nd#)bYctn+sY!1Bo8~!{?7Ok?oNXNfC~3=OZ0i z(0=Zo2peTR6N&8yk-$z`n6I1|%_eECi})3EOFvWvtN2WAOAj~sMd zqq~KNcJN`^kRaq7pg2lz+CSEe{lxVeK*iLAnlo&9S;R&od83~!PoZV4$nA(6r)*uNKKC4xs{ zge2hiqF>Z{x#FS;3tIXO}&yi*<{=}m%AYwbS?Vaef9{2e(Hzje~@!oYalM}}N!vA4t z2!+YLac!(Xvkb=BxW-VtD{b60lodtbU1#H>^)}8n)?Jnj`fyKS&22v7VHK0<1=EHD zWcWHT-o|YQuM#>sy2LP!LtI`L-0uQP0NVja02crvz&|jViv{Qa82~$=2(T+q_~SNT zUvuSGelai9-{BR)-8+0`)J^o`aO6MRV0N>%+CqgB?R-R(9d@+A{h>ylw>XlZtHm1 z=c7oxCjzcX=4`!4qPChyNX&SM&it2XF5Xw)6BVL(5;eTD3{#tndWSmIW4%3z_XYrZ zy9jkOoy(;ADkO~J+k`@LK(z9zU6gU5a)i0}4TdZak^i@LS8ZZ&&K(9CSWC&+?(i`{3`v~bf zuL$LbP_M&=yB#Wl|NWeVp7u^YVf|4-ZZ+z6?nmc(8Ssg>Fu;rS6>_~uNC4|&HtL)d zaJ=aq)>$2^b{EBI!joR4=P+hj=ZE!TJnZjySnHc1!>SM|l>4Op%aA%0-**{r5_oUY zQ*wPrcRQ335HewyH|g7_^9VBE=U~dT-Se~1`o9D^^=K$hv-p&o&!*i1Xj{{x?+yM04%X2!w zBY;`}SIOghC(mU8wgcV=v;&m;@LMy0Z9mWD0bT^e9pJeofCGRoRXmplm|Mkf84xB! z`x1Yzs@}~Xgf4$Sm3MV0O%o2MwvQ^cCS>Q)D@ZuVf&Bg(4hOQJ%EAMp<8u%}Yubaqe3cjWPrum$nxN9k0=xC0WlFrE7sms z;LZ=@F$e~92e8%(amHf0HhXk{CCTi>J1c)4m^J;n2cO)RJV z7oK+!n0+bw#e@F_#y{oY0`@0yLBOFN+#k3b-iH8pJRu;|o_DqgvcqJ;66{kt1b|m9 z>1mT3!bbcgtY=nU6XtXwJ%vVp;v=jKBtu7f<80LNF!NcrL&39kFo9!M{!{Zeg>J=6 zHm#pD-E5e8LS6vz4rIP%-ORsVU~Tl6+62rh-2i6R`~b`vy$j5&>~bJUa#=WV$51xj z(-RO0HhZ#wnVPvCF{Ua==pKYMqsW)|gnGobdy1JgHmP`95b-g2N*g@*Ll6GagIhfK zwgEg3}x`q!#$lpk(QP7sIwd>|t@kFdJ4sx4f{o zE9pZ9ZV*m%B~irT6h32k8!MJf^Sf~V{tNl~ zeaTM0q7OPTlPo5TldS-5Ynex?f15OZC?0ZSQ0`ag8#U6pBK>T zHr+4uhfXTq^Sm$>B(P2Dv7hbtP7?8d+;3#?4KMe2babZfU!AM-lgb6C3k%%YD~YQC z;BoghZ1DY3zkv88E;2qz*x8Nr8#rmmKlPscm)=ihNy1xQNxxv1$}Py0%2i3Mp+0_@ z%KLf)Yci9#w*ahFW`=JuUe;v_J9?0agwM*{)kAQUVUK@ovNSisfv*j8#}wly3j2DH zo(XUNOFYFRKILEH<0WygU(1rDj%sUny49BgZvu3<>+rw2wS0?Pt{x|*%bTU%gav-L zJ&C&oz$0~_*GZhK-T~Mc%kxA(BfQs>#Dv|2C2ZnIvlA17M|mVJ`^eCk{X3Gl=K<^? zXn;K>5MiR5fe#H59tb57v5?E}BzFQlf5`3XBzGi%aI)9=P_C>Kvk}b5*V%^S|G&xj|Mn)M z=EYuQsvqu@YL7(`S#VtBe9YVbSE$JxMqcvLAHfluEzfa)lc3r9V*=E9Xbb2IpxM$L z1Gws;2MZJBWVNtZPQq(Gkdta3tl_LKo|^SqQq1$Rnyz}%li>jdqV2-(7N(_;osRw1 zSFI!<4<(HH8U)UVfntN&5&X9zJ2FenUj3=ZQP#_L9%smV0R zJj5(B>&!FFkCn-V)Jj+^((?TsTTi#{H=W*O>pm^C4*;(ZUZ0mB^;Pwk z>g}4{TAMCYXV-E1QHCtTM}}U;c;hT%rSY5}OS(;ZWgIl`SWa2KwRl;lSs%Bqw+hxbt@YNASmQ-*&-ub{>9RuE zHrXq(w`A|izLMRR5qYG1hY@Pn)1!t}WAEfJ1xh zVs$fg3w6tNYjs2PoArYJO?|C?qTy3Rvw;``jGK+!ObgMinb%|pbyhW=?Cf)^hykFx_*{^ zv3`aAMg42~qx!e>XY}>@i~5iB*Yr2^-|K&J=-c(2!5?GZ*AQ)pGsp}EL%Ly-VToa* z;Z;MO!QZ&fSZ(~=*kasjt~OsVe`x;P+-$yS7R}u)TFZl$nU-uzj>T@tMMUIV3N2?X z4VDX*M$1);!J2B#wl1*dTJx;=)~(jJtv^}Yt#_?lC3Z~cFemet`O6$Zi1$$0Y*~)X zF3UyKZ&2J&1Smt58s&QBN6OEXUtut;s!^&3RHs$vR2NiDsxMU8nwy$d&0m^s+WFcx zZFgOyE=H%)SrFNqbQQWiy6d`ReZGE`exv?n{d@ZB`Zm4Npf}7gEH)fBTr?auwi*94 z@}_k26!TGsIoq8lE*|7#A5IGp@y0?>D|~JZ^l~_=)jrF)KQw@nrWIxG!D&1%@%lMv2L&KwC)R?Twj3cywUKc z;eEqRLtkU8afY$LxYKAf%{Nt)j%-5r+MmaUf8EPq&Dw_dh#jqctH zvO}^@5s*GeJsSBm`C|EI`Lpr^FyRYKo*jw%C*W$deqx?+kVSMj)_RPl^rm*SAZrI0JfD^IFE zR0XP|)x*_Vc%?<%LzAdcX{?$|O&(?q)$G$euQ{r@fk;W!KCXRQ8>O41TdAwlJ+F^5 zOg1YnD_=GV-P=8w$LmZ_G-$cbI8W35xH%dPKNFCjs-Sbt@m z!yM1WUT2={J=s{fUh%HtL&c|x7KP&{#T|vOGDO)+IY>D|sYVi-rp#BaQf^f~r+gLp z{i5=^@;l{!;NZWMMCGpvQH81css^g!Rl`*pl~I+X8iTnpMKx13N3}q;RF$t67@#)7PX+>tFBVNq<%wPqduj6NBy3zV{Hpp(<*N=>%hd(y zC)AtOJJpry!%uP@Z|y*>UOQ4dMmt6On07VRh;r>A zZ4X_z&Wx~Ig5-1&X*yCb*Du%aL_&VhxZLR2Xr!2#mBuRLK`e-OjA5ooQ?x186mLp2 z$xJGf&h(V2%(T(8*;HZr!{lR*HV-x@Vlh^k@jte~Vtm|u(p+n7iS&m)6R?F*_ zn5CJZm8q=^w0IG|yGQh%T}ovfkL-%$6;Zv7y-{bDWl) zmwkvl_lvAu)>}SKz6>k%W~7?KSgk`9TE(l1vzR7{O0BXt7UT%b^*D6{0&ShseG82-GK4RP~&yMm1iyUe`q*sh@2*iUHs5uQcCizK6fm*cFb}uF-CDXvgU$>SpQQ)J5wX^d`ffhP%cfQ$N!nliD=O zB$y7GPMY3FuIp-!#2)Y|^EPw6*=D(G(OAbYgR^n13lt@5kR{7c$v>7)Rum{plrJcc zD^Dxm!}8sXdG(vpR~4k{flX>OwyA7}8C1!tajHqG=_sSXR^6~g2{0?o+2*z8HxThZn?qmh8J9L%0OW02N=#%vs*d4FYm+24bkLl~MnFxZ1+KeHlIi{7SHKtbcU*?CbcbEa2 z-3EBe!enaMpK`rwnq~pA-MgBFx;whDdOu^Hc?Z^rKg?>&JnT14AutDFop5ZhUcr`# zXPa2Ahs=P9@sjKdSr>V#e3kqm#Z!v66gp**@~AQa&MLs_zge|gbxKu_ko#8EhV;}= zJs9a}lsZE_3n^+HlJxUPQKyiUzf=E&Kn&6J)0j1*H4`=Su_ivD*^O{~U2|4*UULPr z=W8#`x0;&S6UoQE3ps-~HiALe3WgfO4UyOm#v0-ciP#dV3_63!U^Ao`(hTDb8HOp? z#?Lfl8*&VGL#}}f!FO()rt1&{jWQAQ_^vEO9x9K;sU=aal8=|qlxNHH?cL6hIdt*Iz%0+PE^a(DzyoVU3m`mUPOcw>@BYjm14&3GIRvNbuHTuljgoAY-^uXG}5X7;}w<#_d>84q`7_ zYrJV}HQqIPn}STCSXg4QsHjXPQ;KQ4@X%!9=g7y|s{|`cB_?{Si8F^_eMvNrH)oj( zaabusy5DZD#G&N~R+ekn_P1fag=2+Dv5dD&!R9{)8~=Q4>MAVu1QHUvnKyi$Hh-XOm! zZ$rkFDKZcdn-zx@7Zi<%f*@>>WXcST`)Z8$5#*Pv$|j8VZH%@zvP+066eBKE=`h}D zs_{sUS*l!B8Kz5x>agm#>ZCN(w^i*be+)9)<*=dcRj4k)=x$V3s1IV+)M13LVvK91 M%pixz7McJ50a9X11jNih%(9)Ek(F~DNOHUQde)a209uI-bpQYW delta 48 wcmZqJAknZvVgm;wv+DWiW^TrIZblGh0%B$$X4%fo$jZ46B)MIDJ?qO106gOjB>(^b diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 5ef10400..a1227178 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -2618,12 +2618,21 @@ void Notepad_plus::command(int id) generic_string updaterFullPath = updaterDir; PathAppend(updaterFullPath, TEXT("gup.exe")); - generic_string param = TEXT("-verbose -v"); - param += VERSION_VALUE; - + generic_string param; if (id == IDM_CONFUPDATERPROXY) + { param = TEXT("-options"); + } + else + { + param = TEXT("-verbose -v"); + param += VERSION_VALUE; + if (NppParameters::getInstance()->isx64()) + { + param += TEXT(" -px64"); + } + } Process updater(updaterFullPath.c_str(), param.c_str(), updaterDir.c_str()); updater.run(); diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index c3150e52..95c8e665 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -418,8 +418,8 @@ DEVOMER*/ generic_string updaterFullPath = updaterDir + TEXT("gup.exe"); - generic_string version = TEXT("-v"); - version += VERSION_VALUE; + generic_string updaterParams = TEXT("-v"); + updaterParams += VERSION_VALUE; bool isUpExist = nppGui._doesExistUpdater = (::PathFileExists(updaterFullPath.c_str()) == TRUE); @@ -438,7 +438,11 @@ DEVOMER*/ bool isGtXP = ver > WV_XP; if (TheFirstOne && isUpExist && doUpdate && isGtXP) { - Process updater(updaterFullPath.c_str(), version.c_str(), updaterDir.c_str()); + if (pNppParameters->isx64()) + { + updaterParams += TEXT(" -px64"); + } + Process updater(updaterFullPath.c_str(), updaterParams.c_str(), updaterDir.c_str()); updater.run(); // Update next update date