Skip to content

W
wine-cw
Commit 874260d1 authored by Davide Beatrici's avatar Davide Beatrici Committed by Alexandre Julliard
Browse files
Options

mmdevapi/tests: Fix fail messages referencing GetChannelCount() instead of GetChannelVolume().

parent 346e04da
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
dlls/mmdevapi/tests/capture.c
View file @ 874260d1
...@@ -582,16 +582,16 @@ static void test_streamvolume(void) ...@@ -582,16 +582,16 @@ static void test_streamvolume(void)
ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);
hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL);
ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol);
ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL);
ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol);
ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);
hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f); hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f);
...@@ -607,7 +607,7 @@ static void test_streamvolume(void) ...@@ -607,7 +607,7 @@ static void test_streamvolume(void)
ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol);
ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);
hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL); hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL);
...@@ -681,16 +681,16 @@ static void test_channelvolume(void) ...@@ -681,16 +681,16 @@ static void test_channelvolume(void)
ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);
hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL);
ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol);
ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL);
ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol);
ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);
hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL); hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL);
...@@ -706,7 +706,7 @@ static void test_channelvolume(void) ...@@ -706,7 +706,7 @@ static void test_channelvolume(void)
ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol);
ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);
hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL); hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL);
......
dlls/mmdevapi/tests/render.c
View file @ 874260d1
...@@ -1641,16 +1641,16 @@ static void test_streamvolume(void) ...@@ -1641,16 +1641,16 @@ static void test_streamvolume(void)
ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);
hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL);
ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol);
ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL);
ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol);
ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);
hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f); hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f);
...@@ -1666,7 +1666,7 @@ static void test_streamvolume(void) ...@@ -1666,7 +1666,7 @@ static void test_streamvolume(void)
ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol);
ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);
hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL); hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL);
...@@ -1745,16 +1745,16 @@ static void test_channelvolume(void) ...@@ -1745,16 +1745,16 @@ static void test_channelvolume(void)
ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);
hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL);
ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol);
ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL);
ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol);
ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);
hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL); hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL);
...@@ -1770,7 +1770,7 @@ static void test_channelvolume(void) ...@@ -1770,7 +1770,7 @@ static void test_channelvolume(void)
ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol);
ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);
hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL); hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL);
......
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