From f0173e1d8e0c2cd4ad5a8707337512ebe413cf16 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 11 Jan 2003 19:23:49 +0000 Subject: [PATCH] Fixed problems with wsprintf limit of 1024 chars git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2057 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 4 +++- Plugins/InstallOptions.dll | Bin 12800 -> 12800 bytes 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 81a78781..1321c5cd 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -582,7 +582,9 @@ bool ReadSettings(void) { if (nResult) { // add an extra | character to the end to simplify the loop where we add the items. pFields[nIdx].pszListItems = (char*)MALLOC(nResult + 2); - wsprintf(pFields[nIdx].pszListItems, "%s|", szResult); + strcpy(pFields[nIdx].pszListItems, szResult); + pFields[nIdx].pszListItems[nResult] = '|'; + pFields[nIdx].pszListItems[nResult + 1] = '0'; } } pFields[nIdx].nMaxLength = GetPrivateProfileInt(szField, "MaxLen", 0, pszFilename); diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 476060cb2ea4c5fa3b483546b0c5fb98a9876672..87596734c357882cc3080b9a93fbf3bb8b3966a8 100644 GIT binary patch delta 4097 zcma)9eQ;A%7Jq5eG_6S!+C1 zplOM}sQZ=C0tm9c;ULTy{YY2CV_nmZhcpBs3r9g7Yp`1Y1F75sROJDXdF73TyiYuF z9bpz+GHcPT_02b ztcsj%0vEmaA%r%pA3_WcC%kA+17Rja_z@x|#kC+slD$;@St}gzaKRNJj3}XLgaYXt zDs@;-L?#XXw)R6Omcxp-;M1lY0kh%(OeP&*LU|SQ&!{|&`KK|zTjkxDe-!vk46@Jw zsY~)8?Igq=tb)cfP!h*4PKRya+cFhHnUR5UkLe`+lIx@0k6L1M^ zxI1Oqu@g-9YEy$}v_2*L1K7mr&Y}U+j!gi!QlY6M4R&+CmLT5z=qAE^5T`>1N#2?t z5y~8QJF?;ehzuLV7Vy)q^!$uatEl(FR@a*dA`r-&RIH)MlE6M9TXYt}6#X^_9Ee?@ z*4v?@6$(@fasvVJWvG&NMFJzRE(H29ZIQYzcO=qf(FA=m(Vdc3hTVjGRPt`07oP42 zI!uSwXd-7jqy>?)#nKg#vs%fxa;2obp($NFLKLKpBZM)nA0Z0Uxg$hJeL82Gx!xOQ ziC`*hBhc?e>Gz_rR}fM)g~dhsqns8{x4;Y9a`lBaih zj!zL_ZFaM*fE(1Pk)$&qD-Rh`S-C-H7}4f#xyUq>Y8=^esKn&}mEgu6(EH#I7YvwM zl2HK2F$)1A+OnZsqpX;X57Zrr=D5qStPt0^THvkmO@{IX8@~TVe3^hCK4|w$eDQsT z@(^AGj)=LAz-H-e2r4OKZd2mf#KHs|ar5cQroo45%Zk z4Ya#cYIcM9BMmyYCS48b0T-IwVYdYW%fW;+9qWK8HUu;QR9V{L4+-O?UhEnBe?_ukeGD#4Jcb#-k~zI`T6L>QG)k493XMU6|C~4AJK8k3V1J3zdS2w)R*hhGUf&2^Ra6 z<2r(X8Wf@9KJN!Qp$C8)GDRN&MkX-T15_lX<%W{@&`i-Sz(ZzC(R+bV>LKJPLt23?^XhGZ49C1oPMkvTgxsXU>d;PEE1`d(HSB>s=CHC5>cZ+8#9(pKjq-~-Zr&Kk9GJ3dqvU;jVYew%Gu!s-o{a|m`Ug; zfHJcYz8R@{ietTv6QEHVzj5BLD)2gF6+r_s89dYJK#VGa>%!|e$5ZpJE^Ps| zBms#s?brzCEHg{6WovUB&GX!fhjXm)lLW>)wJ7)&Tn|VZw4t%=1aF+oV0sihn!zeA zV#@zwc8pB|>|@B-<1HZ#8Rl%roEl)&Dh0Wb4ijHz|TaSvEzD{+U*OYs1Z3SfMwZTf-C z;Ox)s`?0yrJtofS;ITJx&$2=YH>y;G7~GlJx$pri;1*pcl_hXDUaC#mN_^;&ac(t? zv6bpPE5cd2IM6cnp_nJ}>y3t0N}fvMDWgn>(pZdNa>`dgMuy>(*~*I*xZ@8{Fqt;O zokI^QM?o!9;_6d6(@$FE#Y>3|%43%jo0Z6nc-=+Y(x6`1I3te?TYlLI_p7f@+-AxO zQ1UBwcsXQ_EfA3M4?GOhJzdPIm(hW3zy$LSgyW}57q?nq4YKyb(V(CO1>tKzK}Zok zWn|q8@^y#J1iTKl5n&YaO(gM{0$!g~YZ;!6NwpK8j*O5RM{3 zD+h*-*Jo}p5PWt z1~^-rqskF;>~<`0E_Kq*o1C{g?{wbd3^}``eZPBqzzANCQ<&l~Yv| zMe)>iR1>v|YNs|(cTkob@c7DL_a{wbRYdBy`O%OK1jbqkJG2=Pv|slW#%(W8H%ZARxmy$ wz}&|Cmf6YdV*biJ&Ga*`GQ-R`^D*-o^A$72mo&W#< delta 4061 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 glYb`r$#=+e