From 4e6cf01f9ccd71e12dd695d9b59815cd5bb87b8a Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 17 Jun 2004 17:54:48 +0000 Subject: [PATCH] added getWindow git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3564 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Banner/Banner.c | 6 ++++++ Contrib/Banner/Example.nsi | 19 ++++++++++++++++++- Contrib/Banner/Readme.txt | 2 ++ Plugins/Banner.dll | Bin 4096 -> 4096 bytes 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Contrib/Banner/Banner.c b/Contrib/Banner/Banner.c index 11f21a6d..7278d044 100644 --- a/Contrib/Banner/Banner.c +++ b/Contrib/Banner/Banner.c @@ -109,6 +109,12 @@ void __declspec(dllexport) show(HWND hwndParent, int string_size, char *variable } } +void __declspec(dllexport) getWindow(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) +{ + wsprintf(buf, "%u", hwBanner); + pushstring(buf); +} + void __declspec(dllexport) destroy(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) { if (!hwBanner) diff --git a/Contrib/Banner/Example.nsi b/Contrib/Banner/Example.nsi index f360eb65..0e5117cc 100644 --- a/Contrib/Banner/Example.nsi +++ b/Contrib/Banner/Example.nsi @@ -1,5 +1,7 @@ # Look at Readme.txt for usage alongside with the Modern UI +!include "WinMessages.nsh" + Name "Banner.dll test" OutFile "Banner Test.exe" @@ -8,10 +10,25 @@ ShowInstDetails show Function .onInit Banner::show /NOUNLOAD "Calculating important stuff..." + + Banner::getWindow /NOUNLOAD + Pop $1 + again: IntOp $0 $0 + 1 Sleep 1 - StrCmp $0 2000 0 again + StrCmp $0 1000 0 again + + GetDlgItem $2 $1 1030 + SendMessage $2 ${WM_SETTEXT} 0 "STR:Calculating more important stuff..." + + StrCpy $0 0 + + again2: + IntOp $0 $0 + 1 + Sleep 1 + StrCmp $0 1000 0 again2 + Banner::destroy FunctionEnd diff --git a/Contrib/Banner/Readme.txt b/Contrib/Banner/Readme.txt index 74393a47..35dd28e8 100644 --- a/Contrib/Banner/Readme.txt +++ b/Contrib/Banner/Readme.txt @@ -10,6 +10,8 @@ Usage Banner::show /NOUNLOAD "Text to show" +[optional] Banner::getWindow /NOUNLOAD + Banner::destroy See Example.nsi for an example. diff --git a/Plugins/Banner.dll b/Plugins/Banner.dll index 34fce60331db5a13f6ca6f4259709eb77dec31fd..28c2257a12cfaf2682c81a3a0d6e0c312a85d002 100644 GIT binary patch delta 1325 zcmchW-%ngc6vt(*{#dE0Sb3* ziNsw)c~~~2(945HO^Vnz+ce>!n$%`P)xI=p#l{~YXbg#K)*ooJu@B|?om&$93!LOL zGv9O0oO5RGZc0t5Gka)u*8f<0|GB2i_g(Fp`?>N|Mo1I^!`3sjnjW`~xEdrCa<=O3;vHt> zmUj82cG9+p*6}IN=qMa^g1F>R_wSKHt40 zlX+RRIGHu?&*+oa&FbmLr69_CZ3UN>Gq($O#$%+Ztq|u_zMwwa(z7IylkReVAxuGA zX&0gXC&j#;e=tTvq3OVy0Y@85$nAxMYJtjo(~W8ak!@v4H-yATN|c zPY1m9*Mr7pV4^U(A)`mbR!WgzLBr|1((GhOY>5@yiVX9-Fz@~(@gwSZp<`})vrZ7I z=g_5FALEuWN>By)o>lkb0YCB@IlMpVxisMyZ4k40UbJOQWDA3_7F(%62D{PebX~lS z^G1qKRCU@WX^*o>>*8IkRd-oU6wYQ-D@=@qIyy6c6*5NcuQHWk?1H$n=}a ztq+x=l9*EH!B!56fOMPYvz0DvQLhvq%sS*Lqw-?HQ$v##RfIeMn!r<_3-p3vFb<}G z7-z9w1fPQ+z@NZ_A9pFJ1G_*Qcn(B?38uhX;2gLD#CT727H2wDMal?);miLRR}fgI z&Q@(5_}^NyZWbOWzfce#HAnh~#|B%;uk?xd&)_8oV-|8&-uH>5Q=;-jsz@T}! z)oLtG_7dlBE^g6OO$fzWu!#>^13GBClaQ4yguDb=q4$Ci5GP#Z(Z0dK$jFXxJWj$9 z)E*imFGkGHfx+<5QEQ|4tg9xmxKU!$q)fc8Z;5XV`gmfn8>wv1@FVt+AijI-|UZZ{-zy pJ7@e69^eOfjGH{k)BJ7z4nM=+=S%!s{yqPNyZ+*fM_jMce*pZPWJCY} delta 1169 zcmcJO?@t^>7{_NW%XyS-T?k9KC}xpu(?+c`d)OA?lv>W#goI0vTOhy@1oV1AYG5zg z2IXoc6<4aq^2(&GlxWkWi6p!*eL-^pts&Y*Qw=62)l?I&IW#qm=$krz=OpnjaFfqG z^L>8KPIfa!#(1xZew7U$*!R<=J)d8=);aqhU9$_&=4U0d=V9;umYn?vw)5AXqCI?M zASrXRwbg1gLP#rB$nXB=pU!^yAblfyyRCHLVM5voA%ot2T1SVyeqX&}KxS(n*s|Lh zdeuSf3!k@4cTmN5roA$#E0SO6+)t@J=Ze13TeUGttyK;wJV51=*_1($e?AXTTTA^>r<4WKNYw zoXk19TsFDk)J;FDL@`?xIzf`VRfb)^Jw=6HU93v1gmQ`I74L5)IDtFSqC#(xnc-%+ z-YGniqOsU?0dB00G%ok zn-dQ~C3;up; zGX9#UDshq|kxK^ULXXOXsTQ+Z=&jh|_A39qV!U3lFe<+7>+LQCQbD1si{JaVQ}1Qp z3lkN!gggW+&scfkMz*%9_kTT(r)Yfz=pR8I+$<;L zCGaQq0?5o~`bS2FMt2Vm50k;6F=zDXF*24s`U?Ked;VDa{`Th%ES9TxXqJ_wG(v_^ z6J*<2h^5##JI&6pi)@LlvRf?A?y{{s$PK=OH}HeJjmP-_PxIIKB%k5$^Yi=y|CnFq uSNJObny>L6_#a%cwpl@|&f04=SqH7dR*&Ua$E{P=yNf5bO;9gGtNsBkjzx3;