Skip to content

W
wine-cw
Commit e1d59b94 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

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 with 6 additions and 10 deletions
dlls/dsound/capture.c
View file @ e1d59b94
...@@ -410,16 +410,12 @@ static void capture_CheckNotify(IDirectSoundCaptureBufferImpl *This, DWORD from, ...@@ -410,16 +410,12 @@ static void capture_CheckNotify(IDirectSoundCaptureBufferImpl *This, DWORD from,
} }
static void CALLBACK static void CALLBACK
DSOUND_capture_callback( DSOUND_capture_callback(HWAVEIN hwi, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1,
HWAVEIN hwi, DWORD_PTR dw2)
UINT msg,
DWORD dwUser,
DWORD dw1,
DWORD dw2 )
{ {
DirectSoundCaptureDevice * This = (DirectSoundCaptureDevice*)dwUser; DirectSoundCaptureDevice * This = (DirectSoundCaptureDevice*)dwUser;
IDirectSoundCaptureBufferImpl * Moi = This->capture_buffer; IDirectSoundCaptureBufferImpl * Moi = This->capture_buffer;
TRACE("(%p,%08x(%s),%08x,%08x,%08x) entering at %d\n",hwi,msg, TRACE("(%p,%08x(%s),%08lx,%08lx,%08lx) entering at %d\n",hwi,msg,
msg == MM_WIM_OPEN ? "MM_WIM_OPEN" : msg == MM_WIM_CLOSE ? "MM_WIM_CLOSE" : 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()); msg == MM_WIM_DATA ? "MM_WIM_DATA" : "UNKNOWN",dwUser,dw1,dw2,GetTickCount());
...@@ -1157,7 +1153,7 @@ IDirectSoundCaptureBufferImpl_Start( ...@@ -1157,7 +1153,7 @@ IDirectSoundCaptureBufferImpl_Start(
else else
device->pwave[c].dwBufferLength = blocksize; device->pwave[c].dwBufferLength = blocksize;
device->pwave[c].dwBytesRecorded = 0; 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].dwFlags = 0;
device->pwave[c].dwLoops = 0; device->pwave[c].dwLoops = 0;
hres = mmErr(waveInPrepareHeader(device->hwi, &(device->pwave[c]),sizeof(WAVEHDR))); hres = mmErr(waveInPrepareHeader(device->hwi, &(device->pwave[c]),sizeof(WAVEHDR)));
...@@ -1460,7 +1456,7 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( ...@@ -1460,7 +1456,7 @@ HRESULT IDirectSoundCaptureBufferImpl_Create(
DWORD flags = CALLBACK_FUNCTION; DWORD flags = CALLBACK_FUNCTION;
err = mmErr(waveInOpen(&(device->hwi), err = mmErr(waveInOpen(&(device->hwi),
device->drvdesc.dnDevNode, device->pwfx, 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) { if (err != DS_OK) {
WARN("waveInOpen failed\n"); WARN("waveInOpen failed\n");
This->device->capture_buffer = 0; This->device->capture_buffer = 0;
......
dlls/dsound/primary.c
View file @ e1d59b94
...@@ -253,7 +253,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) ...@@ -253,7 +253,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)
for (c=0; c<device->helfrags; c++) { for (c=0; c<device->helfrags; c++) {
device->pwave[c].lpData = (char*)device->buffer + c*device->fraglen; device->pwave[c].lpData = (char*)device->buffer + c*device->fraglen;
device->pwave[c].dwBufferLength = 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].dwFlags = 0;
device->pwave[c].dwLoops = 0; device->pwave[c].dwLoops = 0;
err = mmErr(waveOutPrepareHeader(device->hwo,&device->pwave[c],sizeof(WAVEHDR))); err = mmErr(waveOutPrepareHeader(device->hwo,&device->pwave[c],sizeof(WAVEHDR)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment