Alex VillacÃs Lasso : msacm: reroute all SendDriverMessage() calls to MSACM_Message.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jan 18 05:28:43 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 07dc3c54037af005f9b2711b91080ae7bacc1830
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07dc3c54037af005f9b2711b91080ae7bacc1830
Author: Alex Villacís Lasso <a_villacis at palosanto.com>
Date: Wed Jan 18 12:13:51 2006 +0100
msacm: reroute all SendDriverMessage() calls to MSACM_Message.
---
dlls/msacm/driver.c | 2 +-
dlls/msacm/stream.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/msacm/driver.c b/dlls/msacm/driver.c
index 633c8bd..5cb56c5 100644
--- a/dlls/msacm/driver.c
+++ b/dlls/msacm/driver.c
@@ -447,7 +447,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV
if (padid) {
/* Handle is really an HACMDRIVERID, must have an open session to get an HACMDRIVER */
if (padid->pACMDriverList != NULL) {
- lResult = SendDriverMessage(padid->pACMDriverList->hDrvr, uMsg, lParam1, lParam2);
+ lResult = MSACM_Message((HACMDRIVER)padid->pACMDriverList, uMsg, lParam1, lParam2);
} else {
MMRESULT mmr = acmDriverOpen(&had, (HACMDRIVERID)padid, 0);
if (mmr != MMSYSERR_NOERROR) {
diff --git a/dlls/msacm/stream.c b/dlls/msacm/stream.c
index cde8e4d..3c9ecf2 100644
--- a/dlls/msacm/stream.c
+++ b/dlls/msacm/stream.c
@@ -64,7 +64,7 @@ MMRESULT WINAPI acmStreamClose(HACMSTREA
WARN("invalid handle\n");
return MMSYSERR_INVALHANDLE;
}
- ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_CLOSE, (LPARAM)&was->drvInst, 0);
+ ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_CLOSE, (LPARAM)&was->drvInst, 0);
if (ret == MMSYSERR_NOERROR) {
if (was->hAcmDriver)
acmDriverClose(was->hAcmDriver, 0L);
@@ -119,7 +119,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTR
padsh->fdwConvert = fdwConvert;
- ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_CONVERT, (LPARAM)&was->drvInst, (LPARAM)padsh);
+ ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_CONVERT, (LPARAM)&was->drvInst, (LPARAM)padsh);
if (ret == MMSYSERR_NOERROR) {
padsh->fdwStatus |= ACMSTREAMHEADER_STATUSF_DONE;
}
@@ -231,7 +231,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREA
was->pDrv = wad;
was->hAcmDriver = 0; /* not to close it in acmStreamClose */
- ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (LPARAM)&was->drvInst, 0L);
+ ret = MSACM_Message((HACMDRIVER)wad, ACMDM_STREAM_OPEN, (LPARAM)&was->drvInst, 0L);
if (ret != MMSYSERR_NOERROR)
goto errCleanUp;
} else {
@@ -252,7 +252,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREA
was->pDrv = wad;
was->hAcmDriver = had;
- ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (LPARAM)&was->drvInst, 0L);
+ ret = MSACM_Message((HACMDRIVER)wad, ACMDM_STREAM_OPEN, (LPARAM)&was->drvInst, 0L);
TRACE("%s => %08x\n", debugstr_w(wadi->pszDriverAlias), ret);
if (ret == MMSYSERR_NOERROR) {
if (fdwOpen & ACM_STREAMOPENF_QUERY) {
@@ -329,7 +329,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(H
padsh->pbPreparedDst = 0;
padsh->cbPreparedDstLength = 0;
- ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_PREPARE, (LPARAM)&was->drvInst, (DWORD)padsh);
+ ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_PREPARE, (LPARAM)&was->drvInst, (DWORD)padsh);
if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) {
ret = MMSYSERR_NOERROR;
padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE);
@@ -369,7 +369,7 @@ MMRESULT WINAPI acmStreamReset(HACMSTREA
WARN("invalid handle\n");
return MMSYSERR_INVALHANDLE;
} else if (was->drvInst.fdwOpen & ACM_STREAMOPENF_ASYNC) {
- ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_RESET, (LPARAM)&was->drvInst, 0);
+ ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_RESET, (LPARAM)&was->drvInst, 0);
}
TRACE("=> (%d)\n", ret);
return ret;
@@ -414,7 +414,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM
adss.cbStruct = sizeof(adss);
adss.fdwSize = fdwSize;
- ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_SIZE,
+ ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_SIZE,
(LPARAM)&was->drvInst, (LPARAM)&adss);
if (ret == MMSYSERR_NOERROR) {
switch (fdwSize & ACM_STREAMSIZEF_QUERYMASK) {
@@ -472,7 +472,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader
padsh->fdwConvert = fdwUnprepare;
- ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_UNPREPARE, (LPARAM)&was->drvInst, (LPARAM)padsh);
+ ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_UNPREPARE, (LPARAM)&was->drvInst, (LPARAM)padsh);
if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) {
ret = MMSYSERR_NOERROR;
padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED);
More information about the wine-cvs
mailing list