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

dsound: Restore old format on SetFormat failure.

This commit is contained in:
Nick Bowler 2010-10-03 11:52:00 -04:00 committed by Alexandre Julliard
parent dfaabee3e8
commit 681d544620
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/dsound/primary.c
View File

@ -441,10 +441,17 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP
return DS_OK; return DS_OK;
} }
static DWORD DSOUND_GetFormatSize(LPCWAVEFORMATEX wfex)
{
if (wfex->wFormatTag == WAVE_FORMAT_PCM)
return sizeof(WAVEFORMATEX);
else
return sizeof(WAVEFORMATEX) + wfex->cbSize;
}
LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex)
{ {
DWORD size = wfex->wFormatTag == WAVE_FORMAT_PCM ? DWORD size = DSOUND_GetFormatSize(wfex);
sizeof(WAVEFORMATEX) : sizeof(WAVEFORMATEX) + wfex->cbSize;
LPWAVEFORMATEX pwfx = HeapAlloc(GetProcessHeap(),0,size); LPWAVEFORMATEX pwfx = HeapAlloc(GetProcessHeap(),0,size);
if (pwfx == NULL) { if (pwfx == NULL) {
WARN("out of memory\n"); WARN("out of memory\n");
@ -501,11 +508,10 @@ static HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATE
device->pwfx = DSOUND_CopyFormat(wfex); device->pwfx = DSOUND_CopyFormat(wfex);
if (device->pwfx == NULL) { if (device->pwfx == NULL) {
device->pwfx = oldpwfx; device->pwfx = oldpwfx;
oldpwfx = NULL;
err = DSERR_OUTOFMEMORY; err = DSERR_OUTOFMEMORY;
goto done; goto done;
} }
/* TODO: on failure below (bad format?), reinstall oldpwfx */
HeapFree(GetProcessHeap(), 0, oldpwfx);
if (!(device->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMSETFORMAT) && device->hwbuf) { if (!(device->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMSETFORMAT) && device->hwbuf) {
err = IDsDriverBuffer_SetFormat(device->hwbuf, device->pwfx); err = IDsDriverBuffer_SetFormat(device->hwbuf, device->pwfx);
@ -520,9 +526,12 @@ static HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATE
} }
if (err != DSERR_BUFFERLOST && FAILED(err)) { if (err != DSERR_BUFFERLOST && FAILED(err)) {
DWORD size = DSOUND_GetFormatSize(oldpwfx);
WARN("IDsDriverBuffer_SetFormat failed\n"); WARN("IDsDriverBuffer_SetFormat failed\n");
if (!forced) if (!forced) {
CopyMemory(device->pwfx, oldpwfx, size);
err = DS_OK; err = DS_OK;
}
goto done; goto done;
} }
@ -599,6 +608,7 @@ done:
RtlReleaseResource(&(device->buffer_list_lock)); RtlReleaseResource(&(device->buffer_list_lock));
/* **** */ /* **** */
HeapFree(GetProcessHeap(), 0, oldpwfx);
return err; return err;
} }