From 024ea9c1b60ce4e598326a63954c12778d4583cf Mon Sep 17 00:00:00 2001 From: kichik Date: Wed, 30 Apr 2003 12:48:48 +0000 Subject: [PATCH] Unable to open file error was still set in $0 instead of on the stack git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2515 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/NSISdl/nsisdl.cpp | 12 ++++++++---- Plugins/nsisdl.dll | Bin 13312 -> 13312 bytes 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index c476c9d9..18a18b7f 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -120,6 +120,8 @@ __declspec(dllexport) void download (HWND parent, HWND dlg=0; HWND childwnd=0; + char *error=NULL; + static char szDownloading[32];//= "Downloading %s"; static char szConnecting[32];//= "Connecting ..."; static char szSecond[32];//= "second"; @@ -164,8 +166,9 @@ __declspec(dllexport) void download (HWND parent, if (hFile == INVALID_HANDLE_VALUE) { wsprintf (buf, "Unable to open %s", filename); - setuservariable(INST_0, buf); - } else { + error=buf; + goto done; + } else { if (parent) { childwnd=FindWindowEx(parent,NULL,"#32770",NULL); @@ -213,7 +216,6 @@ __declspec(dllexport) void download (HWND parent, g_hwndProgressBar = GetDlgItem (dlg, IDC_PROGRESS1); JNL_HTTPGet *get; - char *error=NULL; { WSADATA wsaData; @@ -395,6 +397,8 @@ __declspec(dllexport) void download (HWND parent, if (wasen) EnableWindow(GetDlgItem(parent,IDCANCEL),0); } +done: + if (g_cancelled) { pushstring("cancel"); DeleteFile(filename); @@ -405,7 +409,7 @@ __declspec(dllexport) void download (HWND parent, pushstring(error); } - delete get; + if (get) delete get; } } diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll index fbbbe4b1d4fdc4eafe64c7b0e0cea7738041e6e7..1be0a9a10d4433b7859989305abd1fea5cd9bf12 100644 GIT binary patch delta 2468 zcmZuyeQ;FO6~FIgLpC2|7u-!YUy$H)5=c@P-h2D?-lNe(h)#+NA-h>{5Nrlsw+Mo} z!q|ij&8|aupwjE4VMGK%XB=x=N*D)}=q3W8+9py72-1Qr#YdC0K}V8U!tJ@c*s0V0 zard2b?(cW*x##0Z)?L(3Jd_?zvZFgB+udp&f$kq-FHc~l*EJ|Qul#7zuxyXA=+3V zb~_L@Xyd~vZD&%|PT2A3Z@^9<77v6{T8okTO2YOE{-~fdV%K+kLkLd-Qh#WUG#*NA zU5LUgf7_>`DkwV9&gvaw)NOl+D;%EI-pmzh<1mgD>NDU)8vug~mJP~LsK0iL5Va{` z*Y|+jpbhB1_>vImYUq1fWfR+IV6!Ru3G@pjr3gmT9&Yrj3^WK4uhFiw zu7^9cSDvEp)qs8+j+6RLFRlZ^3EB-(?>1KJ)#|vyM4Ng2`da|e#$vZkFIE6ZtE4#~ zLlA=v4;JO5S;$a1lnaj(zn6)b328tInI;dQ*iC8OuOkZ0Lx6gVk zVrkGj!Dk>q&(nVd6^O-6Fa7o|A;UB2lPuM6<`yF~xP5}Aocj5n67WRoHN7BA!Hfa! z8sLUGZ9~=Y{oue1-EL{I_WYh&XZ9SXpUj?J^kdN0bI_cpAV^}yeyTzw8UBqtu)F-nL} zf2w;UW!T`(yydr(mPV0G$5Uqu1Ytg5oxYmEk7zRlh?{Wmbc5hWi0QNkIKj859B|} zm*p?yQF%&cl}sg1IikF+oK*Uhv&w*SUb(DXQ*J0D%9qN7a#t}dg!*+aU+@-#4=}m^ E23c#3vH$=8 delta 2575 zcmZuzYj6|S72aJ*Shi(LxRNc&c2Ho69a~Vt?&`IYV!#-eIz_>eWHl)<6zGmhNL-}E zp*C_NDPyq-Bw5lB{@pq4;uU57k0R`zc2HfUF?{(wF2uQcgchogv9X(nCrI z8BK3jmXlObm2^P0fLc-|om16Og;mnDiY8Oi+*vi>AF3n>6jg6bHP^{+0-b8MKDOqO zkN=`30^&7sR&ubrEKK?2cQDK*?~}S_jh9?C6NH$JBNSE1m!!1?EhVphOOlk17PNfN zmXjorHt}nMAbNCiy;+*AUR`?5gl&^3!u4q6lTxR;lRP1PrKYJGlT=t(LuRE#g%I%5IaUv}M&2Mb7u`cOS4bO+ z9<06(6!8%a|HZZnakzfeCpOV~MK*|W#TC-oqMw-$l;;sqO^;q&uBkt+_{N8xRtMx% z`k~?{3dldEhsy3ylv$G=GOQwF{{F#sLMJ9@f+C1Ouz#{6$0>mun0%DbF`orfkJ3%> zSm2@IsqNprme9#UA>_P3*Ffk-mGtgqgf582l7mq}=)&5Spapp!_?EqS`bZnli}Uo? zn7$8a20(9M19M(+0*;hR^RyZpQ+YZIVaYeu1QC=crQ;QmSTKMLdN^Fr!_k4<(G|iJ zwypzr$Z3S@ADn|Kzbn&_seB_|VzoKwRa zpb7Zp?O+-o(O>B*APDC>^lg$LVj_1Cl-fiY6v{7Tml8TZdY@JUhYT-)M!YCw6$H@+ z1+${_fBSE4WN~G zQI;?nrr>1UFm&FB3<=PLZ{uV@ikpfIy&w`6S+RTu*}oTRjtt$P@Jo-IDk=VRX}gIt zTaf{$Ds3|_(l+JsY`7uNhAs?9 zADQRGAOltoLB(Edq8-dlpJ0Mu{KAJ&DFF)DiwsIQDLJT3o`PNgNIwb>l!@?R3;bjB z`Gq5Zhx1#JftZ1d0Eu_gI;A$*3nWyDjcmPZPgwHy`ZdBJqzDcUe#b#{6*eZLEy7+L z3P#BXZXhI1hWHzyXu(HVl2OEutAyPE2*^oLhWKNlh@#g*2)lB!PU%o(O^lT{{0AYd zn#8zsiLH6niYbJ^5@yN)c47&>H{!#vR8I0I zwDGM7p@9|%>&oUl+z4=fG`h$yI6x|IiNPp@LjT{`i;a!gcyZo%Jd4Aiw8;wKao?it zscxFhTMO!3_PJ^thLZEgBE>#=9t=cC%w{MC@zVgV)h0fL>4CCT!xe6bw)+JVAc(t+ z=hUzXa!7eb@J2f=zY53k$Fw_s3I-qG!Qh9sQR0x;O6vx4!x5B4fQXaHo7x>#0Er85 z4bT|GpqCC;mlqh(SUogMI#q4b7-0&Hdu~m^%PLJ)uQ4|O;{%R`r#8GE8LVK87jms6 z+_N%f^vk=zXDEcvlUtwzFzY*idk3LR8GwvD0DIIh^VTes{JRwtVP+I3nF)SK`#d`h zw+?WZ0hgi0ZH<|E_!K8N=`jp^f~92x2l1_pr$j}b5{df&Pp>@9hZHD|(facHHGph-p(ufzXY^)6DGM7H}ApFTov#n-?jCjy*GhP(WUuR#{5P6@Kw* zyhlSs=Er-~ME4x{HT9VGvUl3lnmm zRCjNJ{3Lz&UM2M&{k0PR#gP74JD==Gm)sAZ!?RLP!?IWzV_~dJ6SIm5FzcAj%vR=k z<`w33<}KzZbBa03j4|WPmyFCzF#l$z7=l%?8g@2oWUE=4y`Npoy4VNUAF=^<9s5i6 zS#~G8i+zp#Jv+>vV-Z`*(Hz4)$aQcVxGmf>T#W1Ec5uJq`nf|~n)?$s%zYZ;{=rRf z-*8hLX)ChnZJdp_EwTN`_Lyyxt<%UewllWRY?o~+yUxzpAFyw>N9{5D zPWvwVZ|q0xBldCoSN1FRI>%DSBM!l_#UVOgb__c{c8oi&JCH-=G&()brOuc$=@gxZ zoyVMicb2;>F3#2BiuJm7xFpve*W0f5Tz__rxTakSzL1~K^ZZi&2mBiT7yQ$_$oKQV z<4^H_