From a5257b1d2694d53bdbc305e5919826e033d1a111 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 14 Feb 2003 20:20:35 +0000
Subject: [PATCH] Push instead of writing to $0

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2158 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/NSISdl/ReadMe.txt |   9 ++++-----
 Contrib/NSISdl/nsisdl.cpp |   6 +++---
 Plugins/nsisdl.dll        | Bin 12800 -> 13312 bytes
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Contrib/NSISdl/ReadMe.txt b/Contrib/NSISdl/ReadMe.txt
index e9ef1199..2c886a6b 100644
--- a/Contrib/NSISdl/ReadMe.txt
+++ b/Contrib/NSISdl/ReadMe.txt
@@ -18,25 +18,24 @@
   3. This notice may not be removed or altered from any source distribution.
 
 
-
-
 This dll can be used from NSIS to download files via http.
 
 How to use (for another example, see waplugin.nsi in the nsis directory):
 
   You can also pass /TIMEOUT=### to set the timeout in milliseconds
-  Result is returned in $0
+  Result is pushed to the stack
 	"cancel" if cancelled
 	"success" if success
-        otherwise, an error string describing the error
+    otherwise, an error string describing the error
 
   NSISdl::download http://www.nullsoft.com/free/nsis/nsis198.exe poo.exe
 or
   NSISdl::download /TIMEOUT=30000 http://www.nullsoft.com/free/nsis/nsis198.exe poo.exe
 
 
-then, check $0 for errors:
+then, pop a value from the stack and for errors:
 
+  Pop $0
   StrCmp $0 "success" yay
     Abort "Error downloading file
   yay:
diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp
index 70c2f15a..718c4734 100644
--- a/Contrib/NSISdl/nsisdl.cpp
+++ b/Contrib/NSISdl/nsisdl.cpp
@@ -393,13 +393,13 @@ __declspec(dllexport) void download (HWND   parent,
     }
 
     if (g_cancelled) {
-      setuservariable(INST_0, "cancel");
+      pushstring("cancel");
       DeleteFile(filename);
     } else if (error == NULL) {
-      setuservariable(INST_0, "success");
+      pushstring("success");
     } else {
       DeleteFile(filename);
-      setuservariable(INST_0, error);
+      pushstring(error);
     }
     
     delete get;
diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll
index 7ad7ae43f950539471ff63b75673a6eaa9c30fe9..55470e7c5118011352df52699cb203fab67c2fd6 100644
GIT binary patch
delta 927
zcmYk5ZA?>F7{||Z>C0^`^-5X_jF(C(7*JMXK$o7|s0`%8T&id*s1Oo^4KZQHmSIMn
zODP*(w@99iu=zoo8C{GY(3|K7iK$A&H+)Gjk(Wd^b-7EY)4d3Wjk|MOlI<qXIluFN
z{?C)=<m4XSb2xZxCi}+^H+#wAH$$w;mw<r~XaAdCZXbtnZVjG?QgcZma|kS)_!E?a
z3$0u!lwmbnE3lc%v+@}%d6I>Wg<J0BZUc1T7Tr3im5=DM0j4mnui%#D<3oKJOyJ-8
z70`smhSGQY-yuW|^KE@~Wy(RueRZo^ns?s1#uLBvS~A2E-C6CNPwCcd)k+6;8KyIb
z^9YgVqN*C!D`&CQSf9D~f68{eXspjNq?DMtv}b^g6cLnp6!->fJXb4?siCTfMfnc*
z^ZVgje9F6E7J1W3xQUe}C!E2prW*6^971A=&~arSo-p;eZaGpD3~O7b5VfieYA3I3
zOdV~EElRZmH<=4KhXdQpoAYP035kwaJWmcer0eCQKIwgzEn_aA8K?2SIhc1~(Ga#o
zY*MYI{6@wfKJ{bXuQbV9mUI|FlCNehaFCP}_I~)Z(nQFp&NWy=gn()n+(d{a!olDd
ztwd1l>D<>l7@N{O)WG;3K2`Hf<JV~(()`cU{CF4Ri8KpZ?O2+5&2yD;K)KA;#>Qlu
zgby4?a<v|T@4GgzbU`X{h2KU5zarp)9Ji^7NzoD8FZFmX=PYn?Aon1^2lB(bd4LWa
z%WvU|baF*O7+?@j6-MAMEG{})n;Y!W`spDxs@6}n*R$It3p}%7W3Zbgla}Crx?h=O
z@7d`2Eo7C(lpkKG>UJfBZ;I}0jEaN}PD1a+@3PDIqY2*EzFxIESu?dtlcZN_$YuGm
zPUlnYHm1fkzeM^BDd=-IW5T%!E+M~sPX5S!3~-2ZUnm~YWw3t)M@v?4m8<2KC0`lg
zPdQTY4eS{9T=R^1#yyiB2d$)Q>3X`2Hqs9I3H^+IPEXR)^gK<_oAeQ#qDlISzNHS)
pC6<e8#e3qoI4RDEKa0PLzl(F?f~fPFy@EH}o9`|5%B}7J_!pi@Io1FG

delta 840
zcmYk4ZAep59LCSNd%K%!T}-E5o90+-=rE&_YUc)F*(d_da;?M=!iHbMa=pM-!nR0n
zNb#@e4Jxvr@`H7IgGg2mrJ~Xgy+DFu5+|fWij<0O=Wc%R!vCD#d7kIIT+V3^weLPT
zW=|S)YtZaBhHNES*oaWksb9yq1`e)r%is=nTRuBjLSR({<G2hv!N$3<2P#?Xg+@-a
z{pOf?g_WLFxpItqf$>VH)vv?`rBiRm_##|2lyk#{Fl;Er=i#qmF&4pTbT6qbL`V(u
z%^lUHbQR-{YVWSbozI`~s9v6ujfrF=yM?QvM2l6@C2+_%GA|+`B+tZDHEf_Q&}8z@
zbI(z7;epAYJy4)!66*Z;S$3qTKp%s^*V&q8<+c@3E8PLDd@ByZC*Fl00&n)<<FM4c
z2=9R{<|>OLAE89D?IQKUWpmusk(WL}MC%R+F`HVa9^fgL9_BE%(qDGiU~zEo?a*x5
zyzrqNp;*f58$FUI_m>UU$m?7=x|x6$yaaD7A#vGkAZ(51$m^|T1G*nI>OsDqib`$P
zUK8G=Jk9>c;oC|w_Y^+5+>Fqm-gT}D2>~@%s6av@84iVxHz9%MXS~zf8Cx^lTgMn>
zctYc!e0qMbmZus1(7<>k!-6(<D8sy#Nih!4KGp_<lg%;=<#iU^(X?xa)-roh+UVoA
zBB7oxfc^OuW|2v;RL+-8(35|Q-Fu+mFveD8Sp0+WK6tfo7dNU?${k_tF?1J2@qKU>
zpYV&JI9o43O<3D0q%ElC`q}SI7W<~drci{rlh!$UeSm&sHyRB3zPH)rSM>T<RozBg
z;YaaHz$Mjq8vG?QcU>vHjy-J{^epD4yvjFEmkCcO(TX#8;}c)M@3rr(@1sv7%gJg|
zMFOOO>?21=oOF_F<R-aC-jfM3Nv27cbXvL~U6F1`J<?t2k<=%pq!-eV^iCR)#wBH`
Hvm5^hl+hc7