Nikolay Sivov : evr/tests: Skip tests if default presenter can't be created.
Alexandre Julliard
julliard at winehq.org
Wed Oct 27 16:26:03 CDT 2021
Module: wine
Branch: master
Commit: 393ea6c60854eeebd0b86ca3265a2892ffc6996d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=393ea6c60854eeebd0b86ca3265a2892ffc6996d
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed Oct 27 17:23:03 2021 +0300
evr/tests: Skip tests if default presenter can't be created.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/evr/tests/evr.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c
index 818731e1e55..6fb92d9ced1 100644
--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -1246,9 +1246,7 @@ static void test_default_presenter(void)
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter);
- ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Failed to create default presenter, hr %#x.\n", hr);
- if (FAILED(hr))
- return;
+ ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr);
check_interface(presenter, &IID_IQualProp, TRUE);
check_interface(presenter, &IID_IMFVideoPositionMapper, TRUE);
@@ -2820,8 +2818,19 @@ static void test_MFIsFormatYUV(void)
START_TEST(evr)
{
+ IMFVideoPresenter *presenter;
+ HRESULT hr;
+
CoInitialize(NULL);
+ if (FAILED(hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter)))
+ {
+ win_skip("Failed to create default presenter, hr %#x. Skipping tests.\n", hr);
+ CoUninitialize();
+ return;
+ }
+ IMFVideoPresenter_Release(presenter);
+
test_aggregation();
test_interfaces();
test_enum_pins();
More information about the wine-cvs
mailing list