Module: wine Branch: master Commit: dfc05649931383927c57e13a30c506385df9ad77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc05649931383927c57e13a30...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Dec 5 13:47:30 2007 +0100
winmm/tests: Don't mess with the mixer controls in non-interactive mode.
---
dlls/winmm/tests/mixer.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 2352be3..6cd1c7a 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -195,12 +195,11 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control) ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); - if (rc==MMSYSERR_NOERROR) { + if (rc==MMSYSERR_NOERROR && winetest_interactive) { MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS_UNSIGNED new_value;
- if (winetest_interactive) - trace(" Value=%d\n",value.dwValue); + trace(" Value=%d\n",value.dwValue);
if (value.dwValue + control->Metrics.cSteps < S1(control->Bounds).dwMaximum) new_value.dwValue = value.dwValue + control->Metrics.cSteps; @@ -275,12 +274,11 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control) ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); - if (rc==MMSYSERR_NOERROR) { + if (rc==MMSYSERR_NOERROR && winetest_interactive) { MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS_BOOLEAN new_value;
- if (winetest_interactive) - trace(" Value=%d\n",value.fValue); + trace(" Value=%d\n",value.fValue);
if (value.fValue == FALSE) new_value.fValue = TRUE; @@ -584,12 +582,11 @@ static void mixer_test_controlW(HMIXER mix, LPMIXERCONTROLW control) ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); - if (rc==MMSYSERR_NOERROR) { + if (rc==MMSYSERR_NOERROR && winetest_interactive) { MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS_UNSIGNED new_value;
- if (winetest_interactive) - trace(" Value=%d\n",value.dwValue); + trace(" Value=%d\n",value.dwValue);
if (value.dwValue + control->Metrics.cSteps < S1(control->Bounds).dwMaximum) new_value.dwValue = value.dwValue + control->Metrics.cSteps; @@ -664,12 +661,11 @@ static void mixer_test_controlW(HMIXER mix, LPMIXERCONTROLW control) ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); - if (rc==MMSYSERR_NOERROR) { + if (rc==MMSYSERR_NOERROR && winetest_interactive) { MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS_BOOLEAN new_value;
- if (winetest_interactive) - trace(" Value=%d\n",value.fValue); + trace(" Value=%d\n",value.fValue);
if (value.fValue == FALSE) new_value.fValue = TRUE;