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

dsound: Merge IUnknown into the main DirectSound object.

Browse Source
This commit is contained in:
Michael Stefaniuc 2012-07-19 01:54:54 +02:00 committed by Alexandre Julliard
parent 478191c059
commit 8978a4b51b
2 changed files with 40 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
dlls/dsound/dsound.c
View File

@ -44,14 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound);
/***************************************************************************** /*****************************************************************************
* IDirectSound COM components * IDirectSound COM components
*/ */
struct IDirectSound_IUnknown {
const IUnknownVtbl *lpVtbl;
LONG ref;
LPDIRECTSOUND8 pds;
};
static HRESULT IDirectSound_IUnknown_Create(LPDIRECTSOUND8 pds, LPUNKNOWN * ppunk);
struct IDirectSound_IDirectSound { struct IDirectSound_IDirectSound {
const IDirectSoundVtbl *lpVtbl; const IDirectSoundVtbl *lpVtbl;
LONG ref; LONG ref;
@ -72,20 +64,15 @@ struct IDirectSound8_IDirectSound8 {
static HRESULT IDirectSound8_IDirectSound8_Create(LPDIRECTSOUND8 pds, LPDIRECTSOUND8 * ppds); static HRESULT IDirectSound8_IDirectSound8_Create(LPDIRECTSOUND8 pds, LPDIRECTSOUND8 * ppds);
static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface); static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface);
/***************************************************************************** typedef struct IDirectSoundImpl {
* IDirectSound implementation structure IUnknown IUnknown_iface; /* Separate refcount, not for COM aggregation */
*/ LONG ref, numIfaces;
struct IDirectSoundImpl
{
LONG numIfaces;
DirectSoundDevice *device; DirectSoundDevice *device;
BOOL has_ds8; BOOL has_ds8;
LPUNKNOWN pUnknown;
LPDIRECTSOUND pDS; LPDIRECTSOUND pDS;
LPDIRECTSOUND8 pDS8; LPDIRECTSOUND8 pDS8;
}; } IDirectSoundImpl;
static ULONG WINAPI IDirectSound_IUnknown_AddRef(LPUNKNOWN iface);
static ULONG WINAPI IDirectSound_IDirectSound_AddRef(LPDIRECTSOUND iface); static ULONG WINAPI IDirectSound_IDirectSound_AddRef(LPDIRECTSOUND iface);
const char * dumpCooperativeLevel(DWORD level) const char * dumpCooperativeLevel(DWORD level)
@ -172,16 +159,8 @@ static HRESULT DSOUND_QueryInterface(
} }
if (IsEqualIID(riid, &IID_IUnknown)) { if (IsEqualIID(riid, &IID_IUnknown)) {
if (!This->pUnknown) { IUnknown_AddRef(&This->IUnknown_iface);
IDirectSound_IUnknown_Create(iface, &This->pUnknown); *ppobj = &This->IUnknown_iface;
if (!This->pUnknown) {
WARN("IDirectSound_IUnknown_Create() failed\n");
*ppobj = NULL;
return E_NOINTERFACE;
}
}
IDirectSound_IUnknown_AddRef(This->pUnknown);
*ppobj = This->pUnknown;
return S_OK; return S_OK;
} else if (IsEqualIID(riid, &IID_IDirectSound)) { } else if (IsEqualIID(riid, &IID_IDirectSound)) {
if (!This->pDS) { if (!This->pDS) {
@ -223,84 +202,53 @@ static void directsound_destroy(IDirectSoundImpl *This)
} }
/******************************************************************************* /*******************************************************************************
* IDirectSound_IUnknown * IUnknown Implementation for DirectSound
*/ */
static HRESULT WINAPI IDirectSound_IUnknown_QueryInterface( static inline IDirectSoundImpl *impl_from_IUnknown(IUnknown *iface)
LPUNKNOWN iface,
REFIID riid,
LPVOID * ppobj)
{ {
IDirectSound_IUnknown *This = (IDirectSound_IUnknown *)iface; return CONTAINING_RECORD(iface, IDirectSoundImpl, IUnknown_iface);
TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
return DSOUND_QueryInterface(This->pds, riid, ppobj);
} }
static ULONG WINAPI IDirectSound_IUnknown_AddRef( static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)
LPUNKNOWN iface)
{ {
IDirectSound_IUnknown *This = (IDirectSound_IUnknown *)iface; IDirectSoundImpl *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&(This->ref)); TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv);
TRACE("(%p) ref was %d\n", This, ref - 1); return DSOUND_QueryInterface((IDirectSound8 *)This, riid, ppv);
}
static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface)
{
IDirectSoundImpl *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; return ref;
} }
static ULONG WINAPI IDirectSound_IUnknown_Release( static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface)
LPUNKNOWN iface)
{ {
IDirectSound_IUnknown *This = (IDirectSound_IUnknown *)iface; IDirectSoundImpl *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&(This->ref)); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref was %d\n", This, ref + 1);
if (!ref && !InterlockedDecrement(&((IDirectSoundImpl *)This->pds)->numIfaces)) { TRACE("(%p) ref=%d\n", This, ref);
((IDirectSoundImpl*)This->pds)->pUnknown = NULL;
directsound_destroy((IDirectSoundImpl*)This->pds); if (!ref && !InterlockedDecrement(&This->numIfaces))
HeapFree(GetProcessHeap(), 0, This); directsound_destroy(This);
TRACE("(%p) released\n", This);
}
return ref; return ref;
} }
static const IUnknownVtbl DirectSound_Unknown_Vtbl = static const IUnknownVtbl unk_vtbl =
{ {
IDirectSound_IUnknown_QueryInterface, IUnknownImpl_QueryInterface,
IDirectSound_IUnknown_AddRef, IUnknownImpl_AddRef,
IDirectSound_IUnknown_Release IUnknownImpl_Release
}; };
static HRESULT IDirectSound_IUnknown_Create(
LPDIRECTSOUND8 pds,
LPUNKNOWN * ppunk)
{
IDirectSound_IUnknown * pdsunk;
TRACE("(%p,%p)\n",pds,ppunk);
if (ppunk == NULL) {
ERR("invalid parameter: ppunk == NULL\n");
return DSERR_INVALIDPARAM;
}
if (pds == NULL) {
ERR("invalid parameter: pds == NULL\n");
*ppunk = NULL;
return DSERR_INVALIDPARAM;
}
pdsunk = HeapAlloc(GetProcessHeap(),0,sizeof(*pdsunk));
if (pdsunk == NULL) {
WARN("out of memory\n");
*ppunk = NULL;
return DSERR_OUTOFMEMORY;
}
pdsunk->lpVtbl = &DirectSound_Unknown_Vtbl;
pdsunk->ref = 0;
pdsunk->pds = pds;
InterlockedIncrement(&((IDirectSoundImpl *)pds)->numIfaces);
*ppunk = (LPUNKNOWN)pdsunk;
return DS_OK;
}
/******************************************************************************* /*******************************************************************************
* IDirectSound_IDirectSound * IDirectSound_IDirectSound
*/ */
@ -646,6 +594,8 @@ static HRESULT IDirectSoundImpl_Create(void **ppv, BOOL has_ds8)
return DSERR_OUTOFMEMORY; return DSERR_OUTOFMEMORY;
} }
obj->IUnknown_iface.lpVtbl = &unk_vtbl;
obj->ref = 0;
obj->numIfaces = 0; obj->numIfaces = 0;
obj->device = NULL; obj->device = NULL;
obj->has_ds8 = has_ds8; obj->has_ds8 = has_ds8;

2
dlls/dsound/dsound_private.h
View File

@ -39,8 +39,6 @@ extern int ds_default_bits_per_sample DECLSPEC_HIDDEN;
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
typedef struct IDirectSoundImpl IDirectSoundImpl;
typedef struct IDirectSound_IUnknown IDirectSound_IUnknown;
typedef struct IDirectSound_IDirectSound IDirectSound_IDirectSound; typedef struct IDirectSound_IDirectSound IDirectSound_IDirectSound;
typedef struct IDirectSound8_IDirectSound8 IDirectSound8_IDirectSound8; typedef struct IDirectSound8_IDirectSound8 IDirectSound8_IDirectSound8;
typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl;