From 90d227e0950dc9387a23e48b51e18dd9c4dbafec Mon Sep 17 00:00:00 2001 From: kichik Date: Wed, 26 Mar 2003 23:00:53 +0000 Subject: [PATCH] (brainsucker) new system build. now work's at the kichik's computer too :) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2377 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/System/SysFunc.nsh | 2 -- Contrib/System/System.nsi | 6 +++++- Plugins/System.dll | Bin 9216 -> 9216 bytes 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Contrib/System/SysFunc.nsh b/Contrib/System/SysFunc.nsh index c34ffa2e..2c967376 100644 --- a/Contrib/System/SysFunc.nsh +++ b/Contrib/System/SysFunc.nsh @@ -190,7 +190,6 @@ Function _systemSplashWndCB goto default m_Create: - ; Create structures System::Call "*${stRECT} (_) .R8" System::Call "*${stBITMAP} (_, &l0 .R7) .R9" @@ -242,7 +241,6 @@ m_Create: goto exit m_Paint: - ; Create structures System::Call "*${stRECT} (_) .R8" System::Call "*${stPAINTSTRUCT} (_) .R9" diff --git a/Contrib/System/System.nsi b/Contrib/System/System.nsi index 52c4834a..834908df 100644 --- a/Contrib/System/System.nsi +++ b/Contrib/System/System.nsi @@ -115,9 +115,10 @@ enumex: ; End of drives or user cancel ; Logo File /oname=spltmp.bmp "${NSISDIR}\Contrib\Makensisw\logo.bmp" +; File /oname=spltmp.wav "${WINDIR}\media\Windows XP Startup.wav" ; I. systemSplash variant - !insertmacro smSystemSplash 2000 "$TEMP\spltmp" + !insertmacro smSystemSplash 500 "$TEMP\spltmp" ; II. Splash Plugin variant ; splash::show 2000 $TEMP\spltmp @@ -125,14 +126,17 @@ enumex: ; End of drives or user cancel ; remove logo Delete $TEMP\spltmp.bmp +; Delete $TEMP\spltmp.wav ; Display splash result + pop $0 MessageBox MB_OK "Splash (callbacks) demo result $R0" ; last plugin call must not have /NOUNLOAD so NSIS will be able to delete the temporary DLL SetPluginUnload manual ; do nothing System::Free 0 + SectionEnd ; eof diff --git a/Plugins/System.dll b/Plugins/System.dll index ea89bf5b9c5f3280edb3c5ef72787550742fb772..c99d780cf6f7e3584941106f1173ff1596312c02 100644 GIT binary patch delta 870 zcmX9-T})g>6rNcwEagX*W`V%&CWwoqX;WwJ>|P`&&``sbpkBFU;WiaWe^P9*irxj3 zzqL1LwwonwCjLA?wf@AI_+r)&cqydqgCx?V4~izdm|!~1s31hTNipMG`gG3B`M&Rb z=VT_KC-kcfJ0B3AZ z#FZ4`p41Mzxg$i1rCPHN1NJ4|KCj!|x_wx;%k}t0K?WiS__{>d5gD92MZCvp0t-Fz z5YJsOWH5NM&_r3aOjFq#dJFJ1X2)~Vqaxh~4WUVhWEYQ0Qc3++>O9B-M6dhr|!-LLv*bhq5 zhz|OngEunY`ag&8#Y}toD1;4}+Z7mA4F4m9^h{P7UiR4~rii=Jte+NE_MTjI$KKlg zz$f>iSTQ@qmbZk6F(NqzYx#ShX*_Poku#|PJIu=Wi%-d7>Ur0RWf@}av4$sJ7!zwe zkG)H8SK_*l|C07=rTr(IY~|De-C+5W#SbQDj>v|*aDQ;tM*~&Ot?uq5^0>+JB*tLA z|J-4dUak(fi#A1BScYUCuQA!qpHjtdvURC%CG(Oog%_FZE}g47QToER^!2MVra;T~ zn(Wa->Ivw@(X0?AJG<#B57F*G9n|PlprYo%L$}KXua%B(?0ntV%O&M!_s$h?`B&&d zpq9=CBbi9h4=b+c48CK(J$UZYF#tZ=&(FN^*6YV;UnuH6Kl(|iws`w#0M<(ZICT(! z!OTjiQGq|w+?u7S&F0-^Pz}HW03ZhypfVIh2z4M6jiYbSB3eTC&~IoDd9W9k;~;(# zAHo`L#BKN`+=+W|FFuED{2or=8TNmCTXv$vjyle~`||`N-+$P;@N%Vf2USYV=uc YLi<$vO#4aO)0Fy>dZ(V(%fEE_e@;JVg8%>k delta 829 zcmX9-Ye-Z<7@b*HP19U$T_5X))tdBBXYTCYMT-_q@&-{Gw>EF|5PDf@MBS}Wakbln zWw8fSMj+LnqJkn=2%{j2AOoWx5flXxNetW`nwc9|)7GI`BRm4HCp242el%W{gMcHvvF{-)p8=U^$DiR3zrBmp5~Y}#&R&&EGCik!H|HE zS;}S8rSijeF0=kg&doPsVYqc|iuXF+izf z33aDnE`v`KBhIT3wk6tKMdwk{j9(v1B&=@2pPT3Gk6Ph*^iSy*sFZ2PwqGxWcqiHvSL(7miSwYicG zmw4a+{ak`8?|&6GD}>EiMzSQDrG(gGK{X3vrvW221 z#2kODP_ax?YPHTuq$?K?%P{Au%w_31RmKHsv5Z*QZsw?LoDP+)&u{%PG|U z4!Vclq7P^kO`zZCFUr8PaWVGdMYsn0@lxD?*WrzL3*LvLcmQ9=@9`)e#~ja^ zm((fsN>sWcC8WpF3+a`_q;FC#ag$n7PZYA6YzUA|q=oDz?WBX8CY0PFPe_fg(HHcu j@i+T-_|N%o`3vPuazyTuZ_01wkMb9}B`_QiU*zOJAi`T&