From 4f1d71027e7696f7960479e401b28b4c03c9316c Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 15 Mar 2003 14:16:21 +0000 Subject: [PATCH] now compatible with the minimize button git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2301 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/BgImage/BgImage.cpp | 21 +++++++++------------ Plugins/BgImage.dll | Bin 4608 -> 4608 bytes 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp index bf99a209..98e27930 100644 --- a/Contrib/BgImage/BgImage.cpp +++ b/Contrib/BgImage/BgImage.cpp @@ -21,6 +21,11 @@ extern "C" void __declspec(dllexport) SetImage(HWND hwndParent, int string_size, extern "C" void __declspec(dllexport) Init(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) { hWndParent = hwndParent; + if (!hwndParent) { + pushstring("can't find parent window"); + return; + } + SetImage(hwndParent, string_size, variables, stacktop); WNDCLASSEX wc = { @@ -172,19 +177,11 @@ int myatoi(char *s) LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { if (hWndImage && hwnd != hWndImage) { + if (message == WM_SIZE) { + ShowWindow(hWndImage, wParam == SIZE_MINIMIZED ? SW_HIDE : SW_SHOW); + } if (message == WM_WINDOWPOSCHANGED) { - LPWINDOWPOS wp = (LPWINDOWPOS) lParam; - if (!(wp->flags & SWP_NOZORDER)) { - CallWindowProc( - (long (__stdcall *)(struct HWND__ *,unsigned int,unsigned int,long))oldProc, - hwnd, - message, - wParam, - lParam - ); - SetWindowPos(hWndImage, hWndParent, 0, 0, 0, 0, SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE); - return 0; - } + SetWindowPos(hWndImage, hWndParent, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); } return CallWindowProc( (long (__stdcall *)(struct HWND__ *,unsigned int,unsigned int,long))oldProc, diff --git a/Plugins/BgImage.dll b/Plugins/BgImage.dll index 81d6f48a91e6ddf650457a910fed45537d131be4..c9023ec0900074bc0c5d5d40b77db3df075698ca 100644 GIT binary patch literal 4608 zcmeHKZERcB8GfCnZOD>fLJXPO!p$1B+uEh~!yZ(j$oaTU0!exsr}hdZtz+NB_HOLR zzIRCwLq(=iyxXh{x`}-V5xEGobyG(X3Y|uyCL>fETlb*=D?i$eAMVmYBs$g~9e2;U zH}29&^vC{`Nj=HqbKd9uIPZDSdoACthn}JpL{th`7SR-DHvIPI^*_!)U3K?~DthIX zx9X-`op06k#^M=nIGq|yhljXGIGIf8T))btjU*ROa;-Z8+)yg2HdI!Y*Dr;Bd&heV z&osO|RmA=cA5MM8mXA*z!t92881r0ZcIs)&TGgxe+!K$)n9qM_sK`W}u2O3EW$rKP z&QVp}=Ul6Z@K0q9`?G4yZh*68x4kZL>cALQ4|^#1ToRzhfD`k(Iy<7Wo@f;8evT;0 z)Sou|M6;i!yB^OW_I30Px;m;uKf-cl`LVOI^|HYc?Q2L!!+MzLO?K%ZY@2e-%Z4A< z-{6?hF&7j(zz$ypEE|5J>4vnbr6Smp*@3X_?D}B6H2g%(#r4hkvsHmz=Edwq-jvG% zLFwbhH}XdWavSBbdwFtS_!UyMj2g>uTSkRa_$$Q8{ZM3Q-E;C8))aH{pI9FS=j3;O zSxxSo@m|h2my_Sm8HJp2(el)CAmzmg`OGgi!%@i@mvWC>&KXxMPYkMo1JlOpSPe7_ zdqP3W$AX*NG-!g5#vxh0C-IqZS#NJz$>i^EI`#X@N|1?6;fOJ!@x#GDY(G-5Ji~Cu zL7swouTdF8^STQUAj{ngb*8TuN|+<$qGHX*Skj3rmQiNS=YNEg_dR@i#;!=MDOUvY z2jOeVHNjB+c_>ZUeezi_`J)g*h1c;!%$3&1z=SLhkHDsnrH(VLmCgpN`GhOaa`Qg4VI5NSe|{@Am+kj9taevD5$-xW(mUIRm*!pJC_+_w{Cg-AZEsqxMcLMrodPi8Sp$ zRYCSuDU&QeyL-^HshjsilC-d9~rtkDA zH%+px4x-#&GWi1^>+2`BmnxQCUtxLbVPaO=O}{Fbb6K7*f{>>BW&r<8b{o@>zIBp4 zAi?Z(nUe5Zp3Q70pZ&}%vM_cy4+qxX$fVpVdy(V&W>C1BcpNwgJO{iCn|{o90ad^!kpBkE1G4}dQ{dSs zU6R@Q2-X}&w00SH6n6MNp*_pEH^AWwf!+s-<38j}Tv57qzR_nqwnEG3>B!J<6VX3h zZCa{7tZh%LD$%QsW_S#m*NW?86Me8`)ugc>R}acP-EyZSHbgZIzXD4Fsve3bqp6Y3 zRB{lW`=}+YhIQ2;<6nlg^y1TmU^1NW5Tu(*5zN0_EwxI7a#t~q72>EHMt`@Zim*mzKqH1c6>&+T` zs&Fa|-bJggELFHAH8dR7XIBhcLD?CRJIz=0bMr*WS}XV^J94V}aF$MvD`Ft{z-J32c9 zEj_Z_O@8jeA7@y@Q_-FVZ@{{~e_!Ime_;>m9 z{D=G}e7Uer*eGlfyh4-EE_4fh!hrA%;W6O};h=C>_<@iYek}Z4I4%5E__J_M_`C3t zutKaB?-J|9FN^nx+r)0MSA0m^E2`qK_?S2@9ui*^kBhV71@Qxsq}9^rrMsmEq&{g- z8j>>7xb#!$gfu7pQ93J~mp+pICEej&>)q)6s`q~HgWjFquy??l^4|Co{y%5%Z$Jkf A4FCWD literal 4608 zcmeHKe{37|6@N~>Htq7mbTP^X)h;vwxAE1#`7t)y}o`!YbA94hra9D ze)VYh3Lgsdke@%bIeZh=+s_-}FJXQA{fC@&Ad^fp+iGTtOce2W=|`G;cNIHJ4K1Jb ztR=#SYF+fZ8?pMpoFn_3eT`c;LsD=MYCU(q2d<^aRoK?2-XEHXE?6q7bgT-8G}5 z9w>M)E4~4|ib6zl?FCiKC!u0?0317~KiF3&L=>*>udSc%4(zfnOkLokG23Xe^^yVhi%yY?Kz{cYeH)e5Ubd(>QC&e>07;X(WioEbWQM>>vwo-8BSF3{o1B9Zcan z>#_gX_8BH0Z#(tdOG=E1OyP=YqQ{?zMbn3oiS6G5_m0;}6HxCn>eCosU-=#+xqGR_ z3XVVtbA()0?8P)oI(ykRYVF0+B#Irr|CjSl51K8xE?UyyYspQqcx|x;_3c#9*TvO+MbfMLY6qPG2r>uT--`p% z9z5vLs9k{+K>JwFvV=cm?pme+yO)_}w{H7W0OqakR$uHFtby?udRIeEQ_GWxh&B!Z zkGXA}p3~R#EUk-`_d>Nho+aSAa}tZ;MO)dN44tYY=c<%hc52kxTN{&BI$qQFbiAVv zO+8ZAgPSwHyb@~m8oYuj&h{X0cFDFsf@s;##X$dE;`yJWtIQr#{~?F-uS0>c=bh9 z9>R8?G`H01R*A88ug^c?I#f&YYmjkir+hTa#yW<6Z?X946@Bx}cCTXVtvI9=Hdehe z^=o6M$M)X_K$;t#&w7T2=cn#s8q)8WWlu>7RQI?!64Y;YC!A~5`GptImA z-Hg16t4beU|CjZ>v_>oHh2;1|C(#F<9xXqb(6$#;6~D4w&BQ@yPE_}~PWng1s#9Y> zvhI-wcE}M)Y)@$#(V?2Cs>d_ARQ^CDpBsbc2z3?Igs!@vJlRQmJw2)(Jy_J$@qSe= zWRgYPRLy`omH|}g(h|iYGovP8sY2p_>xtXF5?jf`=cFf+Po(`r*(QvGVN=-M2kZgsyKPATM*uy~#1TuMn~a`>5Q6Y}cPGHOmAP?I{iOgY_l{;+Pd%F9o>0rF7?;3|OcOJ;> zXE);^$Z7B-cw6Ot!+RZ`8SIY&djfnM{4AJx*5J)6Jmz%Ssi<4Uxa1E~UoN8)F5A(N zQ#o_^L-N4# zB-%9~%R6Xmyt8lc6Uq2m(2unPcy~LEfQ>xIckl{-KmP!4@Q3(meun=x{|x^Ef0}=T z|2_X6zsz6e8->pcEyB%$B-|;41VtDU(n3xs3Xclk5RM8@3Qr3q;e;?JoDqH}{6#n? zd?0v5pLo4^qqs%fDu%@EVnp02#>G)FCq5)TCLR}`6MrVYC;nahr}!_?7B@=GQkOI+ z4NEC0D?K88Px^`Us