From f36051ff3c80bbc6424b3b5dd38074fe8c29e074 Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 27 May 2003 18:47:18 +0000 Subject: [PATCH] - Errors from JNetLib now show again - Shows a dialog with ShowInstDetails hide too git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2586 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/NSISdl/nsisdl.cpp | 10 +++++----- Plugins/nsisdl.dll | Bin 13312 -> 13312 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index 51c7af03..011047f3 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -127,6 +127,8 @@ __declspec(dllexport) void download (HWND parent, HWND dlg=0; HWND childwnd=0; + JNL_HTTPGet *get = 0; + char *error=NULL; static char szDownloading[32];//= "Downloading %s"; @@ -222,7 +224,7 @@ __declspec(dllexport) void download (HWND parent, GetWindowRect(dlg,&cr); ScreenToClient(dlg,(LPPOINT)&cr); ScreenToClient(dlg,((LPPOINT)&cr)+1); - GetWindowRect(hwndL,&r); + GetWindowRect(GetDlgItem(childwnd,1016),&r); ScreenToClient(childwnd,(LPPOINT)&r); ScreenToClient(childwnd,((LPPOINT)&r)+1); SetWindowPos(dlg,0,r.left,r.top,r.right-r.left,cr.bottom-cr.top,SWP_NOACTIVATE|SWP_NOZORDER); @@ -242,8 +244,6 @@ __declspec(dllexport) void download (HWND parent, SendDlgItemMessage(dlg, IDC_STATIC2, WM_SETFONT, hFont, 0); } } - - JNL_HTTPGet *get = 0; { WSADATA wsaData; @@ -424,8 +424,6 @@ __declspec(dllexport) void download (HWND parent, } if (wasen) EnableWindow(GetDlgItem(parent,IDCANCEL),0); } - - if (get) delete get; } if (g_cancelled) { @@ -437,6 +435,8 @@ __declspec(dllexport) void download (HWND parent, DeleteFile(filename); pushstring(error); } + + if (get) delete get; } diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll index 2e61b1bc553f31f2c3bed619031ee2583ca874af..00ae528c289ad41e131a4cf60a1f2f4ec216fee5 100644 GIT binary patch delta 1770 zcmYjRdu&rx7(b_bwcFS(OKZEW+v;|aP8K)4ueSH0GQ^=|Zq%(-U;+Vit)dcJMC};T zE-;GdJZLs?VP;4$S>mJ7NWx=7!iI{XD4-Z0VC3S6qUbDQIDU8Y5C1qh-|u^!-~D~( z+zt8${e|OMUyYpTJ<)GzvXEX2M_$9T@i;k(cjBMY4_VG*Tt-^6efWHOOZIgb$H{9s zH{mono-+qOL;lH`g|Cw8+}ZV<8zCCAKG-w=Mxz|;p80hTbSyr4$coxizol}!N8%+B zON&uyrisQ(vM%?V86D*ar7{UhV>!k`vOKS8hV6fzzsP%eO(lEE%$#mooO~G})X5kF zgs}#T8vk=gh0a1lA#1E_aDbe%vbdjEZC)H9H`_dT0a;{gETArgx<{frjG|I9XiL;Q z3>YYMnA=(=QAC4ut<^Z^G@%{rLgN&fpI?dJC#&+C-F@Is94?f3w_esZd^^b7Ce@R>(Zko*DQEzdc?5^ce#7! zu`DbGmK~M{R$(g1W-vlSBljT&Y-B;GJv4M_*%ZnKbnwy=#0>Q&A;TRU|q&?AwdAj7;^RlAO+x;X~Hn_9y9K>40WSQj^W zVIU7adzdXY#YqXfATCc7Cx^)aSEb^mC-tmsgo4nefu2mnSuaYR?peY%MBOyXdZ}Y8 zm{yItvOwXn8-hEL$87&)DeeZ1nKc=08kxSMFj&sj5^j$ zbs5?NpARRwi<4(yY6mZ7f#fjF3$TZvfF-+1_f_i|fYXPYWLxN$K{EzSPs0eN($IKA|38Z%jB4dd4h0QoL<3NVOMv5RymNTT-Ji+`5*w zDF$ri{n$>rDp%NC{eN9)0X5v@=gQVuJD?&QPAz2XjAKBsd!+dJ{ntPesGKN)XUNL% zjL5Po1v6xzss^7Wqg5LAyy$V-ywSpl6&lqMkEh}WzpxJ`wlrF*C(TP)3w_~+6&F<8(*$i})S( z$87WGNzQv`;m^}EYT>ybC!GzAUG<#GE#R8D`?=-ZYVIkno9pEUxHq_Wxl!&UcZU0( zJI`I@E^`@6E{GV1vA#l96j-8bYr z=sV~8#dpn@?`QmT{Z0N3f7Ji1f0KW}f5<=P&kYm?N&*W4D*~?sb_MnZJ`Qx{$TMZ9 zTq`%ovOHIg%Nym*@}Rt59+N+lzn8DdNGVcoP<%?0a*xucEL9#-9#i5DF7`#Jvp#{{p{piJ<@h delta 1767 zcmYLJd2ka|7=JIlwxvgeq;1-?4Y1WJK?{2%n?1yGSO=yPh$O~h1qPY5C<>;CN@=Bu z5|;Z3g2z~?_uv6hM+eX#474DF3|GC!p$=OMQb#F8I$gg_nemS|`~ANA`@QdNtJeKbM;O#Bc~j{PaessbH+j6b~so3b#;+;Xu?syHjTEW4Tem& zrQ~FeT9R?op((f7rcKYCa3t+-zwtB`)GsAwk9r~tmn9C49=71-MAAM7x7gy-Xc~?c zjuTF<7NrLpHt;jiT8*qn)9D>k zL1mncC7V=rC7AWIUu?CS)3C}7xa(1U7&4g#qTiqz|7l9=h-vGN`ef1?lzhrgok zN7kTz#so~#?}r^At;L0IM^HtnV0$|x0)pf7=;Ge@vS7U3G=ix$?kzCHE*C`GNoR4n zRBfD7)6x+N0BKdmxwcib3u)aDRUL5}5!z+g*PH&yNPZ&%OdIyKfcrAq7SS#;&Y|G9 z$O1@Q5ko(-57Ds}^XDbxBACg;Kp!vIjM z|3JD*7DKA)(mA+>w3Y6_JaIZ5h0d#n5soFpk+fD9QeUbuC#SBGna-+tL)Q(%w3NpN zA{ng;YO*i`K*1D*8V#*e&+Ru1t-H^{{0RHSG6U+95Ud@C@oe!3Ey1aRxr=rCUxuMB zO4;;mkVD#Wy^Nf6*5O^GysQNOLWHtO_T7VqAs%gFgQ^!?^=DzgaF|RfD>Z193V zD61;H8+sLwL`M1bB49PF4MK549FDI79xj);$KGn@I8v~&9;o^fxeyW$uC{0gwRyDF zKQ~p?SNK%@z`oHi9W73S z5-Tbs>?Vnd@mMG4E0mV12rWe5E^`|xNW_lZ9%x)QH8<}QG_{dif{m7tVK?`~Z`h;o z5r2t{NmZ=7oVp^bUIeAXZSsEDR`hVgL-i4d8a21l4&A{MF}KpN*P0tL9#)B}KuuZd zDsbp4Q2)00x@Ae&#AO#9)?U^H>|} zU|nn_>t-jhKDLIvmkqEDY$N*uyN!K~{fs@#o?wUBe9py9(Hxgjo(FXkt;@FG8jpUDUKdVVSY4Bx`X_znDazJpKlNBD2~@A*IYYy1$O z=E?Sq^>{ss=ONE(Pu#QF)9%^h>Gc>Mhj*fPx_6d$j(3CieeVfxw^#T6=yP2{lb7SBrv{NzNl}bufzAb?~1SGh7XHl#1gSmbc>6{$He90I`Lg` zkGM}fCjKt|Ar6XGX`D1!5~QHCP+BTQq%~4p+9Z7`otD0rdZa$-np7a$Z&6~>m4_n-V-2eap