From e5550dac1dee2b1802a52d753cefe888cb6d5ee8 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 15 Nov 2002 11:59:56 +0000
Subject: [PATCH] Compiles with the new ExDLL.h and updates the image faster

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1709 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/BgImage/BgImage.cpp |  18 ++++++++++--------
 Plugins/BgImage.dll         | Bin 4608 -> 4608 bytes
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp
index 2ff1fd96..e5c4be3a 100644
--- a/Contrib/BgImage/BgImage.cpp
+++ b/Contrib/BgImage/BgImage.cpp
@@ -5,7 +5,7 @@
 int x, y;
 char temp[MAX_PATH];
 HBITMAP hBitmap;
-HWND hWndImage;
+HWND hWndImage, hWndParent;
 
 HINSTANCE g_hInstance;
 
@@ -15,6 +15,8 @@ int myatoi(char *s);
 extern "C" void __declspec(dllexport) SetImage(HWND hwndParent, int string_size, char *variables, stack_t **stacktop);
 
 extern "C" void __declspec(dllexport) Init(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) {
+  hWndParent = hwndParent;
+
   SetImage(hwndParent, string_size, variables, stacktop);
 
   WNDCLASSEX wc = {
@@ -24,7 +26,7 @@ extern "C" void __declspec(dllexport) Init(HWND hwndParent, int string_size, cha
     0,
     0,
     g_hInstance,
-    LoadIcon(GetModuleHandle(0), MAKEINTRESOURCE(103)),
+    0,//LoadIcon(GetModuleHandle(0), MAKEINTRESOURCE(103)),
     0,
     (HBRUSH)GetStockObject(WHITE_BRUSH),
     0,
@@ -57,7 +59,7 @@ extern "C" void __declspec(dllexport) Init(HWND hwndParent, int string_size, cha
 
   SetWindowLong(hWndImage, GWL_STYLE, WS_VISIBLE);
 
-  oldProc = (void *)SetWindowLong(g_hwndParent, GWL_WNDPROC, (long)WndProc);
+  oldProc = (void *)SetWindowLong(hwndParent, GWL_WNDPROC, (long)WndProc);
 }
 
 extern "C" void __declspec(dllexport) SetImage(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) {
@@ -87,14 +89,14 @@ extern "C" void __declspec(dllexport) SetImage(HWND hwndParent, int string_size,
   if (hWndImage) {
     SetWindowPos(
       hWndImage,
-      g_hwndParent,
+      hWndParent,
       (GetSystemMetrics(SM_CXSCREEN)-x)/2,
       (GetSystemMetrics(SM_CYSCREEN)-y)/2,
       x,
       y,
       SWP_NOACTIVATE
     );
-    RedrawWindow(hWndImage, 0, 0, RDW_INVALIDATE);
+    RedrawWindow(hWndImage, 0, 0, RDW_INVALIDATE | RDW_UPDATENOW);
   }
 }
 
@@ -170,7 +172,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
           wParam,
           lParam
         );
-        SetWindowPos(hWndImage, g_hwndParent, 0, 0, 0, 0, SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE);
+        SetWindowPos(hWndImage, hWndParent, 0, 0, 0, 0, SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE);
         return 0;
       }
     }
@@ -201,11 +203,11 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       {
         LPWINDOWPOS wp = (LPWINDOWPOS) lParam;
         wp->flags |= SWP_NOACTIVATE;
-        wp->hwndInsertAfter = g_hwndParent;
+        wp->hwndInsertAfter = hWndParent;
         break;
       }
     case WM_DESTROY:
-      SetWindowLong(g_hwndParent, GWL_WNDPROC, (long)oldProc);
+      SetWindowLong(hWndParent, GWL_WNDPROC, (long)oldProc);
     default:
       return DefWindowProc(hwnd, message, wParam, lParam);
   }
