Module: wine Branch: master Commit: c7f5f10aab5a66a5bde93d31263afa095183c3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f5f10aab5a66a5bde93d3126...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Jan 20 00:28:16 2012 +0100
dsound: Merge IDirectSoundNotify into the secondary buffer object.
---
dlls/dsound/buffer.c | 138 +++++++++++++----------------------------- dlls/dsound/dsound_private.h | 9 +-- 2 files changed, 46 insertions(+), 101 deletions(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 0d03686..18af3f9 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -40,59 +40,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); * IDirectSoundNotify */
-struct IDirectSoundNotifyImpl +static inline struct IDirectSoundBufferImpl *impl_from_IDirectSoundNotify(IDirectSoundNotify *iface) { - /* IUnknown fields */ - const IDirectSoundNotifyVtbl *lpVtbl; - LONG ref; - IDirectSoundBufferImpl* dsb; -}; + return CONTAINING_RECORD(iface, struct IDirectSoundBufferImpl, IDirectSoundNotify_iface); +}
-static HRESULT IDirectSoundNotifyImpl_Create(IDirectSoundBufferImpl *dsb, - IDirectSoundNotifyImpl **pdsn); -static HRESULT IDirectSoundNotifyImpl_Destroy(IDirectSoundNotifyImpl *pdsn); +static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface(IDirectSoundNotify *iface, REFIID riid, + void **ppobj) +{ + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface);
-static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface( - LPDIRECTSOUNDNOTIFY iface,REFIID riid,LPVOID *ppobj -) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppobj);
- if (This->dsb == NULL) { - WARN("invalid parameter\n"); - return E_INVALIDARG; - } - - return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER)This->dsb, riid, ppobj); + return IDirectSoundBuffer8_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); }
-static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(LPDIRECTSOUNDNOTIFY iface) +static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - ULONG ref = InterlockedIncrement(&(This->ref)); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); + ULONG ref = InterlockedIncrement(&This->refn); + TRACE("(%p) ref was %d\n", This, ref - 1); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); + return ref; }
-static ULONG WINAPI IDirectSoundNotifyImpl_Release(LPDIRECTSOUNDNOTIFY iface) +static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - ULONG ref = InterlockedDecrement(&(This->ref)); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); + ULONG ref = InterlockedDecrement(&This->refn); + TRACE("(%p) ref was %d\n", This, ref + 1);
- if (!ref) { - This->dsb->notify = NULL; - IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); - HeapFree(GetProcessHeap(), 0, This); - TRACE("(%p) released\n", This); - } + if (!ref && !InterlockedDecrement(&This->numIfaces)) + secondarybuffer_destroy(This); + return ref; }
-static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( - LPDIRECTSOUNDNOTIFY iface,DWORD howmuch,LPCDSBPOSITIONNOTIFY notify -) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; +static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, + DWORD howmuch, const DSBPOSITIONNOTIFY *notify) +{ + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); + TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify);
if (howmuch > 0 && notify == NULL) { @@ -110,20 +103,20 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( if (howmuch > 0) { /* Make an internal copy of the caller-supplied array. * Replace the existing copy if one is already present. */ - HeapFree(GetProcessHeap(), 0, This->dsb->notifies); - This->dsb->notifies = HeapAlloc(GetProcessHeap(), 0, + HeapFree(GetProcessHeap(), 0, This->notifies); + This->notifies = HeapAlloc(GetProcessHeap(), 0, howmuch * sizeof(DSBPOSITIONNOTIFY));
- if (This->dsb->notifies == NULL) { + if (This->notifies == NULL) { WARN("out of memory\n"); return DSERR_OUTOFMEMORY; } - CopyMemory(This->dsb->notifies, notify, howmuch * sizeof(DSBPOSITIONNOTIFY)); - This->dsb->nrofnotifies = howmuch; + CopyMemory(This->notifies, notify, howmuch * sizeof(DSBPOSITIONNOTIFY)); + This->nrofnotifies = howmuch; } else { - HeapFree(GetProcessHeap(), 0, This->dsb->notifies); - This->dsb->notifies = NULL; - This->dsb->nrofnotifies = 0; + HeapFree(GetProcessHeap(), 0, This->notifies); + This->notifies = NULL; + This->nrofnotifies = 0; }
return S_OK; @@ -137,40 +130,6 @@ static const IDirectSoundNotifyVtbl dsnvt = IDirectSoundNotifyImpl_SetNotificationPositions, };
-static HRESULT IDirectSoundNotifyImpl_Create( - IDirectSoundBufferImpl * dsb, - IDirectSoundNotifyImpl **pdsn) -{ - IDirectSoundNotifyImpl * dsn; - TRACE("(%p,%p)\n",dsb,pdsn); - - dsn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dsn)); - - if (dsn == NULL) { - WARN("out of memory\n"); - return DSERR_OUTOFMEMORY; - } - - dsn->ref = 0; - dsn->lpVtbl = &dsnvt; - dsn->dsb = dsb; - dsb->notify = dsn; - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)dsb); - - *pdsn = dsn; - return DS_OK; -} - -static HRESULT IDirectSoundNotifyImpl_Destroy( - IDirectSoundNotifyImpl *pdsn) -{ - TRACE("(%p)\n",pdsn); - - while (IDirectSoundNotifyImpl_Release((LPDIRECTSOUNDNOTIFY)pdsn) > 0); - - return DS_OK; -} - /******************************************************************************* * IDirectSoundBuffer */ @@ -800,15 +759,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(IDirectSoundBuffer8 }
if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { - if (!This->notify) - IDirectSoundNotifyImpl_Create(This, &(This->notify)); - if (This->notify) { - IDirectSoundNotify_AddRef((LPDIRECTSOUNDNOTIFY)This->notify); - *ppobj = This->notify; - return S_OK; - } - WARN("IID_IDirectSoundNotify\n"); - return E_NOINTERFACE; + IDirectSoundNotify_AddRef(&This->IDirectSoundNotify_iface); + *ppobj = &This->IDirectSoundNotify_iface; + return S_OK; }
if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) { @@ -889,11 +842,13 @@ HRESULT IDirectSoundBufferImpl_Create( TRACE("Created buffer at %p\n", dsb);
dsb->ref = 0; + dsb->refn = 0; dsb->ref3D = 0; dsb->refiks = 0; dsb->numIfaces = 0; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = &dsbvt; + dsb->IDirectSoundNotify_iface.lpVtbl = &dsnvt; dsb->IDirectSound3DBuffer_iface.lpVtbl = &ds3dbvt; dsb->IKsPropertySet_iface.lpVtbl = &iksbvt;
@@ -915,7 +870,6 @@ HRESULT IDirectSoundBufferImpl_Create( dsb->buflen = dsbd->dwBufferBytes;
dsb->freq = dsbd->lpwfxFormat->nSamplesPerSec; - dsb->notify = NULL; dsb->notifies = NULL; dsb->nrofnotifies = 0;
@@ -1036,12 +990,6 @@ HRESULT IDirectSoundBufferImpl_Destroy( * this object until it is ready to be deleted */ InterlockedIncrement(&pdsb->numIfaces);
- if (pdsb->notify) { - WARN("notify not NULL\n"); - IDirectSoundNotifyImpl_Destroy(pdsb->notify); - pdsb->notify = NULL; - } - secondarybuffer_destroy(pdsb);
return S_OK; @@ -1080,12 +1028,12 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->buffer->ref++; list_add_head(&dsb->buffer->buffers, &dsb->entry); dsb->ref = 0; + dsb->refn = 0; dsb->ref3D = 0; dsb->refiks = 0; dsb->numIfaces = 0; dsb->state = STATE_STOPPED; dsb->buf_mixpos = dsb->sec_mixpos = 0; - dsb->notify = NULL; dsb->notifies = NULL; dsb->nrofnotifies = 0; dsb->device = device; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d63ee24..10bd281 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -48,7 +48,6 @@ typedef struct IDirectSound8_IDirectSound8 IDirectSound8_IDirectSound8; typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; typedef struct IDirectSoundCaptureImpl IDirectSoundCaptureImpl; typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBufferImpl; -typedef struct IDirectSoundNotifyImpl IDirectSoundNotifyImpl; typedef struct DirectSoundDevice DirectSoundDevice; typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice;
@@ -163,11 +162,12 @@ HRESULT DirectSoundDevice_VerifyCertification(DirectSoundDevice * device, struct IDirectSoundBufferImpl { IDirectSoundBuffer8 IDirectSoundBuffer8_iface; + IDirectSoundNotify IDirectSoundNotify_iface; IDirectSound3DListener IDirectSound3DListener_iface; /* only primary buffer */ IDirectSound3DBuffer IDirectSound3DBuffer_iface; /* only secondary buffer */ IKsPropertySet IKsPropertySet_iface; LONG numIfaces; /* "in use interfaces" refcount */ - LONG ref, ref3D, refiks; + LONG ref, refn, ref3D, refiks; /* IDirectSoundBufferImpl fields */ DirectSoundDevice* device; RTL_RWLOCK lock; @@ -183,12 +183,9 @@ struct IDirectSoundBufferImpl ULONG freqneeded, freqAdjust, freqAcc, freqAccNext; /* used for mixing */ DWORD primary_mixpos, buf_mixpos, sec_mixpos; - - /* IDirectSoundNotifyImpl fields */ - IDirectSoundNotifyImpl* notify; + /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; - /* DirectSound3DBuffer fields */ DS3DBUFFER ds3db_ds3db; LONG ds3db_lVolume;