Ken Thomases : winecoreaudio:
Improve safety of iterations when returning WAVEHDRs to client.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jul 12 08:32:25 CDT 2007
Module: wine
Branch: master
Commit: 438c748953b4b9dc33d5c6f04925a6be2b5a9161
URL: http://source.winehq.org/git/wine.git/?a=commit;h=438c748953b4b9dc33d5c6f04925a6be2b5a9161
Author: Ken Thomases <ken at codeweavers.com>
Date: Wed Jul 11 20:34:45 2007 -0500
winecoreaudio: Improve safety of iterations when returning WAVEHDRs to client.
---
dlls/winecoreaudio.drv/audio.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c
index 15322df..26a8c8a 100644
--- a/dlls/winecoreaudio.drv/audio.c
+++ b/dlls/winecoreaudio.drv/audio.c
@@ -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);
More information about the wine-cvs
mailing list