ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed improper acm streams closing.

This commit is contained in:
Eric Pouech 1999-12-05 02:17:18 +00:00 committed by Alexandre Julliard
parent 382c9a1ad2
commit ba42b262d1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/msacm32/stream.c
View File

@ -45,7 +45,8 @@ MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose)
} }
ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_CLOSE, (DWORD)&was->drvInst, 0); ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_CLOSE, (DWORD)&was->drvInst, 0);
if (ret == MMSYSERR_NOERROR) { if (ret == MMSYSERR_NOERROR) {
/* FIXME: shall the was->pDrv->hDrvr be also closed ? */ if (was->hAcmDriver)
acmDriverClose(was->hAcmDriver, 0L);
HeapFree(MSACM_hHeap, 0, was); HeapFree(MSACM_hHeap, 0, was);
} }
TRACE("=> (%d)\n", ret); TRACE("=> (%d)\n", ret);
@ -166,7 +167,8 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw
was->obj.pACMDriverID = wad->obj.pACMDriverID; was->obj.pACMDriverID = wad->obj.pACMDriverID;
was->pDrv = wad; was->pDrv = wad;
was->hAcmDriver = 0; /* not to close it in acmStreamClose */
ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (DWORD)&was->drvInst, 0L); ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (DWORD)&was->drvInst, 0L);
if (ret != MMSYSERR_NOERROR) if (ret != MMSYSERR_NOERROR)
goto errCleanUp; goto errCleanUp;
@ -180,6 +182,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw
if ((wad = MSACM_GetDriver(had)) != 0) { if ((wad = MSACM_GetDriver(had)) != 0) {
was->obj.pACMDriverID = wad->obj.pACMDriverID; was->obj.pACMDriverID = wad->obj.pACMDriverID;
was->pDrv = wad; was->pDrv = wad;
was->hAcmDriver = had;
ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (DWORD)&was->drvInst, 0L); ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (DWORD)&was->drvInst, 0L);
/* FIXME: when shall the acmDriver be Close():d ? */ /* FIXME: when shall the acmDriver be Close():d ? */

1
dlls/msacm32/wineacm.h
View File

@ -22,6 +22,7 @@ typedef struct _WINE_ACMSTREAM
WINE_ACMOBJ obj; WINE_ACMOBJ obj;
PWINE_ACMDRIVER pDrv; PWINE_ACMDRIVER pDrv;
ACMDRVSTREAMINSTANCE drvInst; ACMDRVSTREAMINSTANCE drvInst;
HACMDRIVER hAcmDriver;
} WINE_ACMSTREAM, *PWINE_ACMSTREAM; } WINE_ACMSTREAM, *PWINE_ACMSTREAM;
typedef struct _WINE_ACMDRIVERID typedef struct _WINE_ACMDRIVERID