Skip to content

W
wine-cw
Commit 57444565 authored by Robert Reif's avatar Robert Reif Committed by Alexandre Julliard
Browse files
Options

Fix PrimaryBufferImpl pointer to deleted DirectSoundImpl.

parent c734d933
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
dlls/dsound/dsound.c
View file @ 57444565
...@@ -247,9 +247,13 @@ static ULONG WINAPI IDirectSoundImpl_Release( ...@@ -247,9 +247,13 @@ static ULONG WINAPI IDirectSoundImpl_Release(
TRACE("(%p) ref was %ld\n", This, ref + 1); TRACE("(%p) ref was %ld\n", This, ref + 1);
if (!ref) { if (!ref) {
if (This->device) if (This->device) {
DirectSoundDevice_Release(This->device); if (DirectSoundDevice_Release(This->device) != 0) {
/* device not released so make sure primary reference to This removed */
if (This->device->primary)
This->device->primary->dsound = NULL;
}
}
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
TRACE("(%p) released\n", This); TRACE("(%p) released\n", This);
} }
...@@ -325,6 +329,7 @@ static HRESULT WINAPI DSOUND_CreateSoundBuffer( ...@@ -325,6 +329,7 @@ static HRESULT WINAPI DSOUND_CreateSoundBuffer(
WARN("Primary Buffer already created\n"); WARN("Primary Buffer already created\n");
IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(This->device->primary)); IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(This->device->primary));
*ppdsb = (LPDIRECTSOUNDBUFFER)(This->device->primary); *ppdsb = (LPDIRECTSOUNDBUFFER)(This->device->primary);
This->device->primary->dsound = This;
} else { } else {
This->device->dsbd = *dsbd; This->device->dsbd = *dsbd;
hres = PrimaryBufferImpl_Create(This, (PrimaryBufferImpl**)&(This->device->primary), &(This->device->dsbd)); hres = PrimaryBufferImpl_Create(This, (PrimaryBufferImpl**)&(This->device->primary), &(This->device->dsbd));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment