Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
07dc3c54
Commit
07dc3c54
authored
Jan 18, 2006
by
Alex Villacís Lasso
Committed by
Alexandre Julliard
Jan 18, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msacm: reroute all SendDriverMessage() calls to MSACM_Message.
parent
d20addf4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
driver.c
dlls/msacm/driver.c
+1
-1
stream.c
dlls/msacm/stream.c
+8
-8
No files found.
dlls/msacm/driver.c
View file @
07dc3c54
...
...
@@ -447,7 +447,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA
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
)
{
...
...
dlls/msacm/stream.c
View file @
07dc3c54
...
...
@@ -64,7 +64,7 @@ MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose)
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(HACMSTREAM has, PACMSTREAMHEADER pash,
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(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw
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(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw
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(HACMSTREAM has, PACMSTREAMHEADER pash,
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(HACMSTREAM has, DWORD fdwReset)
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 has, DWORD cbInput,
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(HACMSTREAM has, PACMSTREAMHEADER pash,
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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment