Skip to content

W
wine-winehq
Commit dfc05649 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winmm/tests: Don't mess with the mixer controls in non-interactive mode.

parent f4ec0a20
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 12 deletions
dlls/winmm/tests/mixer.c
View file @ dfc05649
...@@ -195,12 +195,11 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control) ...@@ -195,12 +195,11 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control)
ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): "
"MMSYSERR_NOERROR expected, got %s\n", "MMSYSERR_NOERROR expected, got %s\n",
mmsys_error(rc)); mmsys_error(rc));
if (rc==MMSYSERR_NOERROR) { if (rc==MMSYSERR_NOERROR && winetest_interactive) {
MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS new_details;
MIXERCONTROLDETAILS_UNSIGNED new_value; 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) if (value.dwValue + control->Metrics.cSteps < S1(control->Bounds).dwMaximum)
new_value.dwValue = value.dwValue + control->Metrics.cSteps; new_value.dwValue = value.dwValue + control->Metrics.cSteps;
...@@ -275,12 +274,11 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control) ...@@ -275,12 +274,11 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control)
ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): "
"MMSYSERR_NOERROR expected, got %s\n", "MMSYSERR_NOERROR expected, got %s\n",
mmsys_error(rc)); mmsys_error(rc));
if (rc==MMSYSERR_NOERROR) { if (rc==MMSYSERR_NOERROR && winetest_interactive) {
MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS new_details;
MIXERCONTROLDETAILS_BOOLEAN new_value; MIXERCONTROLDETAILS_BOOLEAN new_value;
if (winetest_interactive) trace(" Value=%d\n",value.fValue);
trace(" Value=%d\n",value.fValue);
if (value.fValue == FALSE) if (value.fValue == FALSE)
new_value.fValue = TRUE; new_value.fValue = TRUE;
...@@ -584,12 +582,11 @@ static void mixer_test_controlW(HMIXER mix, LPMIXERCONTROLW control) ...@@ -584,12 +582,11 @@ static void mixer_test_controlW(HMIXER mix, LPMIXERCONTROLW control)
ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): "
"MMSYSERR_NOERROR expected, got %s\n", "MMSYSERR_NOERROR expected, got %s\n",
mmsys_error(rc)); mmsys_error(rc));
if (rc==MMSYSERR_NOERROR) { if (rc==MMSYSERR_NOERROR && winetest_interactive) {
MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS new_details;
MIXERCONTROLDETAILS_UNSIGNED new_value; 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) if (value.dwValue + control->Metrics.cSteps < S1(control->Bounds).dwMaximum)
new_value.dwValue = value.dwValue + control->Metrics.cSteps; new_value.dwValue = value.dwValue + control->Metrics.cSteps;
...@@ -664,12 +661,11 @@ static void mixer_test_controlW(HMIXER mix, LPMIXERCONTROLW control) ...@@ -664,12 +661,11 @@ static void mixer_test_controlW(HMIXER mix, LPMIXERCONTROLW control)
ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): "
"MMSYSERR_NOERROR expected, got %s\n", "MMSYSERR_NOERROR expected, got %s\n",
mmsys_error(rc)); mmsys_error(rc));
if (rc==MMSYSERR_NOERROR) { if (rc==MMSYSERR_NOERROR && winetest_interactive) {
MIXERCONTROLDETAILS new_details; MIXERCONTROLDETAILS new_details;
MIXERCONTROLDETAILS_BOOLEAN new_value; MIXERCONTROLDETAILS_BOOLEAN new_value;
if (winetest_interactive) trace(" Value=%d\n",value.fValue);
trace(" Value=%d\n",value.fValue);
if (value.fValue == FALSE) if (value.fValue == FALSE)
new_value.fValue = TRUE; new_value.fValue = TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment