ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmdevapi/tests: Fix some test failures on Windows <= 7. 

Signed-off-by: Sven Baars <sbaars@codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sven Baars 2020-10-11 13:20:22 +02:00 committed by Alexandre Julliard
parent c58802d0f4
commit a66bb83191
2 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/mmdevapi/tests/mmdevenum.c
View File

@ -218,6 +218,13 @@ static void test_ActivateAudioInterfaceAsync(void)
h_mmdev = LoadLibraryA("mmdevapi.dll"); h_mmdev = LoadLibraryA("mmdevapi.dll");
pActivateAudioInterfaceAsync = (void*)GetProcAddress(h_mmdev, "ActivateAudioInterfaceAsync");
if (!pActivateAudioInterfaceAsync)
{
win_skip("ActivateAudioInterfaceAsync is not supported on Win <= 7\n");
return;
}
/* some applications look this up by ordinal */ /* some applications look this up by ordinal */
pActivateAudioInterfaceAsync = (void*)GetProcAddress(h_mmdev, (char *)17); pActivateAudioInterfaceAsync = (void*)GetProcAddress(h_mmdev, (char *)17);
ok(pActivateAudioInterfaceAsync != NULL, "mmdevapi.ActivateAudioInterfaceAsync missing!\n"); ok(pActivateAudioInterfaceAsync != NULL, "mmdevapi.ActivateAudioInterfaceAsync missing!\n");

60
dlls/mmdevapi/tests/render.c
View File

@ -154,8 +154,11 @@ static void test_audioclient(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER, hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER,
NULL, (void**)&ac2); NULL, (void**)&ac2);
ok(hr == S_OK, "IAudioClient2 Activation failed with %08x\n", hr); ok(hr == S_OK ||
IAudioClient2_Release(ac2); broken(hr == E_NOINTERFACE) /* win7 */,
"IAudioClient2 Activation failed with %08x\n", hr);
if(hr == S_OK)
IAudioClient2_Release(ac2);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER,
NULL, (void**)&ac); NULL, (void**)&ac);
@ -262,39 +265,42 @@ static void test_audioclient(void)
} }
hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient2, (void**)&ac2); hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient2, (void**)&ac2);
ok(hr == S_OK, "Failed to query IAudioClient2 interface: %08x\n", hr); if (hr == S_OK)
{
hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL);
ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr);
hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL); hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable);
ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr); ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr);
hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); hr = IAudioClient2_SetClientProperties(ac2, NULL);
ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr);
hr = IAudioClient2_SetClientProperties(ac2, NULL); client_props.cbSize = 0;
ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); client_props.bIsOffload = FALSE;
client_props.eCategory = AudioCategory_BackgroundCapableMedia;
client_props.Options = 0;
client_props.cbSize = 0; hr = IAudioClient2_SetClientProperties(ac2, &client_props);
client_props.bIsOffload = FALSE; ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr);
client_props.eCategory = AudioCategory_BackgroundCapableMedia;
client_props.Options = 0;
hr = IAudioClient2_SetClientProperties(ac2, &client_props); client_props.cbSize = sizeof(client_props);
ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); client_props.bIsOffload = TRUE;
client_props.cbSize = sizeof(client_props); hr = IAudioClient2_SetClientProperties(ac2, &client_props);
client_props.bIsOffload = TRUE; if(!offload_capable)
ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr);
else
ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr);
hr = IAudioClient2_SetClientProperties(ac2, &client_props); client_props.bIsOffload = FALSE;
if(!offload_capable) hr = IAudioClient2_SetClientProperties(ac2, &client_props);
ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr); ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr);
IAudioClient2_Release(ac2);
}
else else
ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); win_skip("IAudioClient2 is not present on Win <= 7\n");
client_props.bIsOffload = FALSE;
hr = IAudioClient2_SetClientProperties(ac2, &client_props);
ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr);
IAudioClient2_Release(ac2);
hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient3, (void**)&ac3); hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient3, (void**)&ac3);
ok(hr == S_OK || ok(hr == S_OK ||