August 2012 - Wine-commits - list.winehq.org

Michael Stefaniuc : dsound: Merge the DirectSoundCapture create functions.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: b8ffb4930fe1d9a482bfb6aef093a0a0d673f2e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ffb4930fe1d9a482bfb6aef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:20:01 2012 +0200 dsound: Merge the DirectSoundCapture create functions. --- dlls/dsound/capture.c | 89 +++++++++++------------------------------ dlls/dsound/dsound_main.c | 4 +- dlls/dsound/dsound_private.h | 4 +- dlls/dsound/duplex.c | 2 +- 4 files changed, 29 insertions(+), 70 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 7970537..40df315 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1000,6 +1000,7 @@ struct IDirectSoundCaptureImpl IDirectSoundCapture IDirectSoundCapture_iface; LONG ref; DirectSoundCaptureDevice *device; + BOOL has_dsc8; }; static inline struct IDirectSoundCaptureImpl *impl_from_IDirectSoundCapture(IDirectSoundCapture *iface) @@ -1161,83 +1162,41 @@ static const IDirectSoundCaptureVtbl dscvt = IDirectSoundCaptureImpl_Initialize }; -static HRESULT IDirectSoundCaptureImpl_Create( - LPDIRECTSOUNDCAPTURE8 * ppDSC) +static HRESULT IDirectSoundCaptureImpl_Create(REFIID riid, void **ppv, BOOL has_dsc8) { - IDirectSoundCaptureImpl *pDSC; - TRACE("(%p)\n", ppDSC); + IDirectSoundCaptureImpl *obj; + HRESULT hr; - /* Allocate memory */ - pDSC = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectSoundCaptureImpl)); - if (pDSC == NULL) { + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + *ppv = NULL; + obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); + if (obj == NULL) { WARN("out of memory\n"); - *ppDSC = NULL; return DSERR_OUTOFMEMORY; } - pDSC->IDirectSoundCapture_iface.lpVtbl = &dscvt; - pDSC->ref = 0; - pDSC->device = NULL; - - *ppDSC = (LPDIRECTSOUNDCAPTURE8)pDSC; - - return DS_OK; -} - -HRESULT DSOUND_CaptureCreate(REFIID riid, IDirectSoundCapture **ppDSC) -{ - IDirectSoundCapture *pDSC; - HRESULT hr; - TRACE("(%s, %p)\n", debugstr_guid(riid), ppDSC); - - if (!IsEqualIID(riid, &IID_IUnknown) && - !IsEqualIID(riid, &IID_IDirectSoundCapture)) { - *ppDSC = 0; - return E_NOINTERFACE; - } - - /* Get dsound configuration */ setup_dsound_options(); - hr = IDirectSoundCaptureImpl_Create(&pDSC); - if (hr == DS_OK) { - IDirectSoundCapture_AddRef(pDSC); - *ppDSC = pDSC; - } else { - WARN("IDirectSoundCaptureImpl_Create failed\n"); - *ppDSC = 0; - } + obj->IDirectSoundCapture_iface.lpVtbl = &dscvt; + obj->ref = 1; + obj->device = NULL; + obj->has_dsc8 = has_dsc8; + + hr = IDirectSoundCapture_QueryInterface(&obj->IDirectSoundCapture_iface, riid, ppv); + IDirectSoundCapture_Release(&obj->IDirectSoundCapture_iface); return hr; } -HRESULT DSOUND_CaptureCreate8( - REFIID riid, - LPDIRECTSOUNDCAPTURE8 *ppDSC8) +HRESULT DSOUND_CaptureCreate(REFIID riid, void **ppv) { - LPDIRECTSOUNDCAPTURE8 pDSC8; - HRESULT hr; - TRACE("(%s, %p)\n", debugstr_guid(riid), ppDSC8); - - if (!IsEqualIID(riid, &IID_IUnknown) && - !IsEqualIID(riid, &IID_IDirectSoundCapture8)) { - *ppDSC8 = 0; - return E_NOINTERFACE; - } - - /* Get dsound configuration */ - setup_dsound_options(); - - hr = IDirectSoundCaptureImpl_Create(&pDSC8); - if (hr == DS_OK) { - IDirectSoundCapture_AddRef(pDSC8); - *ppDSC8 = pDSC8; - } else { - WARN("IDirectSoundCaptureImpl_Create failed\n"); - *ppDSC8 = 0; - } + return IDirectSoundCaptureImpl_Create(riid, ppv, FALSE); +} - return hr; +HRESULT DSOUND_CaptureCreate8(REFIID riid, void **ppv) +{ + return IDirectSoundCaptureImpl_Create(riid, ppv, TRUE); } /*************************************************************************** @@ -1280,7 +1239,7 @@ HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID lpcGUID, IDirectSoundCapture **p return DSERR_NOAGGREGATION; } - hr = DSOUND_CaptureCreate(&IID_IDirectSoundCapture, &pDSC); + hr = DSOUND_CaptureCreate(&IID_IDirectSoundCapture, (void**)&pDSC); if (hr == DS_OK) { hr = IDirectSoundCapture_Initialize(pDSC, lpcGUID); if (hr != DS_OK) { @@ -1336,7 +1295,7 @@ HRESULT WINAPI DirectSoundCaptureCreate8( return DSERR_NOAGGREGATION; } - hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, &pDSC8); + hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, (void**)&pDSC8); if (hr == DS_OK) { hr = IDirectSoundCapture_Initialize(pDSC8, lpcGUID); if (hr != DS_OK) { diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index e1969a1..34b23a5 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -721,8 +721,8 @@ static const IClassFactoryVtbl DSCF_Vtbl = { static IClassFactoryImpl DSOUND_CF[] = { { { &DSCF_Vtbl }, &CLSID_DirectSound, DSOUND_Create }, { { &DSCF_Vtbl }, &CLSID_DirectSound8, DSOUND_Create8 }, - { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, (FnCreateInstance)DSOUND_CaptureCreate }, - { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, (FnCreateInstance)DSOUND_CaptureCreate8 }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, DSOUND_CaptureCreate }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, DSOUND_CaptureCreate8 }, { { &DSCF_Vtbl }, &CLSID_DirectSoundFullDuplex, (FnCreateInstance)DSOUND_FullDuplexCreate }, { { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, { { NULL }, NULL, NULL } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index be40797..107cbab 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -299,8 +299,8 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; /* capture.c */ -HRESULT DSOUND_CaptureCreate(REFIID riid, LPDIRECTSOUNDCAPTURE *ppDSC) DECLSPEC_HIDDEN; -HRESULT DSOUND_CaptureCreate8(REFIID riid, LPDIRECTSOUNDCAPTURE8 *ppDSC8) DECLSPEC_HIDDEN; +HRESULT DSOUND_CaptureCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN; +HRESULT DSOUND_CaptureCreate8(REFIID riid, void **ppv) DECLSPEC_HIDDEN; #define STATE_STOPPED 0 #define STATE_STARTING 1 diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index ccb0c9b..b473c03 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -578,7 +578,7 @@ IDirectSoundFullDuplexImpl_Initialize( return hr; } - hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, &This->capture_device); + hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, (void**)&This->capture_device); if (SUCCEEDED(hr)) hr = IDirectSoundCapture_Initialize(This->capture_device, pCaptureGuid); if (hr != DS_OK) {

