ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dsound: Pass the object instead of ifaces to helpers.

Browse Source
This commit is contained in:
Michael Stefaniuc 2012-08-16 01:38:52 +02:00 committed by Alexandre Julliard
parent 8588260eef
commit 023a19d931
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/dsound/duplex.c
View File

@ -285,7 +285,7 @@ static const IDirectSound8Vtbl DirectSoundFullDuplex_DirectSound8_Vtbl =
}; };
static HRESULT IDirectSoundFullDuplex_IDirectSound8_Create( static HRESULT IDirectSoundFullDuplex_IDirectSound8_Create(
LPDIRECTSOUNDFULLDUPLEX pdsfd, IDirectSoundFullDuplexImpl *pdsfd,
LPDIRECTSOUND8 * ppds8) LPDIRECTSOUND8 * ppds8)
{ {
IDirectSoundFullDuplex_IDirectSound8 * pdsfdds8; IDirectSoundFullDuplex_IDirectSound8 * pdsfdds8;
@ -301,7 +301,7 @@ static HRESULT IDirectSoundFullDuplex_IDirectSound8_Create(
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
if (((IDirectSoundFullDuplexImpl*)pdsfd)->renderer_device == NULL) { if (pdsfd->renderer_device == NULL) {
WARN("not initialized\n"); WARN("not initialized\n");
*ppds8 = NULL; *ppds8 = NULL;
return DSERR_UNINITIALIZED; return DSERR_UNINITIALIZED;
@ -316,7 +316,7 @@ static HRESULT IDirectSoundFullDuplex_IDirectSound8_Create(
pdsfdds8->lpVtbl = &DirectSoundFullDuplex_DirectSound8_Vtbl; pdsfdds8->lpVtbl = &DirectSoundFullDuplex_DirectSound8_Vtbl;
pdsfdds8->ref = 0; pdsfdds8->ref = 0;
pdsfdds8->pdsfd = (IDirectSoundFullDuplexImpl *)pdsfd; pdsfdds8->pdsfd = pdsfd;
*ppds8 = (LPDIRECTSOUND8)pdsfdds8; *ppds8 = (LPDIRECTSOUND8)pdsfdds8;
@ -399,7 +399,7 @@ static const IDirectSoundCaptureVtbl DirectSoundFullDuplex_DirectSoundCapture_Vt
}; };
static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create( static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create(
LPDIRECTSOUNDFULLDUPLEX pdsfd, IDirectSoundFullDuplexImpl *pdsfd,
LPDIRECTSOUNDCAPTURE8 * ppdsc8) LPDIRECTSOUNDCAPTURE8 * ppdsc8)
{ {
IDirectSoundFullDuplex_IDirectSoundCapture * pdsfddsc; IDirectSoundFullDuplex_IDirectSoundCapture * pdsfddsc;
@ -415,7 +415,7 @@ static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create(
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
if (((IDirectSoundFullDuplexImpl*)pdsfd)->capture_device == NULL) { if (pdsfd->capture_device == NULL) {
WARN("not initialized\n"); WARN("not initialized\n");
*ppdsc8 = NULL; *ppdsc8 = NULL;
return DSERR_UNINITIALIZED; return DSERR_UNINITIALIZED;
@ -430,7 +430,7 @@ static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create(
pdsfddsc->lpVtbl = &DirectSoundFullDuplex_DirectSoundCapture_Vtbl; pdsfddsc->lpVtbl = &DirectSoundFullDuplex_DirectSoundCapture_Vtbl;
pdsfddsc->ref = 0; pdsfddsc->ref = 0;
pdsfddsc->pdsfd = (IDirectSoundFullDuplexImpl *)pdsfd; pdsfddsc->pdsfd = pdsfd;
*ppdsc8 = (LPDIRECTSOUNDCAPTURE)pdsfddsc; *ppdsc8 = (LPDIRECTSOUNDCAPTURE)pdsfddsc;
@ -485,7 +485,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_QueryInterface(IDirectSoundFull
} else if (IsEqualIID(riid, &IID_IDirectSound) } else if (IsEqualIID(riid, &IID_IDirectSound)
|| IsEqualIID(riid, &IID_IDirectSound8)) { || IsEqualIID(riid, &IID_IDirectSound8)) {
if (!This->pDS8) { if (!This->pDS8) {
IDirectSoundFullDuplex_IDirectSound8_Create(iface, &This->pDS8); IDirectSoundFullDuplex_IDirectSound8_Create(This, &This->pDS8);
if (!This->pDS8) { if (!This->pDS8) {
WARN("IDirectSoundFullDuplex_IDirectSound8_Create() failed\n"); WARN("IDirectSoundFullDuplex_IDirectSound8_Create() failed\n");
*ppv = NULL; *ppv = NULL;
@ -497,7 +497,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_QueryInterface(IDirectSoundFull
return S_OK; return S_OK;
} else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) { } else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) {
if (!This->pDSC) { if (!This->pDSC) {
IDirectSoundFullDuplex_IDirectSoundCapture_Create(iface, &This->pDSC); IDirectSoundFullDuplex_IDirectSoundCapture_Create(This, &This->pDSC);
if (!This->pDSC) { if (!This->pDSC) {
WARN("IDirectSoundFullDuplex_IDirectSoundCapture_Create() failed\n"); WARN("IDirectSoundFullDuplex_IDirectSoundCapture_Create() failed\n");
*ppv = NULL; *ppv = NULL;