Skip to content

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

dsound: Get rid of some LPDIRECTSOUND3DBUFFER usage.

parent dc1473dd
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 69 deletions
dlls/dsound/sound3d.c
View file @ a5d21200
...@@ -321,8 +321,8 @@ static void DSOUND_ChangeListener(IDirectSoundBufferImpl *ds3dl) ...@@ -321,8 +321,8 @@ static void DSOUND_ChangeListener(IDirectSoundBufferImpl *ds3dl)
*/ */
/* IUnknown methods */ /* IUnknown methods */
static HRESULT WINAPI IDirectSound3DBufferImpl_QueryInterface( static HRESULT WINAPI IDirectSound3DBufferImpl_QueryInterface(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, REFIID riid, LPVOID *ppobj) REFIID riid, void **ppobj)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
...@@ -330,7 +330,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_QueryInterface( ...@@ -330,7 +330,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_QueryInterface(
return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER8)This->dsb, riid, ppobj); return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER8)This->dsb, riid, ppobj);
} }
static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(LPDIRECTSOUND3DBUFFER iface) static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(IDirectSound3DBuffer *iface)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
ULONG ref = InterlockedIncrement(&(This->ref)); ULONG ref = InterlockedIncrement(&(This->ref));
...@@ -343,7 +343,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(LPDIRECTSOUND3DBUFFER iface) ...@@ -343,7 +343,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(LPDIRECTSOUND3DBUFFER iface)
return ref; return ref;
} }
static ULONG WINAPI IDirectSound3DBufferImpl_Release(LPDIRECTSOUND3DBUFFER iface) static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
ULONG ref = InterlockedDecrement(&(This->ref)); ULONG ref = InterlockedDecrement(&(This->ref));
...@@ -360,9 +360,8 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(LPDIRECTSOUND3DBUFFER iface ...@@ -360,9 +360,8 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(LPDIRECTSOUND3DBUFFER iface
} }
/* IDirectSound3DBuffer methods */ /* IDirectSound3DBuffer methods */
static HRESULT WINAPI IDirectSound3DBufferImpl_GetAllParameters( static HRESULT WINAPI IDirectSound3DBufferImpl_GetAllParameters(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, DS3DBUFFER *lpDs3dBuffer)
LPDS3DBUFFER lpDs3dBuffer)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("(%p,%p)\n",This,lpDs3dBuffer); TRACE("(%p,%p)\n",This,lpDs3dBuffer);
...@@ -382,10 +381,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetAllParameters( ...@@ -382,10 +381,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetAllParameters(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeAngles( static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeAngles(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, DWORD *lpdwInsideConeAngle, DWORD *lpdwOutsideConeAngle)
LPDWORD lpdwInsideConeAngle,
LPDWORD lpdwOutsideConeAngle)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("returning: Inside Cone Angle = %d degrees; Outside Cone Angle = %d degrees\n", TRACE("returning: Inside Cone Angle = %d degrees; Outside Cone Angle = %d degrees\n",
...@@ -395,9 +392,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeAngles( ...@@ -395,9 +392,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeAngles(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOrientation( static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOrientation(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, D3DVECTOR *lpvConeOrientation)
LPD3DVECTOR lpvConeOrientation)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("returning: Cone Orientation vector = (%f,%f,%f)\n", TRACE("returning: Cone Orientation vector = (%f,%f,%f)\n",
...@@ -408,9 +404,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOrientation( ...@@ -408,9 +404,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOrientation(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOutsideVolume( static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOutsideVolume(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, LONG *lplConeOutsideVolume)
LPLONG lplConeOutsideVolume)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("returning: Cone Outside Volume = %d\n", This->dsb->ds3db_ds3db.lConeOutsideVolume); TRACE("returning: Cone Outside Volume = %d\n", This->dsb->ds3db_ds3db.lConeOutsideVolume);
...@@ -418,9 +413,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOutsideVolume( ...@@ -418,9 +413,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOutsideVolume(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_GetMaxDistance( static HRESULT WINAPI IDirectSound3DBufferImpl_GetMaxDistance(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, D3DVALUE *lpfMaxDistance)
LPD3DVALUE lpfMaxDistance)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("returning: Max Distance = %f\n", This->dsb->ds3db_ds3db.flMaxDistance); TRACE("returning: Max Distance = %f\n", This->dsb->ds3db_ds3db.flMaxDistance);
...@@ -428,9 +422,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetMaxDistance( ...@@ -428,9 +422,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetMaxDistance(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_GetMinDistance( static HRESULT WINAPI IDirectSound3DBufferImpl_GetMinDistance(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, D3DVALUE *lpfMinDistance)
LPD3DVALUE lpfMinDistance)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("returning: Min Distance = %f\n", This->dsb->ds3db_ds3db.flMinDistance); TRACE("returning: Min Distance = %f\n", This->dsb->ds3db_ds3db.flMinDistance);
...@@ -438,9 +431,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetMinDistance( ...@@ -438,9 +431,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetMinDistance(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_GetMode( static HRESULT WINAPI IDirectSound3DBufferImpl_GetMode(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, DWORD *lpdwMode)
LPDWORD lpdwMode)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("returning: Mode = %d\n", This->dsb->ds3db_ds3db.dwMode); TRACE("returning: Mode = %d\n", This->dsb->ds3db_ds3db.dwMode);
...@@ -448,9 +440,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetMode( ...@@ -448,9 +440,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetMode(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_GetPosition( static HRESULT WINAPI IDirectSound3DBufferImpl_GetPosition(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, D3DVECTOR *lpvPosition)
LPD3DVECTOR lpvPosition)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("returning: Position vector = (%f,%f,%f)\n", TRACE("returning: Position vector = (%f,%f,%f)\n",
...@@ -461,9 +452,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetPosition( ...@@ -461,9 +452,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetPosition(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_GetVelocity( static HRESULT WINAPI IDirectSound3DBufferImpl_GetVelocity(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, D3DVECTOR *lpvVelocity)
LPD3DVECTOR lpvVelocity)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("returning: Velocity vector = (%f,%f,%f)\n", TRACE("returning: Velocity vector = (%f,%f,%f)\n",
...@@ -474,10 +464,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetVelocity( ...@@ -474,10 +464,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetVelocity(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters( static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, const DS3DBUFFER *lpcDs3dBuffer, DWORD dwApply)
LPCDS3DBUFFER lpcDs3dBuffer,
DWORD dwApply)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
DWORD status = DSERR_INVALIDPARAM; DWORD status = DSERR_INVALIDPARAM;
...@@ -506,11 +494,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters( ...@@ -506,11 +494,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters(
return status; return status;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeAngles( static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeAngles(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, DWORD dwInsideConeAngle, DWORD dwOutsideConeAngle, DWORD dwApply)
DWORD dwInsideConeAngle,
DWORD dwOutsideConeAngle,
DWORD dwApply)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("setting: Inside Cone Angle = %d; Outside Cone Angle = %d; dwApply = %d\n", TRACE("setting: Inside Cone Angle = %d; Outside Cone Angle = %d; dwApply = %d\n",
...@@ -525,10 +510,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeAngles( ...@@ -525,10 +510,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeAngles(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOrientation( static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOrientation(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply)
D3DVALUE x, D3DVALUE y, D3DVALUE z,
DWORD dwApply)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("setting: Cone Orientation vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); TRACE("setting: Cone Orientation vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply);
...@@ -544,10 +527,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOrientation( ...@@ -544,10 +527,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOrientation(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOutsideVolume( static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOutsideVolume(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, LONG lConeOutsideVolume, DWORD dwApply)
LONG lConeOutsideVolume,
DWORD dwApply)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("setting: ConeOutsideVolume = %d; dwApply = %d\n", lConeOutsideVolume, dwApply); TRACE("setting: ConeOutsideVolume = %d; dwApply = %d\n", lConeOutsideVolume, dwApply);
...@@ -561,10 +542,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOutsideVolume( ...@@ -561,10 +542,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOutsideVolume(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_SetMaxDistance( static HRESULT WINAPI IDirectSound3DBufferImpl_SetMaxDistance(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, D3DVALUE fMaxDistance, DWORD dwApply)
D3DVALUE fMaxDistance,
DWORD dwApply)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("setting: MaxDistance = %f; dwApply = %d\n", fMaxDistance, dwApply); TRACE("setting: MaxDistance = %f; dwApply = %d\n", fMaxDistance, dwApply);
...@@ -578,10 +557,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMaxDistance( ...@@ -578,10 +557,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMaxDistance(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_SetMinDistance( static HRESULT WINAPI IDirectSound3DBufferImpl_SetMinDistance(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, D3DVALUE fMinDistance, DWORD dwApply)
D3DVALUE fMinDistance,
DWORD dwApply)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("setting: MinDistance = %f; dwApply = %d\n", fMinDistance, dwApply); TRACE("setting: MinDistance = %f; dwApply = %d\n", fMinDistance, dwApply);
...@@ -595,10 +572,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMinDistance( ...@@ -595,10 +572,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMinDistance(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_SetMode( static HRESULT WINAPI IDirectSound3DBufferImpl_SetMode(IDirectSound3DBuffer *iface, DWORD dwMode,
LPDIRECTSOUND3DBUFFER iface, DWORD dwApply)
DWORD dwMode,
DWORD dwApply)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("setting: Mode = %d; dwApply = %d\n", dwMode, dwApply); TRACE("setting: Mode = %d; dwApply = %d\n", dwMode, dwApply);
...@@ -612,10 +587,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMode( ...@@ -612,10 +587,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMode(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_SetPosition( static HRESULT WINAPI IDirectSound3DBufferImpl_SetPosition(IDirectSound3DBuffer *iface, D3DVALUE x,
LPDIRECTSOUND3DBUFFER iface, D3DVALUE y, D3DVALUE z, DWORD dwApply)
D3DVALUE x, D3DVALUE y, D3DVALUE z,
DWORD dwApply)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("setting: Position vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); TRACE("setting: Position vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply);
...@@ -631,10 +604,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetPosition( ...@@ -631,10 +604,8 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetPosition(
return DS_OK; return DS_OK;
} }
static HRESULT WINAPI IDirectSound3DBufferImpl_SetVelocity( static HRESULT WINAPI IDirectSound3DBufferImpl_SetVelocity(IDirectSound3DBuffer *iface,
LPDIRECTSOUND3DBUFFER iface, D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply)
D3DVALUE x, D3DVALUE y, D3DVALUE z,
DWORD dwApply)
{ {
IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply);
......
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