From 103fd23c3ef60ee3eb64cfee64c120a53877c43c Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 11 May 2003 16:57:42 +0000 Subject: [PATCH] Flicker reduction by A. Schiffler git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2546 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/NSISdl/nsisdl.cpp | 34 +++++++++++++++++++--------------- Plugins/nsisdl.dll | Bin 13312 -> 13312 bytes 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index 18a18b7f..1feb1eff 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -84,9 +84,16 @@ static int g_file_size; static void progress_callback(char *msg, int read_bytes) { + // flicker reduction by A. Schiffler + static DWORD dwLastTick = 0; + DWORD dwThisTick = GetTickCount(); if (g_dialog) { - SetDlgItemText (g_dialog, IDC_STATIC2, msg); + if (dwThisTick - dwLastTick > 500) + { + SetDlgItemText (g_dialog, IDC_STATIC2, msg); + dwLastTick = dwThisTick; + } if (g_file_size) SendMessage(g_hwndProgressBar, PBM_SETPOS, (WPARAM)MulDiv(read_bytes,30000,g_file_size), 0); } } @@ -167,7 +174,6 @@ __declspec(dllexport) void download (HWND parent, if (hFile == INVALID_HANDLE_VALUE) { wsprintf (buf, "Unable to open %s", filename); error=buf; - goto done; } else { if (parent) { @@ -215,7 +221,7 @@ __declspec(dllexport) void download (HWND parent, g_hwndProgressBar = GetDlgItem (dlg, IDC_PROGRESS1); - JNL_HTTPGet *get; + JNL_HTTPGet *get = 0; { WSADATA wsaData; @@ -397,20 +403,18 @@ __declspec(dllexport) void download (HWND parent, if (wasen) EnableWindow(GetDlgItem(parent,IDCANCEL),0); } -done: - - if (g_cancelled) { - pushstring("cancel"); - DeleteFile(filename); - } else if (error == NULL) { - pushstring("success"); - } else { - DeleteFile(filename); - pushstring(error); - } - if (get) delete get; } + + if (g_cancelled) { + pushstring("cancel"); + DeleteFile(filename); + } else if (error == NULL) { + pushstring("success"); + } else { + DeleteFile(filename); + pushstring(error); + } } diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll index 1be0a9a10d4433b7859989305abd1fea5cd9bf12..f222a520ae092125c6117c5065daef270829bfec 100644 GIT binary patch delta 2229 zcmZuy4^&&_760CYKtLc734}kvw7fzrw8Fv*NnRe50hLy&DF~SUv2ys+kO77AQmg}^ zhHPf9R@<*ra9s=9v)MCG?M8KW2il+(n5*nqS5KWg*3ItpVZ_o?3%JpKyD!1%&RNd+ za)0;t-Fv_L-S6J>`kZ~v=WW!~LB6D_`S5(|np*?q->t!N4d^FtpD$-X?)~UQxdG%C zH;I6JH2i^LHT3~rQmmpX@ydv-`+cbh z5x26*w|=$M0ob=bXUAh(|M<2N)rdF52(Q08-bLFbK{hi@lpp6s>8WG5GO8rHT8og^FZ@Dkz{jHcGscsG8Jw2I90LMsc z@%rd=T9t&GqBo^oPejP`ZVY$jsU-28>`A*=$|Qs>*2;E&!GDf+ru=Bxz#Y?*AeO~s zPlVmHlP+bAR5`Nwu3eFoXJkD74o!VN;@3P$CFp(I7z3;vSoyCE)FHLB9Y2($+gcQb z&}2CC%%i{y9r<+Mb zzEXw}(ulyM5zT(Efr`et5a@cMc?R@=!qdQ{;e_NeDjIJ|J{|k?5+QJ*nJ|Q;JvcSx z9mF0o}#cAmT&PyxneT{~GotAPJ2=OdJ*LHz!oGs(dtNJ@aTP@!Z;`O_kP;z3d z{3hZf&{gkoQ!3Asgpjdvh&dI-s5o$N%>&Bt%Qbw6gQ+kTV6& zo<&;ay?|qNI=xo<5XuD=xXUix9S(s+DL@-%x$C|bMy=|94{y|E@uQ2fiR!>k3ZXMd zj}SNh6fKU66^#Cz{CM_S=@giVbKZH?fgCUr*T_{Sm!L8U_@pk8(&F>Fdlg!E4lSP1 zbtD^H4MdXzHuCfs1{ZFNyxeAEQ@As|s8?Gp9fBwhhkSz63Wf9fRnPtQ4k3Yfu-9^> zjJih&jgq@4S1QNM?+;A+NS|0S5fk7Vzy!9J>lmfqTYAWf3DsIW9+O zfrhvSH6lVUQ%W=ya=cMy3G(m~p~3r!5Lrbuj{-YxbLy`{rwiyeARzRyqUFPmobNg!i%X?(n-IbH;`2&Rn-#B6!AL zy_R|mzo*+^4f{9xv)yfa}fox<+=_Pxajy&1x-?ajq#^jp5I7@Z5^ zmPUZ+6dukjihVJxc6YPTxW2ii5pBS;nMU0ux~sE&cXON2RE(acs~Uyc=C+1iUG`m_ z2<2ivtBN{-4`yX#v9QB$reO)x(pRJ9ouWPGsY(e-+wjTc`n;luq?hl7=U{5aYeLeqd{$&1q zegvD&u4PMDJ6p|eXX{xP+sW=_``804W{9FY~(;rL|razg!G%c9!m{t^I7gQJQDA-ltEBIx>8wH~UZx<-c zITpsrTSHW%J1n#HYAUDLl#re4l+(qtV?i%+M z_ceE~&0;IEZM1E+ZMV5?KeqMRUa-Avd)4;3ZOZn8Y1_v($u?)ZZ42Y?;kEn<{(gRf lzrbJQFY}-BSNSjaIewmB;^{(VVO(KCVM^i1-7Edne*k>%M{ocD delta 2213 zcmZuyeNa@_6~FK8E-c?$x+}}annfS7Dlrgv`}N)v2_Ir>%qsG+HDf|yWp}$Q$UcI# z5O9{wNLJJ0b*xTP8={?Y(mG9C$1#cEii##}vDPFr8dGhXnrD&JG!uaaxjm1?v@`7= zchB$q?zv}w_ndQg``mr*pYYV}L7}{QxajlA8Asp9qxJWOPe#6;_jiq)1G^LaIk3kA zZ;i}?U0wIm$TZlv_WpUh$Rmjm%AyT;;V;5*p=fuymv%^7y%g#)419SEoyva!iP%^&db8^=PC|utr^z8eE`7wkKKY#@p4~sUP9L zsu}7!RwtOKH*iscks83863P=x^$3Nc;?JZF_!kNNOMjIyui&t3UeE+nNey{HEiv=1 z7I3np$5n}o>6t}%TjJ9>*B2oaypYV@dNCt>e&r=cxPs9trt9Un5qu@lomIOK(3#w$ z4Ob?w98-MhAYJM@iH~edYKx~@Bj?iRXzKTosBR~vWd@#QOt1=Il^i+Ph&0k#ydlG| zWqATZmz2!z24D;^{ALZ{Z^iJZGFHX#Yx1cX^?dy0X8}*fuv$L*=NO)T9`J{NYo#lA zEaR2T>oPvFqYP*kpwoF)y%}lhB@=Gd=VoTtyHPpP)Dhilg-8?rJS;LMxb@vsd_-Tm z%0xa2b~8paP{A-_4iOn6(d~gasA{SgfzJ@#Zty2m!DhyYHJO!^7T0B-OnGsZ5V+J` z1wv8>&d54X8S%$iOVgupgS60TXz1PwMt=zw)?^o}VyHU%ap&k)goN)qLl2yt%J9^L zA~>dUAAAY~O2=Tw8HzeZMV}G5_s?_tA8~Z?15jh_%R9RZX%Nw=K@`zh;nQ0I;tQqS zcs$!!df>jCeL!S#CgKLVnVj$xbhW_U4#~pfKv-evAwEa?`4@z^o9B6H5O8gHT>2$` zJg2hvBn@*pE)`4>5}bzV>;u1evXZ-)*1t2h<(?rV6zzoC$O6JCa_z&L8NK3t?s8gi zCn03G8ZzJY$HHw8&Ry&*s&`v~mAas2PUrtWyP6O^8P>~(pNt)TI4#Sd(?S_I!C)}v zNLQdF+$Ax|Ax+7N!qNm?JjwlIz{hCP`mfCRNk%Cj(RIt=-Hb_O;FA%Py=q8fij6lg#sy|!;DK2q z>b=NIf0N*7A!^V#h^`+J1%)&4B$1fu?gwp>3N*lLkl!8ARm1*-AvD<;@9vg`C%gZ{ z*Gf0wX~6W0sW4&(CJCvNzW;y_JonhTs-a_$6JDMG!j$d_=q`L)yL_Juu?+^==PvA= zFMxKTOKw^TK6@K}MTpJ^!T7jwAN65mO>UINebk~8%y(!ih`+lmujrJ*7Z5v|+J9Jv zP$Y(1+dXCI?MJ-744s+BJ{LfA91krkP1&!g@9>DODv!^F*5b)!#fFdQu0VT-$1iRx zLqWR6CDwcV&23$dwg5s!Sjew|AL+sTrTJ#q^EX%cTGolK)~8*8Kx2!m3~}@9H!iBd zALkcSeK^fjOzp$vrXdCVec{hcdDOQfDa*U)#Z8U=CYKMPry84$9j-uon?K+(2E<0O zGq4IF{LaeN85M0^eqUQ-v&Y|J6g{o3W@B5YxC%w4R)&<+1>94Jdm|;ICBH5CS4kqf zgng1-%Wh_!Y$Myk`q?hFhwW$gu|H*BXWw8?u%ql%_9pumR$}k7GpxeQm{*t!&4PJ@ zd5igZbBlSqd6)U1`LKD!{J!~$`M&vUGi}MUJYjKKnk)g!Udxc>ZA;WLW=XK-TJ6@g z)=gHgwY}H+y7id#UF%irpRAu+r>r@)T-#P#v(0PUYddNiwtZzIHmyD1{+zwl-eKQi zf7w20f7O1(e$#%(e$TGtvbbE%#0gvt*TDI>e(nHwoIA-bIlHvR|vE`BeM`9u5({xpA{|07>;ga3@5