Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 16:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC][WINMM] Allow new sounds to interrupt previous PlaySound invocations

Browse source 
Wine commit: 197607db2e06f28b666da9ce88b69c9994c1bb65

author: Jörg Höhle <hoehle@users.sourceforge.net>
Tue, 14 Feb 2012 18:27:30 +0000 (19:27 +0100)

committer: Alexandre Julliard <julliard@winehq.org>
Thu, 16 Feb 2012 17:51:56 +0000 (18:51 +0100)
This commit is contained in:
Thamatip Chitpong 2023-06-14 08:49:32 +07:00 • committed by Stanislav Motylkov
parent 8c5cacf8a0
commit 41874cccc5
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
dll/win32/winmm/playsound.c
View file

@ -31,10 +31,10 @@ typedef struct tagWINE_PLAYSOUND
{ {
unsigned bLoop : 1; unsigned bLoop : 1;
HMMIO hmmio; HMMIO hmmio;
struct tagWINE_PLAYSOUND* lpNext; HWAVEOUT hWave;
} WINE_PLAYSOUND; } WINE_PLAYSOUND;
static WINE_PLAYSOUND *PlaySoundList; static WINE_PLAYSOUND *PlaySoundCurrent;
static BOOL bPlaySoundStop; static BOOL bPlaySoundStop;
static HMMIO get_mmioFromFile(LPCWSTR lpszName) static HMMIO get_mmioFromFile(LPCWSTR lpszName)
@ -369,12 +369,9 @@ static BOOL PlaySound_IsString(DWORD fdwSound, const void* psz)
static void PlaySound_Free(WINE_PLAYSOUND* wps) static void PlaySound_Free(WINE_PLAYSOUND* wps)
{ {
WINE_PLAYSOUND** p;
EnterCriticalSection(&WINMM_cs); EnterCriticalSection(&WINMM_cs);
for (p = &PlaySoundList; *p && *p != wps; p = &((*p)->lpNext)); PlaySoundCurrent = NULL;
if (*p) *p = (*p)->lpNext; SetEvent(psLastEvent);
if (PlaySoundList == NULL) SetEvent(psLastEvent);
LeaveCriticalSection(&WINMM_cs); LeaveCriticalSection(&WINMM_cs);
if (wps->hmmio) mmioClose(wps->hmmio, 0); if (wps->hmmio) mmioClose(wps->hmmio, 0);
HeapFree(GetProcessHeap(), 0, wps); HeapFree(GetProcessHeap(), 0, wps);
@ -475,7 +472,7 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps)
(LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize);
s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
if (!s.hEvent) if (!s.hEvent || bPlaySoundStop)
goto errCleanUp; goto errCleanUp;
if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback,
@ -499,6 +496,7 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps)
goto errCleanUp; goto errCleanUp;
} }
wps->hWave = hWave;
s.dwEventCount = 1L; /* for first buffer */ s.dwEventCount = 1L; /* for first buffer */
index = 0; index = 0;
@ -510,7 +508,6 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps)
{ {
if (bPlaySoundStop) if (bPlaySoundStop)
{ {
waveOutReset(hWave);
wps->bLoop = FALSE; wps->bLoop = FALSE;
break; break;
} }
@ -540,7 +537,15 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps)
errCleanUp: errCleanUp:
TRACE("Done playing sound => %s!\n", bRet ? "ok" : "ko"); TRACE("Done playing sound => %s!\n", bRet ? "ok" : "ko");
HeapFree(GetProcessHeap(), 0, lpWaveFormat); HeapFree(GetProcessHeap(), 0, lpWaveFormat);
if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); if (hWave)
{
EnterCriticalSection(&WINMM_cs);
/* the CS prevents a concurrent waveOutReset */
wps->hWave = 0;
LeaveCriticalSection(&WINMM_cs);
while (waveOutClose(hWave) == WAVERR_STILLPLAYING)
Sleep(100);
}
CloseHandle(s.hEvent); CloseHandle(s.hEvent);
HeapFree(GetProcessHeap(), 0, waveHdr); HeapFree(GetProcessHeap(), 0, waveHdr);
@ -585,7 +590,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo
pszSound, hmod, fdwSound); pszSound, hmod, fdwSound);
/* SND_NOWAIT is ignored in w95/2k/xp. */ /* SND_NOWAIT is ignored in w95/2k/xp. */
if ((fdwSound & SND_NOSTOP) && PlaySoundList != NULL) if ((fdwSound & SND_NOSTOP) && PlaySoundCurrent != NULL)
return FALSE; return FALSE;
/* alloc internal structure, if we need to play something */ /* alloc internal structure, if we need to play something */
@ -599,12 +604,14 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo
/* since several threads can enter PlaySound in parallel, we're not /* since several threads can enter PlaySound in parallel, we're not
* sure, at this point, that another thread didn't start a new playsound * sure, at this point, that another thread didn't start a new playsound
*/ */
while (PlaySoundList != NULL) while (PlaySoundCurrent != NULL)
{ {
ResetEvent(psLastEvent); ResetEvent(psLastEvent);
/* FIXME: doc says we have to stop all instances of pszSound if it's non /* FIXME: doc says we have to stop all instances of pszSound if it's non
* NULL... as of today, we stop all playing instances */ * NULL... as of today, we stop all playing instances */
bPlaySoundStop = TRUE; bPlaySoundStop = TRUE;
if (PlaySoundCurrent->hWave)
waveOutReset(PlaySoundCurrent->hWave);
LeaveCriticalSection(&WINMM_cs); LeaveCriticalSection(&WINMM_cs);
WaitForSingleObject(psLastEvent, INFINITE); WaitForSingleObject(psLastEvent, INFINITE);
@ -613,8 +620,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo
bPlaySoundStop = FALSE; bPlaySoundStop = FALSE;
} }
if (wps) wps->lpNext = PlaySoundList; PlaySoundCurrent = wps;
PlaySoundList = wps;
LeaveCriticalSection(&WINMM_cs); LeaveCriticalSection(&WINMM_cs);
if (!wps) return TRUE; if (!wps) return TRUE;