Module: wine Branch: master Commit: db92670f97e653a213484dab997f4941afc562ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=db92670f97e653a213484dab99...
Author: Andrew Eikum aeikum@codeweavers.com Date: Mon Mar 4 11:43:31 2013 -0600
winmm/tests: Add another valid return code.
---
dlls/winmm/tests/capture.c | 2 +- dlls/winmm/tests/wave.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 32deb28..329130a 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -648,7 +648,7 @@ static void wave_in_tests(void)
rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); - ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || rc == MMSYSERR_NOERROR, "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc);
ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 992cca7..eb619cd 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1419,7 +1419,7 @@ static void wave_out_tests(void)
rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); - ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || rc == MMSYSERR_NOERROR, "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc);
ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) ||