Tomas Carnecky : dsound: Update prototypes for
IDirectSoundBuffer::Lock/ Unlock.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Mar 8 15:35:51 CST 2007
Module: wine
Branch: master
Commit: 9b4f99782ef27239927a0c5d0ae8e788df17cb76
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4f99782ef27239927a0c5d0ae8e788df17cb76
Author: Tomas Carnecky <tom at dbservice.com>
Date: Thu Mar 8 14:48:45 2007 +0100
dsound: Update prototypes for IDirectSoundBuffer::Lock/Unlock.
---
dlls/dsound/buffer.c | 6 +++---
dlls/dsound/primary.c | 2 +-
dlls/quartz/dsoundrender.c | 2 +-
dlls/winedos/soundblaster.c | 2 +-
include/dsound.h | 8 ++++----
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index ec90164..45133d5 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -565,7 +565,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFormat(
}
static HRESULT WINAPI IDirectSoundBufferImpl_Lock(
- LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID lplpaudioptr1,LPDWORD audiobytes1,LPVOID lplpaudioptr2,LPDWORD audiobytes2,DWORD flags
+ LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID *lplpaudioptr1,LPDWORD audiobytes1,LPVOID *lplpaudioptr2,LPDWORD audiobytes2,DWORD flags
) {
HRESULT hres = DS_OK;
IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface;
@@ -1450,9 +1450,9 @@ static HRESULT WINAPI SecondaryBufferImpl_Lock(
LPDIRECTSOUNDBUFFER8 iface,
DWORD writecursor,
DWORD writebytes,
- LPVOID lplpaudioptr1,
+ LPVOID *lplpaudioptr1,
LPDWORD audiobytes1,
- LPVOID lplpaudioptr2,
+ LPVOID *lplpaudioptr2,
LPDWORD audiobytes2,
DWORD dwFlags)
{
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index b9bbddb..9a3498d 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -663,7 +663,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(
}
static HRESULT WINAPI PrimaryBufferImpl_Lock(
- LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID lplpaudioptr1,LPDWORD audiobytes1,LPVOID lplpaudioptr2,LPDWORD audiobytes2,DWORD flags
+ LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID *lplpaudioptr1,LPDWORD audiobytes1,LPVOID *lplpaudioptr2,LPDWORD audiobytes2,DWORD flags
) {
HRESULT hres;
DirectSoundDevice *device = ((PrimaryBufferImpl *)iface)->device;
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index 87a6f69..fe6152f 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -198,7 +198,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data,
}
size2 = min(buf_free, size);
- hr = IDirectSoundBuffer_Lock(This->dsbuffer, This->write_pos, size2, &lpbuf1, &dwsize1, &lpbuf2, &dwsize2, 0);
+ hr = IDirectSoundBuffer_Lock(This->dsbuffer, This->write_pos, size2, (LPVOID *)&lpbuf1, &dwsize1, (LPVOID *)&lpbuf2, &dwsize2, 0);
if (hr != DS_OK) {
ERR("Unable to lock sound buffer! (%x)\n", hr);
break;
diff --git a/dlls/winedos/soundblaster.c b/dlls/winedos/soundblaster.c
index ff40c41..07fc72f 100644
--- a/dlls/winedos/soundblaster.c
+++ b/dlls/winedos/soundblaster.c
@@ -94,7 +94,7 @@ static DWORD CALLBACK SB_Poll( void *dummy )
} else
continue;
- result = IDirectSoundBuffer_Lock(lpdsbuf,buf_off,size,&lpbuf1,&dwsize1,&lpbuf2,&dwsize2,0);
+ result = IDirectSoundBuffer_Lock(lpdsbuf,buf_off,size,(LPVOID *)&lpbuf1,&dwsize1,(LPVOID *)&lpbuf2,&dwsize2,0);
if (result != DS_OK) {
ERR("Unable to lock sound buffer !\n");
continue;
diff --git a/include/dsound.h b/include/dsound.h
index 49cd3ef..fc1eeff 100644
--- a/include/dsound.h
+++ b/include/dsound.h
@@ -544,7 +544,7 @@ DECLARE_INTERFACE_(IDirectSoundBuffer,IUnknown)
STDMETHOD(GetFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
STDMETHOD(GetStatus)(THIS_ LPDWORD lpdwStatus) PURE;
STDMETHOD(Initialize)(THIS_ LPDIRECTSOUND lpDirectSound, LPCDSBUFFERDESC lpcDSBufferDesc) PURE;
- STDMETHOD(Lock)(THIS_ DWORD dwWriteCursor, DWORD dwWriteBytes, LPVOID lplpvAudioPtr1, LPDWORD lpdwAudioBytes1, LPVOID lplpvAudioPtr2, LPDWORD lpdwAudioBytes2, DWORD dwFlags) PURE;
+ STDMETHOD(Lock)(THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1, LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
STDMETHOD(Play)(THIS_ DWORD dwReserved1, DWORD dwReserved2, DWORD dwFlags) PURE;
STDMETHOD(SetCurrentPosition)(THIS_ DWORD dwNewPosition) PURE;
STDMETHOD(SetFormat)(THIS_ LPCWAVEFORMATEX lpcfxFormat) PURE;
@@ -552,7 +552,7 @@ DECLARE_INTERFACE_(IDirectSoundBuffer,IUnknown)
STDMETHOD(SetPan)(THIS_ LONG lPan) PURE;
STDMETHOD(SetFrequency)(THIS_ DWORD dwFrequency) PURE;
STDMETHOD(Stop)(THIS) PURE;
- STDMETHOD(Unlock)(THIS_ LPVOID lpvAudioPtr1, DWORD dwAudioBytes1, LPVOID lpvAudioPtr2, DWORD dwAudioPtr2) PURE;
+ STDMETHOD(Unlock)(THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioPtr2) PURE;
STDMETHOD(Restore)(THIS) PURE;
};
#undef INTERFACE
@@ -627,7 +627,7 @@ DECLARE_INTERFACE_(IDirectSoundBuffer8,IUnknown)
STDMETHOD(GetFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
STDMETHOD(GetStatus)(THIS_ LPDWORD lpdwStatus) PURE;
STDMETHOD(Initialize)(THIS_ LPDIRECTSOUND lpDirectSound, LPCDSBUFFERDESC lpcDSBufferDesc) PURE;
- STDMETHOD(Lock)(THIS_ DWORD dwWriteCursor, DWORD dwWriteBytes, LPVOID lplpvAudioPtr1, LPDWORD lpdwAudioBytes1, LPVOID lplpvAudioPtr2, LPDWORD lpdwAudioBytes2, DWORD dwFlags) PURE;
+ STDMETHOD(Lock)(THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1, LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
STDMETHOD(Play)(THIS_ DWORD dwReserved1, DWORD dwReserved2, DWORD dwFlags) PURE;
STDMETHOD(SetCurrentPosition)(THIS_ DWORD dwNewPosition) PURE;
STDMETHOD(SetFormat)(THIS_ LPCWAVEFORMATEX lpcfxFormat) PURE;
@@ -635,7 +635,7 @@ DECLARE_INTERFACE_(IDirectSoundBuffer8,IUnknown)
STDMETHOD(SetPan)(THIS_ LONG lPan) PURE;
STDMETHOD(SetFrequency)(THIS_ DWORD dwFrequency) PURE;
STDMETHOD(Stop)(THIS) PURE;
- STDMETHOD(Unlock)(THIS_ LPVOID lpvAudioPtr1, DWORD dwAudioBytes1, LPVOID lpvAudioPtr2, DWORD dwAudioPtr2) PURE;
+ STDMETHOD(Unlock)(THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioPtr2) PURE;
STDMETHOD(Restore)(THIS) PURE;
STDMETHOD(SetFX)(THIS_ DWORD dwEffectsCount, LPDSEFFECTDESC pDSFXDesc, LPDWORD pdwResultCodes) PURE;
STDMETHOD(AcquireResources)(THIS_ DWORD dwFlags, DWORD dwEffectsCount, LPDWORD pdwResultCodes) PURE;
More information about the wine-cvs
mailing list