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

DirectSoundDevice reference count cleanup.

Browse Source
This commit is contained in:
Robert Reif 2005-10-10 10:29:13 +00:00 committed by Alexandre Julliard
parent cdec2ee7ce
commit 0966d61344
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/dsound/dsound.c
View File

@ -45,6 +45,7 @@ static ULONG WINAPI IDirectSound8_IDirectSound_AddRef(LPDIRECTSOUND iface);
static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface); static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface);
static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice); static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice);
static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device);
static ULONG DirectSoundDevice_Release(DirectSoundDevice * device); static ULONG DirectSoundDevice_Release(DirectSoundDevice * device);
static const char * dumpCooperativeLevel(DWORD level) static const char * dumpCooperativeLevel(DWORD level)
@ -691,7 +692,7 @@ static HRESULT WINAPI IDirectSoundImpl_Initialize(
if (DSOUND_renderer[wod]) { if (DSOUND_renderer[wod]) {
if (IsEqualGUID(&devGUID, &DSOUND_renderer[wod]->guid)) { if (IsEqualGUID(&devGUID, &DSOUND_renderer[wod]->guid)) {
device = DSOUND_renderer[wod]; device = DSOUND_renderer[wod];
device->ref++; DirectSoundDevice_AddRef(device);
This->device = device; This->device = device;
return DS_OK; return DS_OK;
} else { } else {
@ -940,14 +941,20 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice)
return DS_OK; return DS_OK;
} }
static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device)
{
ULONG ref = InterlockedIncrement(&(device->ref));
TRACE("(%p) ref was %ld\n", device, ref - 1);
return ref;
}
static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
{ {
int i;
HRESULT hr; HRESULT hr;
TRACE("(%p) ref was %lu\n", device, device->ref); ULONG ref = InterlockedDecrement(&(device->ref));
TRACE("(%p) ref was %lu\n", device, ref + 1);
device->ref--; if (!ref) {
if (device->ref == 0) { int i;
timeKillEvent(device->timerID); timeKillEvent(device->timerID);
timeEndPeriod(DS_TIME_RES); timeEndPeriod(DS_TIME_RES);
/* wait for timer to expire */ /* wait for timer to expire */
@ -994,7 +1001,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
HeapFree(GetProcessHeap(),0,device); HeapFree(GetProcessHeap(),0,device);
TRACE("(%p) released\n", device); TRACE("(%p) released\n", device);
} }
return device->ref; return ref;
} }
HRESULT WINAPI IDirectSoundImpl_Create( HRESULT WINAPI IDirectSoundImpl_Create(