marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dsound: Rename the DirectSound object refcount to "numIfaces".

oldstable
Michael Stefaniuc 2012-07-19 01:51:26 +02:00 committed by Alexandre Julliard
parent 4992e6a515
commit a565c0fadf
1 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dlls/dsound/dsound.c
View File

@ -77,9 +77,8 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface);
*/ */
struct IDirectSoundImpl struct IDirectSoundImpl
{ {
LONG ref; LONG numIfaces;
DirectSoundDevice *device;
DirectSoundDevice *device;
BOOL has_ds8; BOOL has_ds8;
LPUNKNOWN pUnknown; LPUNKNOWN pUnknown;
LPDIRECTSOUND pDS; LPDIRECTSOUND pDS;
@ -217,29 +216,12 @@ static HRESULT DSOUND_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG IDirectSoundImpl_AddRef( static void directsound_destroy(IDirectSoundImpl *This)
LPDIRECTSOUND8 iface)
{ {
IDirectSoundImpl *This = (IDirectSoundImpl *)iface; if (This->device)
ULONG ref = InterlockedIncrement(&(This->ref)); DirectSoundDevice_Release(This->device);
TRACE("(%p) ref was %d\n", This, ref - 1); HeapFree(GetProcessHeap(),0,This);
return ref; TRACE("(%p) released\n", This);
}
static ULONG IDirectSoundImpl_Release(
LPDIRECTSOUND8 iface)
{
IDirectSoundImpl *This = (IDirectSoundImpl *)iface;
ULONG ref = InterlockedDecrement(&(This->ref));
TRACE("(%p) ref was %d\n", This, ref + 1);
if (!ref) {
if (This->device)
DirectSoundDevice_Release(This->device);
HeapFree(GetProcessHeap(),0,This);
TRACE("(%p) released\n", This);
}
return ref;
} }
static HRESULT IDirectSoundImpl_Create(IDirectSound8 **ppDS, BOOL has_ds8) static HRESULT IDirectSoundImpl_Create(IDirectSound8 **ppDS, BOOL has_ds8)
@ -255,7 +237,7 @@ static HRESULT IDirectSoundImpl_Create(IDirectSound8 **ppDS, BOOL has_ds8)
return DSERR_OUTOFMEMORY; return DSERR_OUTOFMEMORY;
} }
pDS->ref = 0; pDS->numIfaces = 0;
pDS->device = NULL; pDS->device = NULL;
pDS->has_ds8 = has_ds8; pDS->has_ds8 = has_ds8;
@ -292,9 +274,9 @@ static ULONG WINAPI IDirectSound_IUnknown_Release(
IDirectSound_IUnknown *This = (IDirectSound_IUnknown *)iface; IDirectSound_IUnknown *This = (IDirectSound_IUnknown *)iface;
ULONG ref = InterlockedDecrement(&(This->ref)); ULONG ref = InterlockedDecrement(&(This->ref));
TRACE("(%p) ref was %d\n", This, ref + 1); TRACE("(%p) ref was %d\n", This, ref + 1);
if (!ref) { if (!ref && !InterlockedDecrement(&((IDirectSoundImpl *)This->pds)->numIfaces)) {
((IDirectSoundImpl*)This->pds)->pUnknown = NULL; ((IDirectSoundImpl*)This->pds)->pUnknown = NULL;
IDirectSoundImpl_Release(This->pds); directsound_destroy((IDirectSoundImpl*)This->pds);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
TRACE("(%p) released\n", This); TRACE("(%p) released\n", This);
} }
@ -337,7 +319,7 @@ static HRESULT IDirectSound_IUnknown_Create(
pdsunk->ref = 0; pdsunk->ref = 0;
pdsunk->pds = pds; pdsunk->pds = pds;
IDirectSoundImpl_AddRef(pds); InterlockedIncrement(&((IDirectSoundImpl *)pds)->numIfaces);
*ppunk = (LPUNKNOWN)pdsunk; *ppunk = (LPUNKNOWN)pdsunk;
return DS_OK; return DS_OK;
@ -371,9 +353,9 @@ static ULONG WINAPI IDirectSound_IDirectSound_Release(
IDirectSound_IDirectSound *This = (IDirectSound_IDirectSound *)iface; IDirectSound_IDirectSound *This = (IDirectSound_IDirectSound *)iface;
ULONG ref = InterlockedDecrement(&(This->ref)); ULONG ref = InterlockedDecrement(&(This->ref));
TRACE("(%p) ref was %d\n", This, ref + 1); TRACE("(%p) ref was %d\n", This, ref + 1);
if (!ref) { if (!ref && !InterlockedDecrement(&((IDirectSoundImpl *)This->pds)->numIfaces)) {
((IDirectSoundImpl*)This->pds)->pDS = NULL; ((IDirectSoundImpl*)This->pds)->pDS = NULL;
IDirectSoundImpl_Release(This->pds); directsound_destroy((IDirectSoundImpl*)This->pds);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
TRACE("(%p) released\n", This); TRACE("(%p) released\n", This);
} }
@ -499,7 +481,7 @@ static HRESULT IDirectSound_IDirectSound_Create(
pdsds->ref = 0; pdsds->ref = 0;
pdsds->pds = pds; pdsds->pds = pds;
IDirectSoundImpl_AddRef(pds); InterlockedIncrement(&((IDirectSoundImpl *)pds)->numIfaces);
*ppds = (LPDIRECTSOUND)pdsds; *ppds = (LPDIRECTSOUND)pdsds;
return DS_OK; return DS_OK;
@ -533,9 +515,9 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_Release(
IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface;
ULONG ref = InterlockedDecrement(&(This->ref)); ULONG ref = InterlockedDecrement(&(This->ref));
TRACE("(%p) ref was %d\n", This, ref + 1); TRACE("(%p) ref was %d\n", This, ref + 1);
if (!ref) { if (!ref && !InterlockedDecrement(&((IDirectSoundImpl *)This->pds)->numIfaces)) {
((IDirectSoundImpl*)This->pds)->pDS8 = NULL; ((IDirectSoundImpl*)This->pds)->pDS8 = NULL;
IDirectSoundImpl_Release(This->pds); directsound_destroy((IDirectSoundImpl*)This->pds);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
TRACE("(%p) released\n", This); TRACE("(%p) released\n", This);
} }
@ -671,7 +653,7 @@ static HRESULT IDirectSound8_IDirectSound8_Create(
pdsds->ref = 0; pdsds->ref = 0;
pdsds->pds = pds; pdsds->pds = pds;
IDirectSoundImpl_AddRef(pds); InterlockedIncrement(&((IDirectSoundImpl *)pds)->numIfaces);
*ppds = (LPDIRECTSOUND8)pdsds; *ppds = (LPDIRECTSOUND8)pdsds;
return DS_OK; return DS_OK;