From 8300eae52eed1c59ffb8743bb7874ad6c1c3f3c4 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 15 Nov 2002 12:07:07 +0000 Subject: [PATCH] /WAIT works again git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1712 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/BgImage/BgImage.cpp | 7 ++++++- Plugins/BgImage.dll | Bin 4608 -> 4608 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp index e5c4be3a..d7751816 100644 --- a/Contrib/BgImage/BgImage.cpp +++ b/Contrib/BgImage/BgImage.cpp @@ -105,9 +105,14 @@ extern "C" void __declspec(dllexport) Destroy(HWND hwndParent, int string_size, } extern "C" void __declspec(dllexport) Sound(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) { + DWORD flags = SND_FILENAME|SND_NODEFAULT; g_stacktop=stacktop; popstring(temp); - PlaySound(temp, 0, SND_ASYNC|SND_FILENAME|SND_NODEFAULT); + if (lstrcmp(temp, "/WAIT")) + flags |= SND_ASYNC; + else + popstring(temp); + PlaySound(temp, 0, flags); } BOOL WINAPI _DllMainCRTStartup(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) { diff --git a/Plugins/BgImage.dll b/Plugins/BgImage.dll index b9f4c03b31ac24778887a6985bd7fffb5aefbe28..47d1c66f26fdbc9b68eaa00f83f9a3e56e861d2f 100644 GIT binary patch delta 892 zcmZWoT}TvB6ux(y{V~=U$^m;=vsyB=aGN_z$rh~O)GApcYctx9MM!Kzg2FBc8E&ZI zG78E(g+y%ALj^^&Pm$#221`Vc6ebmjLa?$v_)-)_w{yp!pqb&`d%kn5Xjep@+Js?R#4uR!CX)lr>(<$bPsdTG#ZM-OhY{|8koMXcQN}${oMRFRbyt4 z^?={r-3MT@B934x9sruIlHUv+t3iTptgCb(KD`CPf6}CvF4%)m%DL{-FY_nOwc)iY zQ}M;@%MfTPm6~p+VAoWH*#SW8aWM4aL#xiUYlu}q7j&EDFJ9$Xj?Ls_+RyB?pY3MG zz&)H#cvLF#klTQ||5hKDJ7z%u#6L5`+L2w<-CCZML zJX-NAY<1}d0=&;*W+c4Lx=M19IUjP=S2KOqb$6Y_dP2o0I2v0uc>b?;^$94XZd@U# zdC*#M2Y0d~rK5Z)IiWn#RnWH?7}T`lqhckjXlTrmJr~LuJ9IxZV%_r8;FOi~RKvLB z+1A9mjS`I+)_-j{=T(ge756%!&XriFiGXk72oFuE0W{;>4wQB~i*&F%pKbEq$B#D! z%HU7P?yiuqt3hvS=>Yf+<^_aiESJ#RdP=$|^-81ClyqBqExnbNq|Z`G`X%wCfka3v sQHe$_kx6os+$CA^lsqT%{4$2W(k&nySey$n+26A5}pa1{> delta 811 zcmZWnO=uHA6rS0pO&XH2v<=js)JlUbt%Y=E7YtG8!IcOt-Lkr=SZXaj#09a%1PX>W zQU${z7zP9{N?0!*1T`WR#Fj>gB8UZvK~c!b6np4NDip>yi3h>mWoO?v-+S-d?@cC@ z3Eink2dcR*-S|rG_cgrA79@o|!hJZxHt{&V#STk-SSp;BN_Z$ejAWjI$EVk-2%-FB z7|APdWcsV5eGCI&mb6bzu$HvS5+*!u<1Kvxx5vZfx%ArU<9l zW7nbS1b``j0>M(-4`t5%4BF~w50c~7j?T-8rFKZ)<0%g>J4ujoVfy^L;#qrpWxLDP ze1ii9&kZ#3v`R!hI%7z@W2^>qeVv$Q*z>%C^aTZZC!_7zdcr)u(}`_0V^*mMvEzr zt!+E-y)4^)Q7rmC)oPFJWa~jBD1JN{v*ZaK+$sO-jv+!(q+u3U>myJ_0uM|=hXlq5 z83z9gO#xK5#X@j{=mzsRz(xCHC@Pz;>z)XM%-TiBExAHXNCLLW1M@(e7Ce_D21nON zHhidVu%1sar)7W$+j$@cJgdWm>wiI8FTn)8aY{f|lJS->PP4GP2WQxXd$v`SfGMhJ z_6o2?_RZZ5?>+avgF+NaM)G2g=E}N9w?=s2DD>j$92@p@dh26F*_QlbVchc+vy2pc z<_$H$`7Ipr6I_^Wdw_FcuS-T~l{L$kPZ{JANs^o733)*_$XoJ(RLKw0PJ8JPr8GiE n=~bGcHoZ&l(}(mqU85EHoo>-xiWI-nq4X;K%CJ&ckYe}`dyxlB