Module: wine Branch: master Commit: 30e5f0c46d8d501567372da194c02aba7c66515d URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e5f0c46d8d501567372da19...
Author: André Hentschel nerv@dawncrow.de Date: Sat Dec 19 15:53:38 2020 +0100
d3d8/tests: Don't test functions directly when reporting GetLastError().
Signed-off-by: André Hentschel nerv@dawncrow.de Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d8/tests/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 45cf0f20eda..ffd940067e8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10465,8 +10465,8 @@ static void test_multi_adapter(void) ok(!!monitor, "Adapter %u: Failed to get monitor.\n", i);
monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info), - "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info); + ok(ret, "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError());
if (!i) ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, @@ -10597,6 +10597,7 @@ static void test_cursor_clipping(void) IDirect3D8 *d3d; HWND window; HRESULT hr; + BOOL ret;
window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -10625,10 +10626,12 @@ static void test_cursor_clipping(void) "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, current_mode.Width, current_mode.Height);
- ok(ClipCursor(NULL), "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, + ret = ClipCursor(NULL); + ok(ret, "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -10643,7 +10646,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -10651,7 +10655,8 @@ static void test_cursor_clipping(void) IDirect3DDevice8_Release(device); flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));