1 0

Michael Stefaniuc : dsound: IDirectSoundCapture / IUnknown use separate refcounts.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 9383affe87f7654d037958d60ea3e0f1f70ac452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9383affe87f7654d037958d60… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:21:26 2012 +0200 dsound: IDirectSoundCapture / IUnknown use separate refcounts. --- dlls/dsound/capture.c | 128 +++++++++++++++++++++++++++++++----------- dlls/dsound/dsound_private.h | 1 - 2 files changed, 94 insertions(+), 35 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 40df315..23668e9 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -995,67 +995,124 @@ static HRESULT DirectSoundCaptureDevice_Initialize( /***************************************************************************** * IDirectSoundCapture implementation structure */ -struct IDirectSoundCaptureImpl +typedef struct IDirectSoundCaptureImpl { + IUnknown IUnknown_iface; /* Separate refcount */ IDirectSoundCapture IDirectSoundCapture_iface; - LONG ref; + LONG ref, refdsc, numIfaces; DirectSoundCaptureDevice *device; BOOL has_dsc8; -}; +} IDirectSoundCaptureImpl; -static inline struct IDirectSoundCaptureImpl *impl_from_IDirectSoundCapture(IDirectSoundCapture *iface) +static void capture_destroy(IDirectSoundCaptureImpl *This) { - return CONTAINING_RECORD(iface, struct IDirectSoundCaptureImpl, IDirectSoundCapture_iface); + if (This->device) + DirectSoundCaptureDevice_Release(This->device); + HeapFree(GetProcessHeap(),0,This); + TRACE("(%p) released\n", This); } -/*************************************************************************** - * IDirectSoundCaptureImpl +/******************************************************************************* + * IUnknown Implementation for DirectSoundCapture */ -static HRESULT WINAPI IDirectSoundCaptureImpl_QueryInterface(IDirectSoundCapture *iface, - REFIID riid, void **ppobj) +static inline IDirectSoundCaptureImpl *impl_from_IUnknown(IUnknown *iface) { - TRACE( "(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj ); + return CONTAINING_RECORD(iface, IDirectSoundCaptureImpl, IUnknown_iface); +} - if (ppobj == NULL) { - WARN("invalid parameter\n"); - return E_INVALIDARG; - } +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + IDirectSoundCaptureImpl *This = impl_from_IUnknown(iface); - *ppobj = NULL; + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectSoundCapture)) { - IDirectSoundCapture_AddRef(iface); - *ppobj = iface; - return S_OK; + if (!ppv) { + WARN("invalid parameter\n"); + return E_INVALIDARG; } + *ppv = NULL; - WARN("unsupported riid: %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_iface; + else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) + *ppv = &This->IDirectSoundCapture_iface; + else { + WARN("unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) +{ + IDirectSoundCaptureImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); + return ref; +} + +static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) +{ + IDirectSoundCaptureImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref && !InterlockedDecrement(&This->numIfaces)) + capture_destroy(This); + return ref; +} + +static const IUnknownVtbl unk_vtbl = +{ + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release +}; + +/*************************************************************************** + * IDirectSoundCaptureImpl + */ +static inline struct IDirectSoundCaptureImpl *impl_from_IDirectSoundCapture(IDirectSoundCapture *iface) +{ + return CONTAINING_RECORD(iface, struct IDirectSoundCaptureImpl, IDirectSoundCapture_iface); +} + +static HRESULT WINAPI IDirectSoundCaptureImpl_QueryInterface(IDirectSoundCapture *iface, + REFIID riid, void **ppv) +{ + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); + return IUnknown_QueryInterface(&This->IUnknown_iface, riid, ppv); } static ULONG WINAPI IDirectSoundCaptureImpl_AddRef(IDirectSoundCapture *iface) { IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); - ULONG ref = InterlockedIncrement(&(This->ref)); + ULONG ref = InterlockedIncrement(&This->refdsc); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref=%d\n", This, ref); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); return ref; } static ULONG WINAPI IDirectSoundCaptureImpl_Release(IDirectSoundCapture *iface) { IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); - ULONG ref = InterlockedDecrement(&(This->ref)); - - TRACE("(%p) ref was %d\n", This, ref + 1); + ULONG ref = InterlockedDecrement(&This->refdsc); - if (!ref) { - if (This->device) - DirectSoundCaptureDevice_Release(This->device); + TRACE("(%p) ref=%d\n", This, ref); - HeapFree( GetProcessHeap(), 0, This ); - TRACE("(%p) released\n", This); - } + if (!ref && !InterlockedDecrement(&This->numIfaces)) + capture_destroy(This); return ref; } @@ -1178,13 +1235,16 @@ static HRESULT IDirectSoundCaptureImpl_Create(REFIID riid, void **ppv, BOOL has_ setup_dsound_options(); + obj->IUnknown_iface.lpVtbl = &unk_vtbl; obj->IDirectSoundCapture_iface.lpVtbl = &dscvt; obj->ref = 1; + obj->refdsc = 0; + obj->numIfaces = 1; obj->device = NULL; obj->has_dsc8 = has_dsc8; - hr = IDirectSoundCapture_QueryInterface(&obj->IDirectSoundCapture_iface, riid, ppv); - IDirectSoundCapture_Release(&obj->IDirectSoundCapture_iface); + hr = IUnknown_QueryInterface(&obj->IUnknown_iface, riid, ppv); + IUnknown_Release(&obj->IUnknown_iface); return hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 107cbab..c8498d3 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -40,7 +40,6 @@ extern int ds_default_bits_per_sample DECLSPEC_HIDDEN; * Predeclare the interface implementation structures */ typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; -typedef struct IDirectSoundCaptureImpl IDirectSoundCaptureImpl; typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBufferImpl; typedef struct DirectSoundDevice DirectSoundDevice; typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice;

1 0

Michael Stefaniuc : dsound/tests: Refcount tests for IDirectSoundCapture / IUnknown.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 598cc8f44a98d3795aa8a969ad6b578279a46b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598cc8f44a98d3795aa8a969a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:22:58 2012 +0200 dsound/tests: Refcount tests for IDirectSoundCapture / IUnknown. --- dlls/dsound/tests/capture.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 3d81194..ba52818 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <stdio.h> #include "initguid.h" #include "windows.h" @@ -671,6 +672,7 @@ static void test_COM(void) IDirectSoundCapture *dsc = (IDirectSoundCapture*)0xdeadbeef; IDirectSoundCaptureBuffer *buffer = (IDirectSoundCaptureBuffer*)0xdeadbeef; IDirectSoundNotify *notify; + IUnknown *unk; DSCBUFFERDESC bufdesc; WAVEFORMATEX wfx; HRESULT hr; @@ -688,6 +690,17 @@ static void test_COM(void) } ok(hr == DS_OK, "DirectSoundCaptureCreate failed: %08x, expected DS_OK\n", hr); + /* Different refcount for IDirectSoundCapture and for IUnknown */ + refcount = IDirectSoundCapture_AddRef(dsc); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IDirectSoundCapture_QueryInterface(dsc, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IUnknown_Release(unk); + IUnknown_Release(unk); + IDirectSoundCapture_Release(dsc); + init_format(&wfx, WAVE_FORMAT_PCM, 44100, 16, 1); ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize = sizeof(bufdesc);

1 0

Michael Stefaniuc : dsound/tests: Add DirectSoundFullDuplex COM tests.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 0aeaa83a22a31e1466759e9562362c03a147f767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aeaa83a22a31e1466759e956… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:24:23 2012 +0200 dsound/tests: Add DirectSoundFullDuplex COM tests. --- dlls/dsound/tests/duplex.c | 114 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 055bf09..3015db0 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <windows.h> - #include <stdio.h> #include "wine/test.h" @@ -223,6 +223,113 @@ static void IDirectSoundFullDuplex_tests(void) IDirectSoundFullDuplex_Release(dsfdo); } +static void test_COM(void) +{ + IDirectSoundFullDuplex *dsfd = (IDirectSoundFullDuplex*)0xdeadbeef; + IDirectSound *ds; + IDirectSound8 *ds8; + IDirectSoundCapture *dsc; + IUnknown *unk, *unk8; + IDirectSoundBuffer8 *dsb8; + IDirectSoundCaptureBuffer8 *dscb8; + DSBUFFERDESC bufdesc; + DSCBUFFERDESC cbufdesc; + WAVEFORMATEX wfx; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, (IUnknown*)&dsfd, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dsfd); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectSoundFullDuplex create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dsfd, "dsfd = %p\n", dsfd); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectSound3DBuffer, (void**)&dsfd); + ok(hr == E_NOINTERFACE, + "DirectSoundFullDuplex create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Different refcount for IDirectSoundFullDuplex and for IUnknown */ + hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectSoundFullDuplex, (void**)&dsfd); + ok(hr == S_OK, "DirectSoundFullDuplex create failed: %08x, expected S_OK\n", hr); + refcount = IDirectSoundFullDuplex_AddRef(dsfd); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + /* Not initialized */ + hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSound8, (void**)&ds8); + ok(hr == E_NOINTERFACE, + "QueryInterface for IID_IDirectSound8 failed: %08x, expected E_NOINTERFACE\n", hr); + hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSoundCapture, (void**)&dsc); + ok(hr == E_NOINTERFACE, + "QueryInterface for IID_IDirectSoundCapture failed: %08x, expected E_NOINTERFACE\n", hr); + + init_format(&wfx, WAVE_FORMAT_PCM, 44100, 16, 1); + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwBufferBytes = wfx.nAvgBytesPerSec; + bufdesc.lpwfxFormat = &wfx; + ZeroMemory(&cbufdesc, sizeof(cbufdesc)); + cbufdesc.dwSize = sizeof(cbufdesc); + cbufdesc.dwBufferBytes = wfx.nAvgBytesPerSec; + cbufdesc.lpwfxFormat = &wfx; + hr = IDirectSoundFullDuplex_Initialize(dsfd, NULL, NULL, &cbufdesc, &bufdesc, get_hwnd(), + DSSCL_EXCLUSIVE, &dscb8, &dsb8); + if (hr == DSERR_NODRIVER) { + skip("No driver\n"); + return; + } + ok(hr == S_OK, "IDirectSoundFullDuplex_Initialize failed: %08x\n", hr); + + /* IDirectSound and IDirectSound8 */ + hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSound8, (void**)&ds8); + ok(hr == S_OK, "QueryInterface for IID_IDirectSound8 failed: %08x\n", hr); + refcount = IDirectSound8_AddRef(ds8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSound, (void**)&ds); + ok(hr == S_OK, "QueryInterface for IID_IDirectSound failed: %08x\n", hr); + refcount = IDirectSound8_AddRef(ds8); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectSound_AddRef(ds); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(unk == unk8, "Got different IUnknown when QI'ing IDirectSoundFullDuplex and IDirectSound\n"); + refcount = IUnknown_AddRef(unk8); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectSound_AddRef(ds); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IDirectSoundFullDuplex_AddRef(dsfd); + ok(refcount == 3, "refcount == %u, expected 3\n", refcount); + + /* IDirectSoundCapture */ + hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSoundCapture, (void**)&dsc); + ok(hr == S_OK, "QueryInterface for IID_IDirectSoundCapture failed: %08x\n", hr); + refcount = IDirectSoundCapture_AddRef(dsc); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + refcount = IDirectSoundFullDuplex_AddRef(dsfd); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + hr = IDirectSoundCapture_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(unk == unk8, + "Got different IUnknown when QI'ing IDirectSoundFullDuplex and IDirectSoundCapture\n"); + refcount = IUnknown_AddRef(unk8); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + + IDirectSoundBuffer8_Release(dsb8); + IDirectSoundCaptureBuffer8_Release(dscb8); + while (IDirectSound8_Release(ds8)); + while (IDirectSoundCapture_Release(dsc)); + while (IDirectSoundFullDuplex_Release(dsfd)); + while (IUnknown_Release(unk)); +} + START_TEST(duplex) { HMODULE hDsound; @@ -235,9 +342,10 @@ START_TEST(duplex) pDirectSoundFullDuplexCreate=(void*)GetProcAddress(hDsound, "DirectSoundFullDuplexCreate"); - if (pDirectSoundFullDuplexCreate) + if (pDirectSoundFullDuplexCreate) { + test_COM(); IDirectSoundFullDuplex_tests(); - else + } else skip("DirectSoundFullDuplexCreate missing - skipping all tests\n"); FreeLibrary(hDsound);

1 0

Michael Stefaniuc : dsound: Cleanup the DirectSoundFullDuplex create functions.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 885e205adea1cc7f4920aae5c7f537b7cd4ac38a URL: http://source.winehq.org/git/wine.git/?a=commit;h=885e205adea1cc7f4920aae5c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:27:12 2012 +0200 dsound: Cleanup the DirectSoundFullDuplex create functions. --- dlls/dsound/dsound_main.c | 2 +- dlls/dsound/dsound_private.h | 4 +- dlls/dsound/duplex.c | 152 +++++++++++++----------------------------- 3 files changed, 50 insertions(+), 108 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 34b23a5..f5199fd 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -723,7 +723,7 @@ static IClassFactoryImpl DSOUND_CF[] = { { { &DSCF_Vtbl }, &CLSID_DirectSound8, DSOUND_Create8 }, { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, DSOUND_CaptureCreate }, { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, DSOUND_CaptureCreate8 }, - { { &DSCF_Vtbl }, &CLSID_DirectSoundFullDuplex, (FnCreateInstance)DSOUND_FullDuplexCreate }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundFullDuplex, DSOUND_FullDuplexCreate }, { { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, { { NULL }, NULL, NULL } }; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index c8498d3..1855319 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -280,8 +280,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN; /* duplex.c */ - -HRESULT DSOUND_FullDuplexCreate(REFIID riid, LPDIRECTSOUNDFULLDUPLEX* ppDSFD) DECLSPEC_HIDDEN; + +HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN; /* mixer.c */ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index b473c03..6972a52 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -613,44 +613,29 @@ static const IDirectSoundFullDuplexVtbl dsfdvt = IDirectSoundFullDuplexImpl_Initialize }; -HRESULT DSOUND_FullDuplexCreate( - REFIID riid, - LPDIRECTSOUNDFULLDUPLEX* ppDSFD) +HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) { - IDirectSoundFullDuplexImpl *This = NULL; - TRACE("(%s, %p)\n", debugstr_guid(riid), ppDSFD); - - if (ppDSFD == NULL) { - WARN("invalid parameter: ppDSFD == NULL\n"); - return DSERR_INVALIDPARAM; - } - - if (!IsEqualIID(riid, &IID_IUnknown) && - !IsEqualIID(riid, &IID_IDirectSoundFullDuplex)) { - *ppDSFD = 0; - return E_NOINTERFACE; - } - - /* Get dsound configuration */ - setup_dsound_options(); + IDirectSoundFullDuplexImpl *obj; + HRESULT hr; - This = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(IDirectSoundFullDuplexImpl)); + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); - if (This == NULL) { + *ppv = NULL; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + if (!obj) { WARN("out of memory\n"); - *ppDSFD = NULL; return DSERR_OUTOFMEMORY; } - This->lpVtbl = &dsfdvt; - This->ref = 1; - This->capture_device = NULL; - This->renderer_device = NULL; + setup_dsound_options(); + + obj->lpVtbl = &dsfdvt; + obj->ref = 1; - *ppDSFD = (LPDIRECTSOUNDFULLDUPLEX)This; + hr = IUnknown_QueryInterface((IUnknown*)obj, riid, ppv); + IUnknown_Release((IUnknown*)obj); - return DS_OK; + return hr; } /*************************************************************************** @@ -659,93 +644,50 @@ HRESULT DSOUND_FullDuplexCreate( * Create and initialize a DirectSoundFullDuplex interface. * * PARAMS - * pcGuidCaptureDevice [I] Address of sound capture device GUID. - * pcGuidRenderDevice [I] Address of sound render device GUID. - * pcDSCBufferDesc [I] Address of capture buffer description. - * pcDSBufferDesc [I] Address of render buffer description. - * hWnd [I] Handle to application window. - * dwLevel [I] Cooperative level. - * ppDSFD [O] Address where full duplex interface returned. - * ppDSCBuffer8 [0] Address where capture buffer interface returned. - * ppDSBuffer8 [0] Address where render buffer interface returned. - * pUnkOuter [I] Must be NULL. + * capture_dev [I] Address of sound capture device GUID. + * render_dev [I] Address of sound render device GUID. + * cbufdesc [I] Address of capture buffer description. + * bufdesc [I] Address of render buffer description. + * hwnd [I] Handle to application window. + * level [I] Cooperative level. + * dsfd [O] Address where full duplex interface returned. + * dscb8 [0] Address where capture buffer interface returned. + * dsb8 [0] Address where render buffer interface returned. + * outer_unk [I] Must be NULL. * * RETURNS * Success: DS_OK * Failure: DSERR_NOAGGREGATION, DSERR_ALLOCATED, DSERR_INVALIDPARAM, * DSERR_OUTOFMEMORY DSERR_INVALIDCALL DSERR_NODRIVER */ -HRESULT WINAPI -DirectSoundFullDuplexCreate( - LPCGUID pcGuidCaptureDevice, - LPCGUID pcGuidRenderDevice, - LPCDSCBUFFERDESC pcDSCBufferDesc, - LPCDSBUFFERDESC pcDSBufferDesc, - HWND hWnd, - DWORD dwLevel, - LPDIRECTSOUNDFULLDUPLEX *ppDSFD, - LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8, - LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, - LPUNKNOWN pUnkOuter) -{ - HRESULT hres; - IDirectSoundFullDuplexImpl *This = NULL; - TRACE("(%s,%s,%p,%p,%p,%x,%p,%p,%p,%p)\n", - debugstr_guid(pcGuidCaptureDevice), debugstr_guid(pcGuidRenderDevice), - pcDSCBufferDesc, pcDSBufferDesc, hWnd, dwLevel, ppDSFD, ppDSCBuffer8, - ppDSBuffer8, pUnkOuter); - - if (pUnkOuter) { - WARN("pUnkOuter != 0\n"); - *ppDSFD = NULL; - return DSERR_NOAGGREGATION; - } - - if (pcDSCBufferDesc == NULL) { - WARN("invalid parameter: pcDSCBufferDesc == NULL\n"); - *ppDSFD = NULL; - return DSERR_INVALIDPARAM; - } - - if (pcDSBufferDesc == NULL) { - WARN("invalid parameter: pcDSBufferDesc == NULL\n"); - *ppDSFD = NULL; - return DSERR_INVALIDPARAM; - } +HRESULT WINAPI DirectSoundFullDuplexCreate(const GUID *capture_dev, const GUID *render_dev, + const DSCBUFFERDESC *cbufdesc, const DSBUFFERDESC *bufdesc, HWND hwnd, DWORD level, + IDirectSoundFullDuplex **dsfd, IDirectSoundCaptureBuffer8 **dscb8, + IDirectSoundBuffer8 **dsb8, IUnknown *outer_unk) +{ + HRESULT hr; - if (ppDSFD == NULL) { - WARN("invalid parameter: ppDSFD == NULL\n"); - return DSERR_INVALIDPARAM; - } + TRACE("(%s,%s,%p,%p,%p,%x,%p,%p,%p,%p)\n", debugstr_guid(capture_dev), + debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dsfd, dscb8, dsb8, + outer_unk); - if (ppDSCBuffer8 == NULL) { - WARN("invalid parameter: ppDSCBuffer8 == NULL\n"); - *ppDSFD = NULL; + if (!dsfd) return DSERR_INVALIDPARAM; + if (outer_unk) { + *dsfd = NULL; + return DSERR_NOAGGREGATION; } - if (ppDSBuffer8 == NULL) { - WARN("invalid parameter: ppDSBuffer8 == NULL\n"); - *ppDSFD = NULL; - return DSERR_INVALIDPARAM; + hr = DSOUND_FullDuplexCreate(&IID_IDirectSoundFullDuplex, (void**)dsfd); + if (hr == DS_OK) { + hr = IDirectSoundFullDuplex_Initialize(*dsfd, capture_dev, render_dev, cbufdesc, bufdesc, + hwnd, level, dscb8, dsb8); + if (hr != DS_OK) { + IDirectSoundFullDuplex_Release(*dsfd); + *dsfd = NULL; + WARN("IDirectSoundFullDuplexImpl_Initialize failed\n"); + } } - hres = DSOUND_FullDuplexCreate(&IID_IDirectSoundFullDuplex, (LPDIRECTSOUNDFULLDUPLEX*)&This); - if (FAILED(hres)) return hres; - - hres = IDirectSoundFullDuplexImpl_Initialize((LPDIRECTSOUNDFULLDUPLEX)This, - pcGuidCaptureDevice, - pcGuidRenderDevice, - pcDSCBufferDesc, - pcDSBufferDesc, - hWnd, dwLevel, ppDSCBuffer8, - ppDSBuffer8); - if (hres != DS_OK) { - IUnknown_Release((LPDIRECTSOUNDFULLDUPLEX)This); - WARN("IDirectSoundFullDuplexImpl_Initialize failed\n"); - *ppDSFD = NULL; - } else - *ppDSFD = (LPDIRECTSOUNDFULLDUPLEX)This; - - return hres; + return hr; }

1 0

Michael Stefaniuc : dsound: Cleanup error handling in IDirectSoundFullDuplex::Initialize().
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: f6f8123c6b2c87e4953809b987d39c003703fb33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f8123c6b2c87e4953809b98… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:30:16 2012 +0200 dsound: Cleanup error handling in IDirectSoundFullDuplex::Initialize(). --- dlls/dsound/duplex.c | 80 +++++++++++++++++++++++--------------------- dlls/dsound/tests/duplex.c | 4 ++ 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 6972a52..49cba9f 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -530,75 +530,79 @@ IDirectSoundFullDuplexImpl_Release( LPDIRECTSOUNDFULLDUPLEX iface ) return ref; } -static HRESULT WINAPI -IDirectSoundFullDuplexImpl_Initialize( - LPDIRECTSOUNDFULLDUPLEX iface, - LPCGUID pCaptureGuid, - LPCGUID pRendererGuid, - LPCDSCBUFFERDESC lpDscBufferDesc, - LPCDSBUFFERDESC lpDsBufferDesc, - HWND hWnd, - DWORD dwLevel, - LPLPDIRECTSOUNDCAPTUREBUFFER8 lplpDirectSoundCaptureBuffer8, - LPLPDIRECTSOUNDBUFFER8 lplpDirectSoundBuffer8 ) +static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDuplex *iface, + const GUID *capture_dev, const GUID *render_dev, const DSCBUFFERDESC *cbufdesc, + const DSBUFFERDESC *bufdesc, HWND hwnd, DWORD level, IDirectSoundCaptureBuffer8 **dscb8, + IDirectSoundBuffer8 **dsb8) { HRESULT hr; IDirectSoundFullDuplexImpl *This = (IDirectSoundFullDuplexImpl *)iface; - TRACE("(%p,%s,%s,%p,%p,%p,%x,%p,%p)\n", This, - debugstr_guid(pCaptureGuid), debugstr_guid(pRendererGuid), - lpDscBufferDesc, lpDsBufferDesc, hWnd, dwLevel, - lplpDirectSoundCaptureBuffer8, lplpDirectSoundBuffer8); + TRACE("(%p,%s,%s,%p,%p,%p,%x,%p,%p)\n", This, debugstr_guid(capture_dev), + debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dscb8, dsb8); + + if (!dscb8 || !dsb8) + return E_INVALIDARG; + + *dscb8 = NULL; + *dsb8 = NULL; if (This->renderer_device != NULL || This->capture_device != NULL) { WARN("already initialized\n"); - *lplpDirectSoundCaptureBuffer8 = NULL; - *lplpDirectSoundBuffer8 = NULL; return DSERR_ALREADYINITIALIZED; } hr = DSOUND_Create8(&IID_IDirectSound8, (void **)&This->renderer_device); if (SUCCEEDED(hr)) - hr = IDirectSound_Initialize(This->renderer_device, pRendererGuid); + hr = IDirectSound_Initialize(This->renderer_device, render_dev); if (hr != DS_OK) { WARN("DirectSoundDevice_Initialize() failed\n"); - *lplpDirectSoundCaptureBuffer8 = NULL; - *lplpDirectSoundBuffer8 = NULL; - return hr; + goto error; } - IDirectSound8_SetCooperativeLevel(This->renderer_device, hWnd, dwLevel); + IDirectSound8_SetCooperativeLevel(This->renderer_device, hwnd, level); - hr = IDirectSound8_CreateSoundBuffer(This->renderer_device, lpDsBufferDesc, - (IDirectSoundBuffer**)lplpDirectSoundBuffer8, NULL); + hr = IDirectSound8_CreateSoundBuffer(This->renderer_device, bufdesc, + (IDirectSoundBuffer**)dsb8, NULL); if (hr != DS_OK) { WARN("IDirectSoundBufferImpl_Create() failed\n"); - *lplpDirectSoundCaptureBuffer8 = NULL; - *lplpDirectSoundBuffer8 = NULL; - return hr; + goto error; } hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, (void**)&This->capture_device); if (SUCCEEDED(hr)) - hr = IDirectSoundCapture_Initialize(This->capture_device, pCaptureGuid); + hr = IDirectSoundCapture_Initialize(This->capture_device, capture_dev); if (hr != DS_OK) { WARN("DirectSoundCaptureDevice_Initialize() failed\n"); - *lplpDirectSoundCaptureBuffer8 = NULL; - *lplpDirectSoundBuffer8 = NULL; - return hr; + goto error; } - hr = IDirectSoundCapture_CreateCaptureBuffer(This->capture_device, - lpDscBufferDesc, - (IDirectSoundCaptureBuffer**)lplpDirectSoundCaptureBuffer8, - NULL); + hr = IDirectSoundCapture_CreateCaptureBuffer(This->capture_device, cbufdesc, + (IDirectSoundCaptureBuffer**)dscb8, NULL); if (hr != DS_OK) { WARN("IDirectSoundCaptureBufferImpl_Create() failed\n"); - *lplpDirectSoundCaptureBuffer8 = NULL; - *lplpDirectSoundBuffer8 = NULL; - return hr; + goto error; } + return DS_OK; + +error: + if (*dsb8) { + IDirectSoundBuffer8_Release(*dsb8); + *dsb8 = NULL; + } + if (This->renderer_device) { + IDirectSound8_Release(This->renderer_device); + This->renderer_device = NULL; + } + if (*dscb8) { + IDirectSoundCaptureBuffer8_Release(*dscb8); + *dscb8 = NULL; + } + if (This->capture_device) { + IDirectSoundCapture_Release(This->capture_device); + This->capture_device = NULL; + } return hr; } diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 3015db0..170b552 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -280,6 +280,10 @@ static void test_COM(void) cbufdesc.dwBufferBytes = wfx.nAvgBytesPerSec; cbufdesc.lpwfxFormat = &wfx; hr = IDirectSoundFullDuplex_Initialize(dsfd, NULL, NULL, &cbufdesc, &bufdesc, get_hwnd(), + DSSCL_EXCLUSIVE, NULL, NULL); + ok(hr == E_INVALIDARG, + "IDirectSoundFullDuplex_Initialize failed: %08x, expected E_INVALIDARG\n", hr); + hr = IDirectSoundFullDuplex_Initialize(dsfd, NULL, NULL, &cbufdesc, &bufdesc, get_hwnd(), DSSCL_EXCLUSIVE, &dscb8, &dsb8); if (hr == DSERR_NODRIVER) { skip("No driver\n");

1 0

Michael Stefaniuc : dsound: COM cleanup for the IDirectSoundFullDuplex iface.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 8588260eeff1ef91f9fac1c137a064869d38800c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8588260eeff1ef91f9fac1c13… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:31:52 2012 +0200 dsound: COM cleanup for the IDirectSoundFullDuplex iface. --- dlls/dsound/duplex.c | 59 ++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 49cba9f..2b25ee8 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -42,8 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); */ typedef struct IDirectSoundFullDuplexImpl { - /* IUnknown fields */ - const IDirectSoundFullDuplexVtbl *lpVtbl; + IDirectSoundFullDuplex IDirectSoundFullDuplex_iface; LONG ref; /* IDirectSoundFullDuplexImpl fields */ @@ -159,7 +158,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_QueryInterface( { IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); - return IDirectSoundFullDuplex_QueryInterface((LPDIRECTSOUNDFULLDUPLEX)This->pdsfd, riid, ppobj); + return IDirectSoundFullDuplex_QueryInterface(&This->pdsfd->IDirectSoundFullDuplex_iface, riid, ppobj); } static ULONG WINAPI IDirectSoundFullDuplex_IDirectSound8_AddRef( @@ -334,7 +333,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_QueryInterface( { IDirectSoundFullDuplex_IDirectSoundCapture *This = (IDirectSoundFullDuplex_IDirectSoundCapture *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); - return IDirectSoundFullDuplex_QueryInterface((LPDIRECTSOUNDFULLDUPLEX)This->pdsfd, riid, ppobj); + return IDirectSoundFullDuplex_QueryInterface(&This->pdsfd->IDirectSoundFullDuplex_iface, riid, ppobj); } static ULONG WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_AddRef( @@ -439,48 +438,49 @@ static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create( } /*************************************************************************** - * IDirectSoundFullDuplexImpl + * IDirectSoundFullDuplex implementation */ -static ULONG WINAPI -IDirectSoundFullDuplexImpl_AddRef( LPDIRECTSOUNDFULLDUPLEX iface ) +static inline IDirectSoundFullDuplexImpl *impl_from_IDirectSoundFullDuplex(IDirectSoundFullDuplex *iface) { - IDirectSoundFullDuplexImpl *This = (IDirectSoundFullDuplexImpl *)iface; + return CONTAINING_RECORD(iface, IDirectSoundFullDuplexImpl, IDirectSoundFullDuplex_iface); +} + +static ULONG WINAPI IDirectSoundFullDuplexImpl_AddRef(IDirectSoundFullDuplex *iface) +{ + IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); ULONG ref = InterlockedIncrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref - 1); return ref; } -static HRESULT WINAPI -IDirectSoundFullDuplexImpl_QueryInterface( - LPDIRECTSOUNDFULLDUPLEX iface, - REFIID riid, - LPVOID* ppobj ) +static HRESULT WINAPI IDirectSoundFullDuplexImpl_QueryInterface(IDirectSoundFullDuplex *iface, + REFIID riid, void **ppv) { - IDirectSoundFullDuplexImpl *This = (IDirectSoundFullDuplexImpl *)iface; - TRACE( "(%p,%s,%p)\n", This, debugstr_guid(riid), ppobj ); + IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); - if (ppobj == NULL) { + if (ppv == NULL) { WARN("invalid parameter\n"); return E_INVALIDARG; } - *ppobj = NULL; + *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) { if (!This->pUnknown) { IDirectSoundFullDuplex_IUnknown_Create(iface, &This->pUnknown); if (!This->pUnknown) { WARN("IDirectSoundFullDuplex_IUnknown_Create() failed\n"); - *ppobj = NULL; + *ppv = NULL; return E_NOINTERFACE; } } IDirectSoundFullDuplex_IUnknown_AddRef(This->pUnknown); - *ppobj = This->pUnknown; + *ppv = This->pUnknown; return S_OK; } else if (IsEqualIID(riid, &IID_IDirectSoundFullDuplex)) { IDirectSoundFullDuplexImpl_AddRef(iface); - *ppobj = This; + *ppv = &This->IDirectSoundFullDuplex_iface; return S_OK; } else if (IsEqualIID(riid, &IID_IDirectSound) || IsEqualIID(riid, &IID_IDirectSound8)) { @@ -488,34 +488,33 @@ IDirectSoundFullDuplexImpl_QueryInterface( IDirectSoundFullDuplex_IDirectSound8_Create(iface, &This->pDS8); if (!This->pDS8) { WARN("IDirectSoundFullDuplex_IDirectSound8_Create() failed\n"); - *ppobj = NULL; + *ppv = NULL; return E_NOINTERFACE; } } IDirectSoundFullDuplex_IDirectSound8_AddRef(This->pDS8); - *ppobj = This->pDS8; + *ppv = This->pDS8; return S_OK; } else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) { if (!This->pDSC) { IDirectSoundFullDuplex_IDirectSoundCapture_Create(iface, &This->pDSC); if (!This->pDSC) { WARN("IDirectSoundFullDuplex_IDirectSoundCapture_Create() failed\n"); - *ppobj = NULL; + *ppv = NULL; return E_NOINTERFACE; } } IDirectSoundFullDuplex_IDirectSoundCapture_AddRef(This->pDSC); - *ppobj = This->pDSC; + *ppv = This->pDSC; return S_OK; } return E_NOINTERFACE; } -static ULONG WINAPI -IDirectSoundFullDuplexImpl_Release( LPDIRECTSOUNDFULLDUPLEX iface ) +static ULONG WINAPI IDirectSoundFullDuplexImpl_Release(IDirectSoundFullDuplex *iface) { - IDirectSoundFullDuplexImpl *This = (IDirectSoundFullDuplexImpl *)iface; + IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref - 1); @@ -535,8 +534,8 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl const DSBUFFERDESC *bufdesc, HWND hwnd, DWORD level, IDirectSoundCaptureBuffer8 **dscb8, IDirectSoundBuffer8 **dsb8) { + IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); HRESULT hr; - IDirectSoundFullDuplexImpl *This = (IDirectSoundFullDuplexImpl *)iface; TRACE("(%p,%s,%s,%p,%p,%p,%x,%p,%p)\n", This, debugstr_guid(capture_dev), debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dscb8, dsb8); @@ -606,7 +605,7 @@ error: return hr; } -static const IDirectSoundFullDuplexVtbl dsfdvt = +static const IDirectSoundFullDuplexVtbl dsfd_vtbl = { /* IUnknown methods */ IDirectSoundFullDuplexImpl_QueryInterface, @@ -633,7 +632,7 @@ HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) setup_dsound_options(); - obj->lpVtbl = &dsfdvt; + obj->IDirectSoundFullDuplex_iface.lpVtbl = &dsfd_vtbl; obj->ref = 1; hr = IUnknown_QueryInterface((IUnknown*)obj, riid, ppv);

