marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dsound: Replace buffer critical section with a rw-lock.

oldstable
Maarten Lankhorst 2007-07-29 21:01:43 +02:00 committed by Alexandre Julliard
parent 629e013d7f
commit 237b293829
4 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dlls/dsound/buffer.c
View File

@ -216,7 +216,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(
} }
/* **** */ /* **** */
EnterCriticalSection(&(This->lock)); RtlAcquireResourceExclusive(&This->lock, TRUE);
if (This->dsbd.dwFlags & DSBCAPS_CTRL3D) { if (This->dsbd.dwFlags & DSBCAPS_CTRL3D) {
oldVol = This->ds3db_lVolume; oldVol = This->ds3db_lVolume;
@ -239,7 +239,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(
} }
} }
LeaveCriticalSection(&(This->lock)); RtlReleaseResource(&This->lock);
/* **** */ /* **** */
return hres; return hres;
@ -288,7 +288,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(
} }
/* **** */ /* **** */
EnterCriticalSection(&(This->lock)); RtlAcquireResourceExclusive(&This->lock, TRUE);
oldFreq = This->freq; oldFreq = This->freq;
This->freq = freq; This->freq = freq;
@ -298,7 +298,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(
DSOUND_RecalcFormat(This); DSOUND_RecalcFormat(This);
} }
LeaveCriticalSection(&(This->lock)); RtlReleaseResource(&This->lock);
/* **** */ /* **** */
return DS_OK; return DS_OK;
@ -312,7 +312,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(
TRACE("(%p,%08x,%08x,%08x)\n",This,reserved1,reserved2,flags); TRACE("(%p,%08x,%08x,%08x)\n",This,reserved1,reserved2,flags);
/* **** */ /* **** */
EnterCriticalSection(&(This->lock)); RtlAcquireResourceExclusive(&This->lock, TRUE);
This->playflags = flags; This->playflags = flags;
if (This->state == STATE_STOPPED) { if (This->state == STATE_STOPPED) {
@ -329,7 +329,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(
This->state = STATE_PLAYING; This->state = STATE_PLAYING;
} }
LeaveCriticalSection(&(This->lock)); RtlReleaseResource(&This->lock);
/* **** */ /* **** */
return hres; return hres;
@ -342,7 +342,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(LPDIRECTSOUNDBUFFER8 iface)
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
/* **** */ /* **** */
EnterCriticalSection(&(This->lock)); RtlAcquireResourceExclusive(&This->lock, TRUE);
if (This->state == STATE_PLAYING) if (This->state == STATE_PLAYING)
This->state = STATE_STOPPING; This->state = STATE_STOPPING;
@ -357,7 +357,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(LPDIRECTSOUNDBUFFER8 iface)
} }
DSOUND_CheckEvent(This, 0, 0); DSOUND_CheckEvent(This, 0, 0);
LeaveCriticalSection(&(This->lock)); RtlReleaseResource(&This->lock);
/* **** */ /* **** */
return hres; return hres;
@ -380,8 +380,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface)
if (!ref) { if (!ref) {
DirectSoundDevice_RemoveBuffer(This->device, This); DirectSoundDevice_RemoveBuffer(This->device, This);
This->lock.DebugInfo->Spare[0] = 0; RtlDeleteResource(&This->lock);
DeleteCriticalSection(&(This->lock));
if (This->hwbuf) { if (This->hwbuf) {
IDsDriverBuffer_Release(This->hwbuf); IDsDriverBuffer_Release(This->hwbuf);
@ -568,7 +567,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(
} }
/* **** */ /* **** */
EnterCriticalSection(&(This->lock)); RtlAcquireResourceShared(&This->lock, TRUE);
if (!(This->device->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) { if (!(This->device->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) {
hres = IDsDriverBuffer_Lock(This->hwbuf, hres = IDsDriverBuffer_Lock(This->hwbuf,
@ -578,7 +577,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(
0); 0);
if (hres != DS_OK) { if (hres != DS_OK) {
WARN("IDsDriverBuffer_Lock failed\n"); WARN("IDsDriverBuffer_Lock failed\n");
LeaveCriticalSection(&(This->lock)); RtlReleaseResource(&This->lock);
return hres; return hres;
} }
} else { } else {
@ -603,7 +602,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(
} }
} }
LeaveCriticalSection(&(This->lock)); RtlReleaseResource(&This->lock);
/* **** */ /* **** */
return DS_OK; return DS_OK;
@ -617,7 +616,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(
TRACE("(%p,%d)\n",This,newpos); TRACE("(%p,%d)\n",This,newpos);
/* **** */ /* **** */
EnterCriticalSection(&(This->lock)); RtlAcquireResourceExclusive(&This->lock, TRUE);
/* start mixing from this new location instead */ /* start mixing from this new location instead */
newpos %= This->buflen; newpos %= This->buflen;
@ -634,7 +633,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(
WARN("IDsDriverBuffer_SetPosition failed\n"); WARN("IDsDriverBuffer_SetPosition failed\n");
} }
LeaveCriticalSection(&(This->lock)); RtlReleaseResource(&This->lock);
/* **** */ /* **** */
return hres; return hres;
@ -661,7 +660,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan(
} }
/* **** */ /* **** */
EnterCriticalSection(&(This->lock)); RtlAcquireResourceExclusive(&This->lock, TRUE);
if (This->volpan.lPan != pan) { if (This->volpan.lPan != pan) {
This->volpan.lPan = pan; This->volpan.lPan = pan;
@ -674,7 +673,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan(
} }
} }
LeaveCriticalSection(&(This->lock)); RtlReleaseResource(&This->lock);
/* **** */ /* **** */
return hres; return hres;
@ -710,7 +709,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(
TRACE("(%p,%p,%d,%p,%d)\n", This,p1,x1,p2,x2); TRACE("(%p,%p,%d,%p,%d)\n", This,p1,x1,p2,x2);
/* **** */ /* **** */
EnterCriticalSection(&(This->lock)); RtlAcquireResourceShared(&This->lock, TRUE);
if (!(This->device->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) { if (!(This->device->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) {
hres = IDsDriverBuffer_Unlock(This->hwbuf, p1, x1, p2, x2); hres = IDsDriverBuffer_Unlock(This->hwbuf, p1, x1, p2, x2);
@ -718,7 +717,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(
WARN("IDsDriverBuffer_Unlock failed\n"); WARN("IDsDriverBuffer_Unlock failed\n");
} }
LeaveCriticalSection(&(This->lock)); RtlReleaseResource(&This->lock);
/* **** */ /* **** */
return hres; return hres;
@ -1099,8 +1098,7 @@ HRESULT IDirectSoundBufferImpl_Create(
} else } else
DSOUND_RecalcVolPan(&(dsb->volpan)); DSOUND_RecalcVolPan(&(dsb->volpan));
InitializeCriticalSection(&(dsb->lock)); RtlInitializeResource(&dsb->lock);
dsb->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectSoundBufferImpl.lock");
/* register buffer if not primary */ /* register buffer if not primary */
if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) {
@ -1108,8 +1106,7 @@ HRESULT IDirectSoundBufferImpl_Create(
if (err != DS_OK) { if (err != DS_OK) {
HeapFree(GetProcessHeap(),0,dsb->buffer->memory); HeapFree(GetProcessHeap(),0,dsb->buffer->memory);
HeapFree(GetProcessHeap(),0,dsb->buffer); HeapFree(GetProcessHeap(),0,dsb->buffer);
dsb->lock.DebugInfo->Spare[0] = 0; RtlDeleteResource(&dsb->lock);
DeleteCriticalSection(&(dsb->lock));
HeapFree(GetProcessHeap(),0,dsb->pwfx); HeapFree(GetProcessHeap(),0,dsb->pwfx);
HeapFree(GetProcessHeap(),0,dsb); HeapFree(GetProcessHeap(),0,dsb);
dsb = NULL; dsb = NULL;
@ -1237,14 +1234,12 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
CopyMemory(dsb->pwfx, pdsb->pwfx, size); CopyMemory(dsb->pwfx, pdsb->pwfx, size);
InitializeCriticalSection(&(dsb->lock)); RtlInitializeResource(&dsb->lock);
dsb->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectSoundBufferImpl.lock");
/* register buffer */ /* register buffer */
hres = DirectSoundDevice_AddBuffer(device, dsb); hres = DirectSoundDevice_AddBuffer(device, dsb);
if (hres != DS_OK) { if (hres != DS_OK) {
dsb->lock.DebugInfo->Spare[0] = 0; RtlDeleteResource(&dsb->lock);
DeleteCriticalSection(&(dsb->lock));
HeapFree(GetProcessHeap(),0,dsb->buffer); HeapFree(GetProcessHeap(),0,dsb->buffer);
HeapFree(GetProcessHeap(),0,dsb->pwfx); HeapFree(GetProcessHeap(),0,dsb->pwfx);
HeapFree(GetProcessHeap(),0,dsb); HeapFree(GetProcessHeap(),0,dsb);

2
dlls/dsound/dsound_private.h
View File

@ -157,7 +157,7 @@ struct IDirectSoundBufferImpl
/* IDirectSoundBufferImpl fields */ /* IDirectSoundBufferImpl fields */
SecondaryBufferImpl* secondary; SecondaryBufferImpl* secondary;
DirectSoundDevice* device; DirectSoundDevice* device;
CRITICAL_SECTION lock; RTL_RWLOCK lock;
PIDSDRIVERBUFFER hwbuf; PIDSDRIVERBUFFER hwbuf;
PWAVEFORMATEX pwfx; PWAVEFORMATEX pwfx;
BufferMemory* buffer; BufferMemory* buffer;

4
dlls/dsound/mixer.c
View File

@ -697,7 +697,7 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD playpos,
if (dsb->buflen && dsb->state && !dsb->hwbuf) { if (dsb->buflen && dsb->state && !dsb->hwbuf) {
TRACE("Checking %p, mixlen=%d\n", dsb, mixlen); TRACE("Checking %p, mixlen=%d\n", dsb, mixlen);
EnterCriticalSection(&(dsb->lock)); RtlAcquireResourceShared(&dsb->lock, TRUE);
/* if buffer is stopping it is stopped now */ /* if buffer is stopping it is stopped now */
if (dsb->state == STATE_STOPPING) { if (dsb->state == STATE_STOPPING) {
@ -729,7 +729,7 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD playpos,
*all_stopped = FALSE; *all_stopped = FALSE;
} }
LeaveCriticalSection(&(dsb->lock)); RtlReleaseResource(&dsb->lock);
} }
} }

4
dlls/dsound/primary.c
View File

@ -460,12 +460,12 @@ HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex)
IDirectSoundBufferImpl** dsb = device->buffers; IDirectSoundBufferImpl** dsb = device->buffers;
for (i = 0; i < device->nrofbuffers; i++, dsb++) { for (i = 0; i < device->nrofbuffers; i++, dsb++) {
/* **** */ /* **** */
EnterCriticalSection(&((*dsb)->lock)); RtlAcquireResourceExclusive(&(*dsb)->lock, TRUE);
(*dsb)->freqAdjust = ((*dsb)->freq << DSOUND_FREQSHIFT) / (*dsb)->freqAdjust = ((*dsb)->freq << DSOUND_FREQSHIFT) /
wfex->nSamplesPerSec; wfex->nSamplesPerSec;
LeaveCriticalSection(&((*dsb)->lock)); RtlReleaseResource(&(*dsb)->lock);
/* **** */ /* **** */
} }
} }