Module: wine Branch: master Commit: 0afcefd338f1c220ed0a175a3a88fe7a5af596ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0afcefd338f1c220ed0a175a3a...
Author: Bruno Jesus 00cpxxx@gmail.com Date: Tue Jan 17 14:48:02 2017 -0200
msacm32: Reduce block align condition scope to test covered drivers.
Signed-off-by: Bruno Jesus 00cpxxx@gmail.com Signed-off-by: Andrew Eikum aeikum@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msacm32/stream.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index 6e81151..e06503a 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -317,7 +317,9 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, WARN("invalid use of reserved parameter\n"); return MMSYSERR_INVALFLAG; } - if (pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { + if ((was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM || + was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) && + pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { WARN("source smaller than block align (%d < %d)\n", pash->cbSrcLength, was->drvInst.pwfxSrc->nBlockAlign); return pash->cbSrcLength ? ACMERR_NOTPOSSIBLE : MMSYSERR_INVALPARAM;