system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 10:44:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

dsound: Fix calcplayposition to handle mixed amount > buffer length better.

Browse source
This commit is contained in:
Maarten Lankhorst 2007-06-29 18:30:52 +02:00 committed by Alexandre Julliard
parent 8b9454d486
commit 6d97123536
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/dsound/buffer.c
View file

@ -444,13 +444,11 @@ DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This, DWORD pplay, DWORD p
TRACE("this back-offset=%d\n", pmix);
/* sanity */
if(pmix > This->buflen){
ERR("Bad length in CalcPlayPosition!\n");
return 0;
}
if(pmix > This->buflen)
WARN("Mixed length (%d) is longer then buffer length (%d)\n", pmix, This->buflen);
/* subtract from our last mixed position */
if (bplay < pmix) bplay += This->buflen; /* wraparound */
while (bplay < pmix) bplay += This->buflen; /* wraparound */
bplay -= pmix;
/* check for lead-in */
@ -461,9 +459,9 @@ DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This, DWORD pplay, DWORD p
}
/* sanity */
if(bplay > This->buflen){
ERR("Bad play position in CalcPlayPosition!\n");
return 0;
if (bplay >= This->buflen){
FIXME("Bad play position. bplay: %d, buflen: %d\n", bplay, This->buflen);
bplay %= This->buflen;
}
/* return the result */