Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
e1d59b94
Commit
e1d59b94
authored
Feb 11, 2009
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Feb 12, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dsound: Arguments 3,4,5 of a CALLBACK are of type DWORD_PTR.
(LPWAVEHDR)->dwUser is also a DWORD_PTR.
parent
044e76df
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
10 deletions
+6
-10
capture.c
dlls/dsound/capture.c
+5
-9
primary.c
dlls/dsound/primary.c
+1
-1
No files found.
dlls/dsound/capture.c
View file @
e1d59b94
...
...
@@ -410,16 +410,12 @@ static void capture_CheckNotify(IDirectSoundCaptureBufferImpl *This, DWORD from,
}
static
void
CALLBACK
DSOUND_capture_callback
(
HWAVEIN
hwi
,
UINT
msg
,
DWORD
dwUser
,
DWORD
dw1
,
DWORD
dw2
)
DSOUND_capture_callback
(
HWAVEIN
hwi
,
UINT
msg
,
DWORD_PTR
dwUser
,
DWORD_PTR
dw1
,
DWORD_PTR
dw2
)
{
DirectSoundCaptureDevice
*
This
=
(
DirectSoundCaptureDevice
*
)
dwUser
;
IDirectSoundCaptureBufferImpl
*
Moi
=
This
->
capture_buffer
;
TRACE
(
"(%p,%08x(%s),%08
x,%08x,%08
x) entering at %d
\n
"
,
hwi
,
msg
,
TRACE
(
"(%p,%08x(%s),%08
lx,%08lx,%08l
x) entering at %d
\n
"
,
hwi
,
msg
,
msg
==
MM_WIM_OPEN
?
"MM_WIM_OPEN"
:
msg
==
MM_WIM_CLOSE
?
"MM_WIM_CLOSE"
:
msg
==
MM_WIM_DATA
?
"MM_WIM_DATA"
:
"UNKNOWN"
,
dwUser
,
dw1
,
dw2
,
GetTickCount
());
...
...
@@ -1157,7 +1153,7 @@ IDirectSoundCaptureBufferImpl_Start(
else
device
->
pwave
[
c
].
dwBufferLength
=
blocksize
;
device
->
pwave
[
c
].
dwBytesRecorded
=
0
;
device
->
pwave
[
c
].
dwUser
=
(
DWORD
)
device
;
device
->
pwave
[
c
].
dwUser
=
(
DWORD
_PTR
)
device
;
device
->
pwave
[
c
].
dwFlags
=
0
;
device
->
pwave
[
c
].
dwLoops
=
0
;
hres
=
mmErr
(
waveInPrepareHeader
(
device
->
hwi
,
&
(
device
->
pwave
[
c
]),
sizeof
(
WAVEHDR
)));
...
...
@@ -1460,7 +1456,7 @@ HRESULT IDirectSoundCaptureBufferImpl_Create(
DWORD
flags
=
CALLBACK_FUNCTION
;
err
=
mmErr
(
waveInOpen
(
&
(
device
->
hwi
),
device
->
drvdesc
.
dnDevNode
,
device
->
pwfx
,
(
DWORD_PTR
)
DSOUND_capture_callback
,
(
DWORD
)
device
,
flags
));
(
DWORD_PTR
)
DSOUND_capture_callback
,
(
DWORD
_PTR
)
device
,
flags
));
if
(
err
!=
DS_OK
)
{
WARN
(
"waveInOpen failed
\n
"
);
This
->
device
->
capture_buffer
=
0
;
...
...
dlls/dsound/primary.c
View file @
e1d59b94
...
...
@@ -253,7 +253,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)
for
(
c
=
0
;
c
<
device
->
helfrags
;
c
++
)
{
device
->
pwave
[
c
].
lpData
=
(
char
*
)
device
->
buffer
+
c
*
device
->
fraglen
;
device
->
pwave
[
c
].
dwBufferLength
=
device
->
fraglen
;
device
->
pwave
[
c
].
dwUser
=
(
DWORD
)
device
;
device
->
pwave
[
c
].
dwUser
=
(
DWORD
_PTR
)
device
;
device
->
pwave
[
c
].
dwFlags
=
0
;
device
->
pwave
[
c
].
dwLoops
=
0
;
err
=
mmErr
(
waveOutPrepareHeader
(
device
->
hwo
,
&
device
->
pwave
[
c
],
sizeof
(
WAVEHDR
)));
...
...
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