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

dsound: Add an extra refcount for the capture buffer object.

This commit is contained in:
Michael Stefaniuc 2012-01-12 00:11:20 +01:00 committed by Alexandre Julliard
parent e8f7ddf774
commit 3dac0e5a4f
2 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
dlls/dsound/capture.c
View File

@ -44,6 +44,34 @@
WINE_DEFAULT_DEBUG_CHANNEL(dsound); WINE_DEFAULT_DEBUG_CHANNEL(dsound);
static void capturebuffer_destroy(IDirectSoundCaptureBufferImpl *This)
{
if (This->device->state == STATE_CAPTURING)
This->device->state = STATE_STOPPING;
HeapFree(GetProcessHeap(),0, This->pdscbd);
if (This->device->client) {
IAudioClient_Release(This->device->client);
This->device->client = NULL;
}
if (This->device->capture) {
IAudioCaptureClient_Release(This->device->capture);
This->device->capture = NULL;
}
/* remove from DirectSoundCaptureDevice */
This->device->capture_buffer = NULL;
if (This->notify)
IDirectSoundNotify_Release((LPDIRECTSOUNDNOTIFY)This->notify);
HeapFree(GetProcessHeap(), 0, This->notifies);
HeapFree(GetProcessHeap(), 0, This);
TRACE("(%p) released\n", This);
}
/***************************************************************************** /*****************************************************************************
* IDirectSoundCaptureNotify implementation structure * IDirectSoundCaptureNotify implementation structure
*/ */
@ -228,46 +256,26 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_QueryInterface(IDirectSoundC
static ULONG WINAPI IDirectSoundCaptureBufferImpl_AddRef(IDirectSoundCaptureBuffer8 *iface) static ULONG WINAPI IDirectSoundCaptureBufferImpl_AddRef(IDirectSoundCaptureBuffer8 *iface)
{ {
IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface);
ULONG ref = InterlockedIncrement(&(This->ref)); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref was %d\n", This, ref - 1); TRACE("(%p) ref was %d\n", This, ref - 1);
if(ref == 1)
InterlockedIncrement(&This->numIfaces);
return ref; return ref;
} }
static ULONG WINAPI IDirectSoundCaptureBufferImpl_Release(IDirectSoundCaptureBuffer8 *iface) static ULONG WINAPI IDirectSoundCaptureBufferImpl_Release(IDirectSoundCaptureBuffer8 *iface)
{ {
IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(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(&This->numIfaces))
TRACE("deleting object\n"); capturebuffer_destroy(This);
if (This->device->state == STATE_CAPTURING)
This->device->state = STATE_STOPPING;
HeapFree(GetProcessHeap(),0, This->pdscbd);
if (This->device->client) {
IAudioClient_Release(This->device->client);
This->device->client = NULL;
}
if (This->device->capture) {
IAudioCaptureClient_Release(This->device->capture);
This->device->capture = NULL;
}
/* remove from DirectSoundCaptureDevice */
This->device->capture_buffer = NULL;
if (This->notify)
IDirectSoundNotify_Release((LPDIRECTSOUNDNOTIFY)This->notify);
HeapFree(GetProcessHeap(), 0, This->notifies);
HeapFree( GetProcessHeap(), 0, This );
TRACE("(%p) released\n", This);
}
return ref; return ref;
} }
@ -697,7 +705,8 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create(
LPBYTE newbuf; LPBYTE newbuf;
DWORD buflen; DWORD buflen;
This->ref = 1; This->numIfaces = 0;
This->ref = 0;
This->device = device; This->device = device;
This->device->capture_buffer = This; This->device->capture_buffer = This;
This->notify = NULL; This->notify = NULL;
@ -771,6 +780,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create(
device->buflen = buflen; device->buflen = buflen;
} }
IDirectSoundCaptureBuffer_AddRef(&This->IDirectSoundCaptureBuffer8_iface);
*ppobj = This; *ppobj = This;
TRACE("returning DS_OK\n"); TRACE("returning DS_OK\n");

1
dlls/dsound/dsound_private.h
View File

@ -248,6 +248,7 @@ struct DirectSoundCaptureDevice
struct IDirectSoundCaptureBufferImpl struct IDirectSoundCaptureBufferImpl
{ {
IDirectSoundCaptureBuffer8 IDirectSoundCaptureBuffer8_iface; IDirectSoundCaptureBuffer8 IDirectSoundCaptureBuffer8_iface;
LONG numIfaces; /* "in use interfaces" refcount */
LONG ref; LONG ref;
/* IDirectSoundCaptureBuffer fields */ /* IDirectSoundCaptureBuffer fields */
DirectSoundCaptureDevice* device; DirectSoundCaptureDevice* device;