=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: dxgi/tests: Handle DXGI_ERROR_NOT_CURRENTLY_AVAILABLE in test_fullscreen_resize_target ().
Alexandre Julliard
julliard at winehq.org
Thu May 31 15:56:56 CDT 2018
Module: wine
Branch: master
Commit: c199cc9ad55cf55cbe7a519ad85025ce334bb0c7
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c199cc9ad55cf55cbe7a519ad85025ce334bb0c7
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu May 31 12:04:36 2018 +0200
dxgi/tests: Handle DXGI_ERROR_NOT_CURRENTLY_AVAILABLE in test_fullscreen_resize_target().
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dxgi/tests/device.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c
index c192992..784f6d2 100644
--- a/dlls/dxgi/tests/device.c
+++ b/dlls/dxgi/tests/device.c
@@ -2200,17 +2200,22 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain,
continue;
hr = IDXGIOutput_GetDesc(target, &output_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr);
compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state,
&swapchain_desc, &output_desc.DesktopCoordinates, modes[i].Width, modes[i].Height, NULL);
hr = IDXGISwapChain_ResizeTarget(swapchain, &modes[i]);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr);
+ if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE)
+ {
+ skip("Failed to change to video mode %u.\n", i);
+ break;
+ }
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGIOutput_GetDesc(target, &output_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr);
ok(EqualRect(&output_desc.DesktopCoordinates, &expected_state.fullscreen_state.monitor_rect),
"Got desktop coordinates %s, expected %s.\n",
wine_dbgstr_rect(&output_desc.DesktopCoordinates),
More information about the wine-cvs
mailing list