system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 07:44:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

winecoreaudio: Improve safety of iterations when returning WAVEHDRs to client.

Browse source
This commit is contained in:
Ken Thomases 2007-07-11 20:34:45 -05:00 committed by Alexandre Julliard
parent 1b4ad056b3
commit 438c748953
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/winecoreaudio.drv/audio.c
View file

@ -1059,12 +1059,16 @@ static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo)
*/
static void wodHelper_NotifyDoneForList(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr)
{
for ( ; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext)
while (lpWaveHdr)
{
LPWAVEHDR lpNext = lpWaveHdr->lpNext;
lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0);
lpWaveHdr = lpNext;
}
}
@ -1670,12 +1674,17 @@ static void widHelper_NotifyCompletions(WINE_WAVEIN* wwi)
OSSpinLockUnlock(&wwi->lock);
/* Now, send the "done" notification for each header in our list. */
for (lpWaveHdr = lpFirstDoneWaveHdr; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext)
lpWaveHdr = lpFirstDoneWaveHdr;
while (lpWaveHdr)
{
LPWAVEHDR lpNext = lpWaveHdr->lpNext;
lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);
lpWaveHdr = lpNext;
}
}
@ -2074,6 +2083,7 @@ static DWORD widStop(WORD wDevID)
if (lpWaveHdr)
{
lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);
@ -2130,6 +2140,7 @@ static DWORD widReset(WORD wDevID)
{
WAVEHDR* lpNext = lpWaveHdr->lpNext;
lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);