Skip to content

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

Fixed a reference counting bug I introduced.

parent c5f775a9
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 9 deletions
dlls/dsound/primary.c
View file @ 05fb2c89
...@@ -571,20 +571,13 @@ static DWORD WINAPI PrimaryBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface) { ...@@ -571,20 +571,13 @@ static DWORD WINAPI PrimaryBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface) {
ref = InterlockedDecrement(&(This->ref)); ref = InterlockedDecrement(&(This->ref));
/* the listener has a reference to us which must be removed */ if (ref == 0) {
if ((ref == 0) || ((ref == 1) && (This->dsound->listener))) {
IDirectSound_Release((LPDIRECTSOUND)This->dsound); IDirectSound_Release((LPDIRECTSOUND)This->dsound);
if (This->dsound->listener) { if (This->dsound->listener) {
IDirectSound3DListener_Release((LPDIRECTSOUND3DLISTENER)This->dsound->listener); IDirectSound3DListener_Release((LPDIRECTSOUND3DLISTENER)This->dsound->listener);
This->dsound->listener = NULL; This->dsound->listener = NULL;
ref--;
} }
#if 0
if (This->iks) {
HeapFree(GetProcessHeap(), 0, This->iks);
}
#endif
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
} }
......
dlls/dsound/sound3d.c
View file @ 05fb2c89
...@@ -1042,7 +1042,8 @@ HRESULT WINAPI IDirectSound3DListenerImpl_Create( ...@@ -1042,7 +1042,8 @@ HRESULT WINAPI IDirectSound3DListenerImpl_Create(
InitializeCriticalSection(&dsl->lock); InitializeCriticalSection(&dsl->lock);
dsl->dsb = This; dsl->dsb = This;
IDirectSoundBuffer8_AddRef((LPDIRECTSOUNDBUFFER8)This); /* NOTE: don't add a reference because it would cause a circular reference */
/* IDirectSoundBuffer8_AddRef((LPDIRECTSOUNDBUFFER8)This); */
*pdsl = dsl; *pdsl = dsl;
return S_OK; return S_OK;
......
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