Module: wine Branch: master Commit: 61eda97fd583ee9794fe535626189247dea23549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61eda97fd583ee9794fe535626...
Author: Bruno Jesus 00cpxxx@gmail.com Date: Sun Aug 28 04:07:28 2016 -0300
msacm32: Handle invalid use of reserved parameter in acmStreamPrepareHeader.
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 | 10 ++++++---- dlls/msacm32/tests/msacm.c | 1 - 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index bdfc3cc..b380b46 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -302,14 +302,16 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); - return MMSYSERR_INVALHANDLE; + return MMSYSERR_INVALHANDLE; } if (!pash || pash->cbStruct < sizeof(ACMSTREAMHEADER)) { WARN("invalid parameter\n"); - return MMSYSERR_INVALPARAM; + return MMSYSERR_INVALPARAM; + } + if (fdwPrepare) { + WARN("invalid use of reserved parameter\n"); + return MMSYSERR_INVALFLAG; } - if (fdwPrepare) - ret = MMSYSERR_INVALFLAG;
/* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same * size. some fields are private to msacm internals, and are exposed diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 812a1bb..06e530b 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -601,7 +601,6 @@ todo_wine
hdr.cbSrcLength = src->wfx.nBlockAlign; mr = acmStreamPrepareHeader(has, &hdr, 1); /* invalid use of reserved parameter */ -todo_wine ok(mr == MMSYSERR_INVALFLAG, "expected 0x0a, got 0x%x\n", mr);
mr = acmStreamPrepareHeader(has, &hdr, 0);