diff --git a/Plugins/BgImage.dll b/Plugins/BgImage.dll
index c4343d9c7855cb011924d69274c35f1f793c450d..b9f4c03b31ac24778887a6985bd7fffb5aefbe28 100644
GIT binary patch
delta 1160
zcmc(e{cBTK7{|{^)242%#F|vCt0YU&GOM1KL@RA%Zx^!>wY9HS(SmhcUzn-pj#_1j
z)XK8UVDY%2KPcJ^fAR;hVk+BenVX#;>X?dXk#!W-(xM_`D9G-<H(J<#;KTi#=RV)(
zc@EDx+?%XOR(yRhTyuSFSzBLrnmhZx&o0TunQREYcD<FYgx|kUWtYO=>OPb6>$h*!
zm$jt_%kt)r-cCO#r@Pb7*Uj(+2<aj~)zbhSP@RsT(}ytapFd-1d|Ou>xs~cSx`-ZA
z&#``?{EkJ`(f^TSh`w)Xg_hyT9N@%l8F-57#z#?qx|I=k&(Ci8&#-ojL1-S<Zs)-d
zYxh1cA?}nhk~02CX=5ovH97sBb{}zn(mQ0hbPpOQH#VE$4)vu|OVlAzb2XzwHHvit
zH(rK)HcXbAp(t`KJD${8cXfNu9WN}S(7Kz6W0ozOH(tBaWKQ)=%{8^6hD-+<P0iEX
zlIcR$)ZCY2P%?)Qw2Y@6n9Erah0<bq8Fn>89au4ss?RT_?MlyIQQl}zawU^Qi{aL*
z?Mc?4al^zx97|owuci_8G@pA~QKwT%NJE1avgfwEn^dr%mc~?PK@>%U1#`;mqKQjr
ztb2KDD7DA7yb<-dpoV^^7P~6xyQ<N(>Kz@WTjbDW#mf?$GL*Y*uYG*n{qzRjYW0Jw
zl~(n83nyusxf18zCS(xY0QbQd_#2!Awsrdn`4qH+!=Mq^R)zdq;A7ARbkK*~1uzru
z|H3~4_rX=L3Yu+)U-=ilT(~;79z}r<f(L%ux=~mSE&4z0D6|-~5io6U;KL-ow7>MV
z9i=aC*WUP^tt#=R>R(W_oW6(uCTx!v!)O%V`HBeQR-l7W2}C#Yvj~ac{Q$H>AO()7
zZ;E%Sq=TKG>2xFp>_X;ewXB|PV!PO9EWvu&S4^=J>@53*U1z_uQ8vY%u_9i|7w`aQ
zd<75lHN1&$<2!kb@8>-{#gFjg{1hMHKk{q*CLiH{@~51NVli9H6AML^2#XKITG1f3
zi@4|&=fp+vllWEK2#Hbgmne||xkO62Qby%onUtpdR-TmK$qVwbyeA*Z3HeNtU~zDE
PFc7Q^@?d|bBSQZJfps_Y

delta 1177
zcmc(e{clrM7{|{k?K(DCy3vNc1k<`E5OmvlxeF6EvL(9?W|2yz8{2{+?JQ+(gY1%q
z7gqyBYDr|A1o=UHYs3UKCQhjaP~NghLL5d}Flyw7X&O2RKNu1cvg`MfV)zeylF$8~
z=leY8+~?k#oAf9BN8V_0UY%*^|0w&2>-w2&-NQVSmC)uvGrJ7BM_1W;=(T50KGY4{
zw#FLz$G)qc_nPnO*l$bduCe>;=Lc&ENf1Jk>IGU$&#E0Z&F)1y=Bt@sKN3xhpw_B>
zqD$!y>OQUql+U)5mW;2pou>iQaGQq9G!~dfaqb^<e%Q^3YyV}Jyf>*|V=&^ch9~u3
z=3zCd-#A!7Tq)!ClyNhq&zK&~OI$(I6M=+Nx_Zv;bH}jmKX~47#@sk4-y2T145*}C
zA00+v)kG!+*H{=MklbRNx+(8XH@=8kSNv|!oQ_#{h(9nJ_j2Mgr!ymvmp1oaxwJ7o
zyMMMatrv$fRw=D72zO;7I3=ySzaNHX60o~+X&VN$`vY*gOwZFeINdmat7>yp(H_<7
zSW(?-O>!xdL_a2JvL@-ku1)#Z)fbK?s;iuXm-nG5PD3HH(VE!wysYYqnrTACivm?a
ztF|bND9l;t=~Gihl{BbwMXP8)`JKz?8nw>3nzpOM&dPG@A^&^bA=A^XzIJv~HeObo
zr=vHYB;*d5110#NZr}$$BDdl_A0bD<0gwQvKm=G3K+kG02zG<Fz;Q5vdLOhNJOL`e
z9K2iLMq%%1c!*A7FBn$#4c1;Sc+5M6#%6eZk9n8jCE(3~N3l{}D5?3sA7>HSNjst=
z>xLr6Ky=NP!N@?gO>HQBxAYth3~h<5-8wYbHh#Nw1#QER)MAbP0p2x*+6yF*9|Ffg
za|KKnA!X%+tjGE@cwd2U!9^8axc$pAyKVF=nrc`R>tN5bUe?ccu_Q~ex7j=F1p9=Y
zW>ajM{lW6=9-CthUd3zqQ=IV@-p)ID4}XR4<O#lyAL2*&G5$V3$v@{8`6U0D|H}X7
zv-|-s6^q3ZQ7h_%6z!r@Y!p3WSnLspMOK^>SDq15;=0I*JEBT1mzrEDTV+V@mT$_V
k@`U_Yek#w%3Hhh|OWu{HbZTy`T3fC)XieJq4qH3@7cSd8umAu6