[PATCH 2/4] evr/tests: Skip tests if default presenter can't be created.
Nikolay Sivov
nsivov at codeweavers.com
Wed Oct 27 09:23:03 CDT 2021
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
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();
--
2.33.0
More information about the wine-devel
mailing list