From b6fcb2043313e46253bd2f95598a052808cd7088 Mon Sep 17 00:00:00 2001 From: Ken Thomases Date: Mon, 23 Feb 2009 17:34:03 -0600 Subject: [PATCH] dsound: Consolidate some duplicate code. --- dlls/dsound/buffer.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index abff0c934c6..688ad7183a1 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -380,17 +380,9 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface) DirectSoundDevice_RemoveBuffer(This->device, This); RtlDeleteResource(&This->lock); - if (This->hwbuf) { + if (This->hwbuf) IDsDriverBuffer_Release(This->hwbuf); - if (This->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) { - This->buffer->ref--; - list_remove(&This->entry); - if (This->buffer->ref==0) { - HeapFree(GetProcessHeap(),0,This->buffer->memory); - HeapFree(GetProcessHeap(),0,This->buffer); - } - } - } else { + if (!This->hwbuf || (This->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY)) { This->buffer->ref--; list_remove(&This->entry); if (This->buffer->ref==0) {