1 0

Michael Stefaniuc : dsound: Pass the object instead of ifaces to helpers.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 023a19d931d295cba21d92d1986ffb20bb140b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023a19d931d295cba21d92d19… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:38:52 2012 +0200 dsound: Pass the object instead of ifaces to helpers. --- dlls/dsound/duplex.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 2b25ee8..c9f08c4 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -285,7 +285,7 @@ static const IDirectSound8Vtbl DirectSoundFullDuplex_DirectSound8_Vtbl = }; static HRESULT IDirectSoundFullDuplex_IDirectSound8_Create( - LPDIRECTSOUNDFULLDUPLEX pdsfd, + IDirectSoundFullDuplexImpl *pdsfd, LPDIRECTSOUND8 * ppds8) { IDirectSoundFullDuplex_IDirectSound8 * pdsfdds8; @@ -301,7 +301,7 @@ static HRESULT IDirectSoundFullDuplex_IDirectSound8_Create( return DSERR_INVALIDPARAM; } - if (((IDirectSoundFullDuplexImpl*)pdsfd)->renderer_device == NULL) { + if (pdsfd->renderer_device == NULL) { WARN("not initialized\n"); *ppds8 = NULL; return DSERR_UNINITIALIZED; @@ -316,7 +316,7 @@ static HRESULT IDirectSoundFullDuplex_IDirectSound8_Create( pdsfdds8->lpVtbl = &DirectSoundFullDuplex_DirectSound8_Vtbl; pdsfdds8->ref = 0; - pdsfdds8->pdsfd = (IDirectSoundFullDuplexImpl *)pdsfd; + pdsfdds8->pdsfd = pdsfd; *ppds8 = (LPDIRECTSOUND8)pdsfdds8; @@ -399,7 +399,7 @@ static const IDirectSoundCaptureVtbl DirectSoundFullDuplex_DirectSoundCapture_Vt }; static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create( - LPDIRECTSOUNDFULLDUPLEX pdsfd, + IDirectSoundFullDuplexImpl *pdsfd, LPDIRECTSOUNDCAPTURE8 * ppdsc8) { IDirectSoundFullDuplex_IDirectSoundCapture * pdsfddsc; @@ -415,7 +415,7 @@ static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create( return DSERR_INVALIDPARAM; } - if (((IDirectSoundFullDuplexImpl*)pdsfd)->capture_device == NULL) { + if (pdsfd->capture_device == NULL) { WARN("not initialized\n"); *ppdsc8 = NULL; return DSERR_UNINITIALIZED; @@ -430,7 +430,7 @@ static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create( pdsfddsc->lpVtbl = &DirectSoundFullDuplex_DirectSoundCapture_Vtbl; pdsfddsc->ref = 0; - pdsfddsc->pdsfd = (IDirectSoundFullDuplexImpl *)pdsfd; + pdsfddsc->pdsfd = pdsfd; *ppdsc8 = (LPDIRECTSOUNDCAPTURE)pdsfddsc; @@ -485,7 +485,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_QueryInterface(IDirectSoundFull } else if (IsEqualIID(riid, &IID_IDirectSound) || IsEqualIID(riid, &IID_IDirectSound8)) { if (!This->pDS8) { - IDirectSoundFullDuplex_IDirectSound8_Create(iface, &This->pDS8); + IDirectSoundFullDuplex_IDirectSound8_Create(This, &This->pDS8); if (!This->pDS8) { WARN("IDirectSoundFullDuplex_IDirectSound8_Create() failed\n"); *ppv = NULL; @@ -497,7 +497,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_QueryInterface(IDirectSoundFull return S_OK; } else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) { if (!This->pDSC) { - IDirectSoundFullDuplex_IDirectSoundCapture_Create(iface, &This->pDSC); + IDirectSoundFullDuplex_IDirectSoundCapture_Create(This, &This->pDSC); if (!This->pDSC) { WARN("IDirectSoundFullDuplex_IDirectSoundCapture_Create() failed\n"); *ppv = NULL;

1 0

Michael Stefaniuc : dsound: Add an object refcount for DirectSoundFullDuplex.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 6692f97e01b6c06c247f11e51b327f9ca4b277c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6692f97e01b6c06c247f11e51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:40:59 2012 +0200 dsound: Add an object refcount for DirectSoundFullDuplex. --- dlls/dsound/duplex.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index c9f08c4..0e9320a 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -43,8 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); typedef struct IDirectSoundFullDuplexImpl { IDirectSoundFullDuplex IDirectSoundFullDuplex_iface; - LONG ref; - + LONG ref, numIfaces; /* IDirectSoundFullDuplexImpl fields */ IDirectSound8 *renderer_device; IDirectSoundCapture *capture_device; @@ -72,6 +71,16 @@ typedef struct IDirectSoundFullDuplex_IDirectSoundCapture { IDirectSoundFullDuplexImpl *pdsfd; } IDirectSoundFullDuplex_IDirectSoundCapture; +static void fullduplex_destroy(IDirectSoundFullDuplexImpl *This) +{ + if (This->capture_device) + IDirectSoundCapture_Release(This->capture_device); + if (This->renderer_device) + IDirectSound_Release(This->renderer_device); + HeapFree(GetProcessHeap(), 0, This); + TRACE("(%p) released\n", This); +} + /******************************************************************************* * IUnknown */ @@ -449,7 +458,11 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_AddRef(IDirectSoundFullDuplex *if { IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + + TRACE("(%p) ref=%d\n", This, ref); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); return ref; } @@ -516,16 +529,11 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_Release(IDirectSoundFullDuplex *i { IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); - if (!ref) { - if (This->capture_device) - IDirectSoundCapture_Release(This->capture_device); - if (This->renderer_device) - IDirectSound_Release(This->renderer_device); - HeapFree( GetProcessHeap(), 0, This ); - TRACE("(%p) released\n", This); - } + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref && !InterlockedDecrement(&This->numIfaces)) + fullduplex_destroy(This); return ref; } @@ -634,6 +642,7 @@ HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) obj->IDirectSoundFullDuplex_iface.lpVtbl = &dsfd_vtbl; obj->ref = 1; + obj->numIfaces = 1; hr = IUnknown_QueryInterface((IUnknown*)obj, riid, ppv); IUnknown_Release((IUnknown*)obj);

1 0

Michael Stefaniuc : dsound: Merge IUnknown into the main DirectSoundFullDuplex object.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: bd4c67396bd9ce964d631e25688801ce46f37126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4c67396bd9ce964d631e256… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:43:25 2012 +0200 dsound: Merge IUnknown into the main DirectSoundFullDuplex object. --- dlls/dsound/duplex.c | 121 ++++++++++++++++---------------------------------- 1 files changed, 39 insertions(+), 82 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 0e9320a..7ec8590 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -42,23 +42,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); */ typedef struct IDirectSoundFullDuplexImpl { + IUnknown IUnknown_iface; IDirectSoundFullDuplex IDirectSoundFullDuplex_iface; - LONG ref, numIfaces; + LONG ref, refdsfd, numIfaces; /* IDirectSoundFullDuplexImpl fields */ IDirectSound8 *renderer_device; IDirectSoundCapture *capture_device; - - LPUNKNOWN pUnknown; LPDIRECTSOUND8 pDS8; LPDIRECTSOUNDCAPTURE pDSC; } IDirectSoundFullDuplexImpl; -typedef struct IDirectSoundFullDuplex_IUnknown { - const IUnknownVtbl *lpVtbl; - LONG ref; - IDirectSoundFullDuplexImpl *pdsfd; -} IDirectSoundFullDuplex_IUnknown; - typedef struct IDirectSoundFullDuplex_IDirectSound8 { const IDirectSound8Vtbl *lpVtbl; LONG ref; @@ -82,81 +75,51 @@ static void fullduplex_destroy(IDirectSoundFullDuplexImpl *This) } /******************************************************************************* - * IUnknown + * IUnknown implemetation for DirectSoundFullDuplex */ -static HRESULT WINAPI IDirectSoundFullDuplex_IUnknown_QueryInterface( - LPUNKNOWN iface, - REFIID riid, - LPVOID * ppobj) +static inline IDirectSoundFullDuplexImpl *impl_from_IUnknown(IUnknown *iface) { - IDirectSoundFullDuplex_IUnknown *This = (IDirectSoundFullDuplex_IUnknown *)iface; - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); - return IDirectSoundFullDuplex_QueryInterface((LPDIRECTSOUNDFULLDUPLEX)This->pdsfd, riid, ppobj); + return CONTAINING_RECORD(iface, IDirectSoundFullDuplexImpl, IUnknown_iface); } -static ULONG WINAPI IDirectSoundFullDuplex_IUnknown_AddRef( - LPUNKNOWN iface) +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - IDirectSoundFullDuplex_IUnknown *This = (IDirectSoundFullDuplex_IUnknown *)iface; - ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); - return ref; + IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); + return IDirectSoundFullDuplex_QueryInterface(&This->IDirectSoundFullDuplex_iface, riid, ppv); } -static ULONG WINAPI IDirectSoundFullDuplex_IUnknown_Release( - LPUNKNOWN iface) +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) { - IDirectSoundFullDuplex_IUnknown *This = (IDirectSoundFullDuplex_IUnknown *)iface; - ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref) { - This->pdsfd->pUnknown = NULL; - HeapFree(GetProcessHeap(), 0, This); - TRACE("(%p) released\n", This); - } + IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); return ref; } -static const IUnknownVtbl DirectSoundFullDuplex_Unknown_Vtbl = -{ - IDirectSoundFullDuplex_IUnknown_QueryInterface, - IDirectSoundFullDuplex_IUnknown_AddRef, - IDirectSoundFullDuplex_IUnknown_Release -}; - -static HRESULT IDirectSoundFullDuplex_IUnknown_Create( - LPDIRECTSOUNDFULLDUPLEX pdsfd, - LPUNKNOWN * ppunk) +static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) { - IDirectSoundFullDuplex_IUnknown * pdsfdunk; - TRACE("(%p,%p)\n",pdsfd,ppunk); - - if (pdsfd == NULL) { - ERR("invalid parameter: pdsfd == NULL\n"); - return DSERR_INVALIDPARAM; - } - - if (ppunk == NULL) { - ERR("invalid parameter: ppunk == NULL\n"); - return DSERR_INVALIDPARAM; - } + IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); - pdsfdunk = HeapAlloc(GetProcessHeap(),0,sizeof(*pdsfdunk)); - if (pdsfdunk == NULL) { - WARN("out of memory\n"); - *ppunk = NULL; - return DSERR_OUTOFMEMORY; - } - - pdsfdunk->lpVtbl = &DirectSoundFullDuplex_Unknown_Vtbl; - pdsfdunk->ref = 0; - pdsfdunk->pdsfd = (IDirectSoundFullDuplexImpl *)pdsfd; - - *ppunk = (LPUNKNOWN)pdsfdunk; + TRACE("(%p) ref=%d\n", This, ref); - return DS_OK; + if (!ref && !InterlockedDecrement(&This->numIfaces)) + fullduplex_destroy(This); + return ref; } +static const IUnknownVtbl unk_vtbl = +{ + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release +}; + /******************************************************************************* * IDirectSoundFullDuplex_IDirectSound8 */ @@ -457,7 +420,7 @@ static inline IDirectSoundFullDuplexImpl *impl_from_IDirectSoundFullDuplex(IDire static ULONG WINAPI IDirectSoundFullDuplexImpl_AddRef(IDirectSoundFullDuplex *iface) { IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); - ULONG ref = InterlockedIncrement(&(This->ref)); + ULONG ref = InterlockedIncrement(&This->refdsfd); TRACE("(%p) ref=%d\n", This, ref); @@ -480,16 +443,8 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_QueryInterface(IDirectSoundFull *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) { - if (!This->pUnknown) { - IDirectSoundFullDuplex_IUnknown_Create(iface, &This->pUnknown); - if (!This->pUnknown) { - WARN("IDirectSoundFullDuplex_IUnknown_Create() failed\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - } - IDirectSoundFullDuplex_IUnknown_AddRef(This->pUnknown); - *ppv = This->pUnknown; + IUnknown_AddRef(&This->IUnknown_iface); + *ppv = &This->IUnknown_iface; return S_OK; } else if (IsEqualIID(riid, &IID_IDirectSoundFullDuplex)) { IDirectSoundFullDuplexImpl_AddRef(iface); @@ -528,7 +483,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_QueryInterface(IDirectSoundFull static ULONG WINAPI IDirectSoundFullDuplexImpl_Release(IDirectSoundFullDuplex *iface) { IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); - ULONG ref = InterlockedDecrement(&(This->ref)); + ULONG ref = InterlockedDecrement(&This->refdsfd); TRACE("(%p) ref=%d\n", This, ref); @@ -641,11 +596,13 @@ HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) setup_dsound_options(); obj->IDirectSoundFullDuplex_iface.lpVtbl = &dsfd_vtbl; + obj->IUnknown_iface.lpVtbl = &unk_vtbl; obj->ref = 1; + obj->refdsfd = 0; obj->numIfaces = 1; - hr = IUnknown_QueryInterface((IUnknown*)obj, riid, ppv); - IUnknown_Release((IUnknown*)obj); + hr = IUnknown_QueryInterface(&obj->IUnknown_iface, riid, ppv); + IUnknown_Release(&obj->IUnknown_iface); return hr; }

1 0