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

DSOUND_MixerNorm: do not compare unrelated pointers.

Browse source
This commit is contained in:
Marcus Meissner 2000-04-16 17:05:06 +00:00 committed by Alexandre Julliard
parent 8e8f0f52f7
commit b2dd2c5cee
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/dsound/dsound_main.c
View file

@ -1826,14 +1826,13 @@ static INT DSOUND_MixerNorm(IDirectSoundBufferImpl *dsb, BYTE *buf, INT len)
if ((dsb->freq == primarybuf->wfx.nSamplesPerSec) &&
(dsb->wfx.wBitsPerSample == primarybuf->wfx.wBitsPerSample) &&
(dsb->wfx.nChannels == primarybuf->wfx.nChannels)) {
DWORD bytesleft = dsb->buflen - dsb->playpos;
TRACE("(%p) Best case\n", dsb);
if ((ibp + len) < (BYTE *)(dsb->buffer + dsb->buflen))
if (len <= bytesleft )
memcpy(obp, ibp, len);
else { /* wrap */
memcpy(obp, ibp, dsb->buflen - dsb->playpos);
memcpy(obp + (dsb->buflen - dsb->playpos),
dsb->buffer,
len - (dsb->buflen - dsb->playpos));
memcpy(obp, ibp, bytesleft );
memcpy(obp + bytesleft, dsb->buffer, len - bytesleft);
}
return len;
}