From a0a7ca8a09da4dc691d6ef4fb50c9da03ee0c4f3 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Wed, 16 Jul 2003 20:31:51 +0000
Subject: [PATCH] Fixed stuck up windows on Windows 98

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

diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp
index 300c67c1..e18f47e9 100644
--- a/Contrib/BgImage/BgImage.cpp
+++ b/Contrib/BgImage/BgImage.cpp
@@ -31,7 +31,7 @@ enum {
   MIL_BITMAP,
   MIL_TRANSPARENT_BITMAP,
   MIL_TEXT
-};
+} ObjType;
 
 struct myImageList {
   BYTE iType;
@@ -298,8 +298,6 @@ NSISFunc(Redraw) {
 NSISFunc(Clear) {
   ECS();
 
-  BOOL bIsFirst = TRUE;
-
   myImageList *img = &bgBitmap;
   while (img) {
     switch (img->iType) {
@@ -315,21 +313,21 @@ NSISFunc(Clear) {
     myImageList *thisImg = img;
 
     img = img->next;
+    thisImg->next = NULL;
 
-    if (!bIsFirst)
+    if (thisImg != &bgBitmap)
       GlobalFree(thisImg);
-    else
-      bIsFirst = FALSE;
   }
 
-  bgBitmap.next = 0;
   bgBitmap.bReady = FALSE;
 
   LCS();
 }
 
 NSISFunc(Destroy) {
-  SetWindowLong(hWndParent, GWL_WNDPROC, (long)oldProc);
+  bgBitmap.bReady = FALSE;
+  if (IsWindow(hwndParent))
+    SetWindowLong(hwndParent, GWL_WNDPROC, (long)oldProc);
   SendMessage(hWndImage, WM_CLOSE, 0, 0);
   hWndImage = 0;
   Clear(0, 0, 0, 0);
@@ -342,7 +340,8 @@ NSISFunc(Sound) {
   char szStop[] = {'/', 'S', 'T', 'O', 'P', 0};
 
   DWORD flags = SND_FILENAME | SND_NODEFAULT;
-  g_stacktop=stacktop;
+  
+  g_stacktop = stacktop;
   popstring(szTemp);
   if (lstrcmpi(szTemp, szWait))
     flags |= SND_ASYNC;
@@ -356,12 +355,14 @@ NSISFunc(Sound) {
 }
 
 LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {
-  if (hwnd == hWndParent) {
+  HWND hwndParent = hWndParent;
+
+  if (hwnd == hwndParent) {
     if (message == WM_SIZE) {
       ShowWindow(hWndImage, wParam == SIZE_MINIMIZED ? SW_HIDE : SW_SHOW);
     }
     if (message == WM_WINDOWPOSCHANGED) {
-      SetWindowPos(hWndImage, 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 CallWindowProc(
       (long (__stdcall *)(HWND,unsigned int,unsigned int,long))oldProc,
@@ -534,12 +535,13 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     }
     break;
     case WM_WINDOWPOSCHANGING:
+      if (IsWindow(hwndParent))
       {
         LPWINDOWPOS wp = (LPWINDOWPOS) lParam;
         wp->flags |= SWP_NOACTIVATE;
-        wp->hwndInsertAfter = hWndParent;
-        break;
+        wp->hwndInsertAfter = hwndParent;
       }
+      break;
     case WM_CLOSE:
       DestroyWindow(hwnd);
     break;
diff --git a/Plugins/BgImage.dll b/Plugins/BgImage.dll
index 3afaf519a06e52da3aaf1316393d75f53c725acd..b958360dd771987799ff98ed3b0741faa12f5aaf 100644
GIT binary patch
delta 1745
zcmc(ge{54#6vyu^Z{1s0TxEMuVKprqKjc@c<Newz0)rMLie($G=m^L}Q<f>4v~$DF
zqFu?#vu5Q^@dr_Ug&<%glz&8o1{R$V85u^1LI_028#aVLaQxWf^}NF3{`U`W@_FZ-
zbI-Z=-0yqs+azt0Iz6~2ImgF8{o~2gwf}Oa_9plXPj9O|3zl3Rto;G3bnR@`R<3(B
zXyhi-cBZwPo145;j4vkdznFKs6rnUisGBUqC8kbH8ck)46a1uWf@N0dwdN2^=8q<Q
zcrrdj?&B%ADCII;!AUo}m6?HAGLtEFvNE!%v2^Gu%^e#El_Y$OpN2}Ul&f|kn>Lyy
zjoH*M7{@p(q=qfQSKP?fZ#5yb^BmlrSVH=ksdxt&WQy?~V$Ye3_mR0d#pZ)hzndXz
zawfp$Z8^{9U&=#h_dzJp`^Yaj^|+PHH*aQ*MJp-SOnS{6v~=ApS&Wu66gTf=$&}nG
zJe|CgJO1%jST2^1`<Rd;@h%(Cmyo@=-#^)#i%{HGte0o4J>g^hdNbT7d^W$np1j8{
zh<pNtbu8uYNytXI?cklNQUkhckW$UD0^Ae(peOC_7PH6nmfbU|Dc{3{ZM2D@=l{$z
z42K{o;Vae7YVN2LDZQal%jo&oK=@}D-vgzqSJm`ic|fUJHUP@8@obQCA3zo8x?l|D
z88}eg5KKY?hAgUDXB%#)GwZ8rJlmjNODT<Z!>plguo^Cu>mnQTUN;-6=r!a<o^xC|
z?DkT^oAImkLM$E5kG?R(s(LALSe|ekgY{Og`svhiEfdW&s2Xnw9MIZW<?nDc@mt16
z3<;ub)<t2iEL~UVhoKHP(+pEITtwmgVQb)F<CF_QwEs4Pkmj{U^@7l%#UUxG3n6Yq
zD%W5noq;5E_~-@gN3%6W(ZzOKyn*RI0B(SmaP>y&m*A8Q$XT%p+LPc_={N6Dn(%h|
z1BA_YI9mLaa~lou#!D0T7WwG~nID437!TW03-b#xZYL|Ojrd6FwDpL|+j8e&H4U?r
z>wv<VvNR}h(uP2bWmW3&i?EEUe++4=-UL4lRlBHnWWAu_#l1s%3prIV75ho1z=5Ah
zS!~yFge^tL4on7S0~NqZpdM%fHUnFMKA;CU4D1CSl)$1eHcdn*2&@E_0u_J&Oa+R8
zj0+(KtTA>$&0(M$*blLz6Hx?pfztsr0BeD2U>@KGCIUqO0&YRUC7=grHDWNXJ+eXA
zWO!_c`FT!+x<<r)g*<pH=#LSx+YmeEEP_r)1h2u#kTdBT`+w{5?0?fGb-6HtEnnm3
zHU!qaxpw{Ash7FUc#ZM*YRD9vgb)VHKEe*Z1grpN6(W=is$2kOatNiscG%z@0W|PK
zkkbal01Y6(XTT0%Kk<$`aM;e6a3{$be?D?!wwZVF0`K8{d?mk<ujT9cjeLZU@w@m8
zf0wTis)P+fi}0b)CF~LQ3%$bc!hOLkI>Zujn&=iiVuiR=tP$6XVX<A@B7P)(E`BAZ
z#BarO;#CnzW2I?QKnhBYQd0U<`bPRr`c2A6)8*yzD!EQ>lI8d1ZSq0+xO`4#%g2<9
v<*UmlDYKOYN~KbxtX1Annv{sLT{)!ur99@D;koR&<+<Y-^x!%0scHBJ(7pVs

delta 1839
zcmc(ge{54#6vxjkuRpdH_HcWltedoM!j>p3*7u`(-2kC=641KA8w4^o-P~AUGH4eF
zLT9=Wx>~bwry`ok52M7OA&fu#$5BB*eq<6P8D<z!fxIyiB_Tjy<a%Byk-z=Nn|$7R
z=X=k&J@?%A`Z|?PrPoi+_f-T%a_ZQb>VG*~J&yjuGapqCqouz;s6L5S`C~Y3tJl2Q
zV#M}&oTZ@vz+%F|RP90~WX2Vk;;|D8z!VgodL*9eyY<@SE5!gQ^iyttM%qpa%<};H
z32iWWIh0a;9v4j!o9VuTo*^^I9(s$+BK+WV({E%a_Z;Eq^IWl;^8v4Qr^2O)vhF+K
zqGXT@v2d}22}|9;Cnj^WJsmp06;88ZXe7I(z6|&=hY4WsdAvJXNiT3E<Wu^9E5M&{
znrD*F>0EPx<pAdI2ijnEk%M%rd9nR$7Qp_4n4*7AFPhhqO?19xyUkd%nh9b0lSROi
zu3409qof4HEqggS%UVP7=@x7L)J?ctcPbv_!iC9gwp!gszp#Gy^pF)G9xTvH)7F^`
z+Cq9W-Y0{6NUx*s+7?9nF|pOg#Cr<xOxT6q@fxjG_dH-MQL!9d@92V|16Wp%#c$f+
z^iS%r`?(0uIyg2mo@E#TFe-5}(NWwz8Zn1ZHhD+8??i?@;yKLoh(F?Wb=}IbU+y!e
zF%hu-)(IvWTVt|dG{SpF(^~n*MZAZKh9jOXN^fI~#eTq9qn|BH@xp{&x;^WysL=_%
z8COkItiqfX$-wQ9#zyeCvQ7miCV>gYt(qRh0Gzt{XewflEt#-sdYPfJ$V4)5wH1u1
zyO&(4qLU#ee2Yu1t~-5vS>k5w=6Wp=v8m}=BP(KC9p;EL5#Xzg;23SownvSQq5g6t
z-<xX94dKY_EYs02&a+4!!<I!HncXvCJ*s0jIDkaJ5z}+Rl~v(6F<lA^PlO6<ji3|h
zpuAX>6CXFDW$`L*>>Cs{CcNW@8T{BjbYc}olOd<;19WO?^@sNuO9pyF8g<zVXKcY;
zl^J!2#`6^q<l!O3nt05bz*C38W%gV`4$(D^cG5LC>NsKw^xS@w&muM^?7-C3E4`_@
z)5mzguDo8O4PC;8H2q5q)ASB}$+W~J{o}OPVtDbugx*6h=9G{I`Y@-EEEsh0*9h$-
zQ=_+w0Jvg&RS`Eb8>vE;BX1xZkZs5ias(Mbb|Tj?&lsDY0jNioB0;1anT@!SJmjhe
zU;;750OlM*_Mv_ldA|sv(1}6|vI<#@C`bvCk2sKf7<e7Ih@_A(YQ`AO*v8D_hSrbs
z^V|TvPiV(54v!8lKcQVl4WBD0_Si8iGluEpT-X2IkMjTCkHKrXQ8Kt*=ps>LN00xM
zmp=<Y(6>DX{Su@KnVkz@%>x)gyaK==+8sQA6N#eVh%xJs2(kr<Aw5VhvKuj0Ho+v|
zzzi0!!b{DstZQg)qHj;@!-tDM?Bq<OpPKW3j*h)(6+PlCQ4%Y~g<?q5#Cow!+$e4q
zKNPQs<Dw)jk{YE}X`9p~^+>y=J<<tjM7l2BlCou9o+cN{rScqkuDnRDlN;rY@@Bb9
z?vZ!N`{V=iQTe?5muyz1D?z1JsmCwd4rM_3N;$2JD*3*Jz9qgDs;|k{?%VGB#P_xD
zsPC?il+P@GwLDKPQeRN#tBcecb(Pwrwy6pAGxe(aP<8pw`G58Q>A&Is+mBzUwtoQc
Crxa)a