diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 5ab0d4a698d..f76e5b73c0f 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -202,7 +202,7 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1; - U(details).cMultipleItems = 0; + details.cMultipleItems = 0; details.cbDetails = sizeof(value); /* test NULL paDetails */ @@ -224,7 +224,7 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) trace(" Value=%ld\n",value.dwValue); - if (value.dwValue + control->Metrics.cSteps < S1(control->Bounds).dwMaximum) + if (value.dwValue + control->Metrics.cSteps < control->Bounds.dwMaximum) new_value.dwValue = value.dwValue + control->Metrics.cSteps; else new_value.dwValue = value.dwValue - control->Metrics.cSteps; @@ -232,7 +232,7 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) new_details.cbStruct = sizeof(MIXERCONTROLDETAILS); new_details.dwControlID = control->dwControlID; new_details.cChannels = 1; - U(new_details).cMultipleItems = 0; + new_details.cMultipleItems = 0; new_details.paDetails = &new_value; new_details.cbDetails = sizeof(new_value); @@ -248,7 +248,7 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) ret_details.cbStruct = sizeof(MIXERCONTROLDETAILS); ret_details.dwControlID = control->dwControlID; ret_details.cChannels = 1; - U(ret_details).cMultipleItems = 0; + ret_details.cMultipleItems = 0; ret_details.paDetails = &ret_value; ret_details.cbDetails = sizeof(ret_value); @@ -267,7 +267,7 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1; - U(details).cMultipleItems = 0; + details.cMultipleItems = 0; details.paDetails = &value; details.cbDetails = sizeof(value); @@ -289,7 +289,7 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1; - U(details).cMultipleItems = 0; + details.cMultipleItems = 0; details.paDetails = &value; details.cbDetails = sizeof(value); @@ -311,7 +311,7 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) new_details.cbStruct = sizeof(MIXERCONTROLDETAILS); new_details.dwControlID = control->dwControlID; new_details.cChannels = 1; - U(new_details).cMultipleItems = 0; + new_details.cMultipleItems = 0; new_details.paDetails = &new_value; new_details.cbDetails = sizeof(new_value); @@ -327,7 +327,7 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) ret_details.cbStruct = sizeof(MIXERCONTROLDETAILS); ret_details.dwControlID = control->dwControlID; ret_details.cChannels = 1; - U(ret_details).cMultipleItems = 0; + ret_details.cMultipleItems = 0; ret_details.paDetails = &ret_value; ret_details.cbDetails = sizeof(ret_value); @@ -346,7 +346,7 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1; - U(details).cMultipleItems = 0; + details.cMultipleItems = 0; details.paDetails = &value; details.cbDetails = sizeof(value); @@ -556,8 +556,8 @@ static void mixer_test_deviceA(int device) control_flags(array[nc].fdwControl)); trace(" Items=%ld Min=%ld Max=%ld Step=%ld\n", array[nc].cMultipleItems, - S1(array[nc].Bounds).dwMinimum, - S1(array[nc].Bounds).dwMaximum, + array[nc].Bounds.dwMinimum, + array[nc].Bounds.dwMaximum, array[nc].Metrics.cSteps); } @@ -588,7 +588,7 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1; - U(details).cMultipleItems = 0; + details.cMultipleItems = 0; details.paDetails = &value; details.cbDetails = sizeof(value); @@ -603,7 +603,7 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) trace(" Value=%ld\n",value.dwValue); - if (value.dwValue + control->Metrics.cSteps < S1(control->Bounds).dwMaximum) + if (value.dwValue + control->Metrics.cSteps < control->Bounds.dwMaximum) new_value.dwValue = value.dwValue + control->Metrics.cSteps; else new_value.dwValue = value.dwValue - control->Metrics.cSteps; @@ -611,7 +611,7 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) new_details.cbStruct = sizeof(MIXERCONTROLDETAILS); new_details.dwControlID = control->dwControlID; new_details.cChannels = 1; - U(new_details).cMultipleItems = 0; + new_details.cMultipleItems = 0; new_details.paDetails = &new_value; new_details.cbDetails = sizeof(new_value); @@ -627,7 +627,7 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) ret_details.cbStruct = sizeof(MIXERCONTROLDETAILS); ret_details.dwControlID = control->dwControlID; ret_details.cChannels = 1; - U(ret_details).cMultipleItems = 0; + ret_details.cMultipleItems = 0; ret_details.paDetails = &ret_value; ret_details.cbDetails = sizeof(ret_value); @@ -646,7 +646,7 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1; - U(details).cMultipleItems = 0; + details.cMultipleItems = 0; details.paDetails = &value; details.cbDetails = sizeof(value); @@ -668,7 +668,7 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1; - U(details).cMultipleItems = 0; + details.cMultipleItems = 0; details.paDetails = &value; details.cbDetails = sizeof(value); @@ -690,7 +690,7 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) new_details.cbStruct = sizeof(MIXERCONTROLDETAILS); new_details.dwControlID = control->dwControlID; new_details.cChannels = 1; - U(new_details).cMultipleItems = 0; + new_details.cMultipleItems = 0; new_details.paDetails = &new_value; new_details.cbDetails = sizeof(new_value); @@ -706,7 +706,7 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) ret_details.cbStruct = sizeof(MIXERCONTROLDETAILS); ret_details.dwControlID = control->dwControlID; ret_details.cChannels = 1; - U(ret_details).cMultipleItems = 0; + ret_details.cMultipleItems = 0; ret_details.paDetails = &ret_value; ret_details.cbDetails = sizeof(ret_value); @@ -725,7 +725,7 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1; - U(details).cMultipleItems = 0; + details.cMultipleItems = 0; details.paDetails = &value; details.cbDetails = sizeof(value); @@ -959,8 +959,8 @@ static void mixer_test_deviceW(int device) control_flags(array[nc].fdwControl)); trace(" Items=%ld Min=%ld Max=%ld Step=%ld\n", array[nc].cMultipleItems, - S1(array[nc].Bounds).dwMinimum, - S1(array[nc].Bounds).dwMaximum, + array[nc].Bounds.dwMinimum, + array[nc].Bounds.dwMaximum, array[nc].Metrics.cSteps); } mixer_test_controlW(mix, &array[nc]);