From c6b7e9f9a2082eacedef3fabe62c0edd93d4daf7 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 5 Jul 2003 16:55:54 +0000 Subject: [PATCH] LINK disabled until crashes under Windows 98 are resolved git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2692 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 14 +++++++++++++- Plugins/InstallOptions.dll | Bin 13824 -> 13312 bytes 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 6bf269bb..8d7ebb67 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -63,6 +63,9 @@ char *STRDUP(const char *c) #define FIELD_GROUPBOX (12) #define FIELD_LINK (13) +// settings +// crashes on windows 98 - #define IO_ENABLE_LINK + // general flags #define FLAG_RIGHT 0x00000001 @@ -529,7 +532,11 @@ bool ReadSettings(void) { { "ICON", FIELD_ICON }, { "BITMAP", FIELD_BITMAP }, { "GROUPBOX", FIELD_GROUPBOX }, +#ifdef IO_ENABLE_LINK { "LINK", FIELD_LINK }, +#else + { "LINK", FIELD_LABEL }, +#endif { NULL, 0 } }; // Control flags @@ -738,6 +745,7 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, return 0; } +#ifdef IO_ENABLE_LINK // pFields[nIdx].nParentIdx is used to store original windowproc int StaticLINKWindowProc(HWND hWin, UINT uMsg, LPARAM wParam, WPARAM lParam) { @@ -824,6 +832,7 @@ int StaticLINKWindowProc(HWND hWin, UINT uMsg, LPARAM wParam, WPARAM lParam) else return 0; } +#endif int nIdx; HWND childwnd; @@ -1154,9 +1163,12 @@ int createCfgDlg() nImageType, nImage ); - } else if (nType == FIELD_LINK){ + } +#ifdef IO_ENABLE_LINK + else if (nType == FIELD_LINK) { pFields[nIdx].nParentIdx = SetWindowLong(hwCtrl, GWL_WNDPROC, (long)StaticLINKWindowProc); } +#endif } } diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 1d454e5e456c5039a0a26cada3900d5ab8104217..822e0a2ce3d9d2a2faee0a53a608a1e20548ab1c 100644 GIT binary patch delta 2931 zcmd^Bi&IqB89!%%WkFz9VG$Q0pu9w|yX<`|W$#_YrBcPZb_LYn17AEu@Ud7rl7NB+ z3o3H3LXpBW0RPmL%sdo#UxJuh2ELpIp6tx zkMo`HJa!u@8_L@3bYPF>17rUM3K-4#Tg^ zY!;oQIpxRpXsrHb5PRaISvS=QnxM5&}n}17g{8 znoN^ek|vp^v7cy6VL7U+I+JQPt#gxRD{c4JSzKmf=xwY^@F$*N#gpK#81qzSRLq8$ z?eY#Nin35;T#C`jGW|=O15h-)ZX-K$&$v7~#rOc@`&z|#8~wKKnwXZ{fd(7#Oje9u zFp>so)kLaf9Jzl%sTpu9#(s9gKZ_19Q-FyMGCp7p&1Q!K;=}B4XsH?AnXAKW#cUuT zlP+Mv+9bM+S+wC}`k~&L`xv^FY_8S?*F)M_<1VUBp~J<*pm@UUigC!yMzqDWk1Y($ zN8Dq9SungAC{vEb>r80vx->B5xeVC!KFQjZ_1~C+Q+ny^*L76U_7`*KU77;Q=fqmYxs?#kTIl>Jn-K&pWj?df$YS zN9-)ta%BzbL}SC)-mrhsF7}#!HtlAY^a6dS-H^%VjGI*d3+(v?{{%xWG2BgteE8I> z#E{jiZwkerg{YDrq{eRltllF-m_y(6WgsEgBYo372;SMx6s4(K-}Da*++{k%aVvbc zT2EuET3fzZZ9_-EAi^O;_vp4fedb4qCv2X=9*rB9`V_9n;jt4r{1P&@s0mImcNM}s z6aiH~#n`}7!_y<{psSz?e-R;%^s6&nYvBjj+VFJR&klx9M*F_6y%jz;qyff9>J}k| z^g$*^OijE#8o3L8`X&R8^iF3&n(NycJkYlA>)5V{99qe)L`0R=fiQ zf{(`qIYeb4?{FqK!R5OuxUzS!45$pFs{9Jm{)OK>EzI6OwdcyPYNr?@pt5#n#*oFx z?KoDZ-__4t#z@1PxM_{gL-lX$h0qd{*15^Jn9>+F7}=#cX=d%?r_!11&*SAWcc^Np z)i+(IEHG-R=F&q}7A0z4f5;9;ndpyMS5zj|v#+COreDCFomZjYKsbw(YmLK-zUd68 z3KZFsF!Ap1AU8hu^8__M*XXygy%Pj_iuF%0>++E!mVJi#n{sgKXPRQe)vK%U*VTf* z*x-IvYf8agIc$2By4ZhA`AJUL_>NFZSm6#_?>yg9m-Je@mt^-gKA7k(C~V=6v+C$6 zfrC)Bq&KkNL>r@rR9QNTc1O&7?77>GYDT${z#(=yIxXo}(BO3#16IvyABLGeL(f~8 zF(*;MngDO?Ll!?V_LUBwF0TLqW7L!439cZcXGOW%!uPW!6WgaPxQlnmw-WChpZFOT z<<0Slw^dQ}iC$GqyUSu@5`P!~#&^dQkJjJ&jraRei1+SGBZK$Tmqt48hhFwt%=jdK zWa4x8JKtCvp{WT{*5xV2Hn4MRwky1PdA)63_Fl|dI)|mi7SSiHA$BqCU^ikX(YPb@ z70M22VPUB0=i}B)h`ae zB?6!Wp1p__#^J{RFauhkkR$bEH3Sc^9q0g#0;ho<;BUY^U>FENkgqVo=fEdw62MvD z7;pe+1@eIRh_}P zUaU|J@c`UyaD6Y?9;44?H@XTFaftIk6 zq$?~Zd0e(ybMoDPnq#Omo-Klx--l+5JAgyLTgf=LfHQ@VcQNh;J`mWh<*-HodM=jTJN;avAgZd?UnXs`w9D>>~Gu8*?aAOwSQ{AY5&r$*tL>gGDxR^BN8TyCnD_sD1EF8P9dS-vJ;mp_-kkhP9bM~cJj z;2lm!iDQ$a&e7uNaQxnJ+Ht`#;JE2{<$ zTrM|{Tf~)c_1rG*ICqLW$MteoxgqYK+&wOs*YhU+2RzS9{Ev7yzmQ+bm-5wo4ZoS+ z!tdq}@PFXD_z(Ci{NMRI{1-fKzMvICgh(M)m@G^Y%z_|D!VJMBED)9mtA(|~W?`Gq zDzq;Z4hTnulfv6VkMN-|B-|993PIv{F;TRN)5QXDk+??mi1p$d;%>1+JSd(K-xGVq ze({=kUDVigwy`#oZL%%ZCfa7%T(*U_<+gI$Cfg3%KHHnNzt{-rY_`^Fu=Cmf1&Hcn A9{>OV delta 3797 zcmd^C|65d58b5dVHp0LR$Or-&D4Lei9fp~E@4(DOn_01@936#J%oNB02^8-nwdha- z8I2@*$~ALKAI*n#+nzS6$8C*9F+!~twbIPWRUaM1%8JL>jmNv6J7CLC`w#4Wp3gn+ z`#JA9?|aVso-=nEJ&o0E1x(LYtKH}KO)9yVxc0x$txbmh*)`|dQnV3=GuIZQZM&Qj zZrhLO!|j5~GLJHbj65y}Ax5q#UWDUV_Pc>3HdY40?{4m=KJC z2qU5fGHJBxPG%a-QQbLx#4p(JQ%Fc*PF+QHZ5bguBSFChL5PIy*r22u$1UzDWO2t69XNJE@f`e#W7CIyFVr$h8JUOOaaYOr{P_oo&ly(Jq7PA>RiNe zMBT;|Quml<71h&oV~nb2^i&)B7Q=TOiRGB|8}REts__inOLQfnwp+5i$fGVKy3ola znyi_w+Mh&4&0VUulIUv9ql}ZD(ln?(Nu;j$42GwV#or0)#rT(#l^wOpT0+)oJoT7r zk*qJE_Jo<)Gtki-+@mbP8`Eu%=9&I9Y^{aQE}wb(H9f0G9kJ_dp~oX9@Cnc z%iDB>XMibdF>bgiK39G0`_4pSbSIug;{T9i7!N|sr7V8VHH$-_}sWk+-eyt><+ z#qw#{n_N8X151IV1SNY@hl=Gh%0j|(UjSzeE`NCGu`Vj;CY8N|OX8!*Y@GuuUI2N| zn@foVIjBJv+dxVuBtrGK}3x%4NVxE zX3@dG7!)Qb$7ydnTxg&F1!?-NBqMqPYm@!A813d`p#8VvwVQ$v0uvT?tQ@BhmJ80%M^U$IW@@ zClsYp3sSbdME=}AC~KR(1yzOpl(IAWdLjF7MM!!6TPo=u#dmWMlt;+G{tls%H!G`) zSE3H+m8)d+F=vZC(cVXkQ_Re>v^9lQPlE||r-^=;GMgDg)u|K54uXMCr@}7f;F275Pb5%u-1o?$*Qc6PB9|{jDS_DrMluDCgaTkPZO+Fnk4bVH%w&je! zir=vC5<>}L@dAd1BEsTjMI5}M7=#q@yDRkDv?-QuFyUj0OCvILaFnJA9T=tQLc2z3 z>d^C7s4YEZsv41mheve#>yuU9G4h%sS$`1hJnu8INy$!V{uTQB^v9SmmRs!_^56l2E01e;*lxLxlkZPa^cn&z23p=!#fC{({{Q~eA z&;ru7;&lZ06gUqw0K|k34D7#bO@aaMZM%m5gaH>n$tywAm z?|Df7A9?6llG(`kdWfT@+_j>zMk3@8vDd9wzYw3Uv+$!hr$V~7y0W51T2N6YktGat z_Y>>xt*x%DBTGkXv+KO;JcPuP*%hlQYewdBs@xdwty>4{zcJ3*73IUqEW)bXWpx!5 zH4AGoy%zHm5~p%Wb88eo^lVm!)~AdusjMllUGJ=|Sw(-$nn~G7=jp`BsdprxuNsE) zR#qutkpjh533)g$YMRW^hRMC9F^t<&QC;n*uPF0M6|;!D$l-Jvb92h8t4B)g_Md?5 zI79dZ}v3v#k$U7g{T=Pgplu+pI5J_gmkx9=7&azqDSpUbm`jV{B7w z_t<9J9ow0pm`@we879)-o)5OW*bkQJM#6oedI8Q7Q zmy6|MwYXl~AU-X&h%bmc#oaz}zxWsNpx7xM6_1N2#q;7t@v8WXcuORiSP)h?hSjra z>eRV$0Y{b`AR!yNPXOcd)Oq$Jt)?EA|rG$KGK7%|;v23|WQ(gWWLK z@Q}f4c+Svfc-7Euc;C=%_{wnEaMPg5J(qhix74`C=zGT4X54PvWo$S8)%c0=v@teM zm$xtPjl8e(F6Bw44JN;-#dN}S(sagj$#mT`WQs5+np4bq=6rLZ*=b&EUT&^1uQsnW zuQxZCo6K$Im(07(o#s!>SIs||hs-K2iA&)!x#`?o?m=!bSHnqM1J}%L<92YbaQnG8 zeB9gIdt8wFl>3sq#{J60@;W}1&*lxhz>BkFXLD89=?|M@(ujc{1*NX{2%$( z_}BUO_@n#@{v`h;e~ItsZ}NmVgqMT^LWj^PbPJyfr-gIE z&%(b1l_k!SY)QAwvSiM&xGak;D=n3l$1N?EEtVaYJ(hOMJC+{H8OzrelHXBes8{_5 D^d^<2