dxgi/tests: Use wine_dbgstr_rect() to print RECTs.

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2016-06-07 09:49:25 +02:00 committed by Alexandre Julliard
parent 33f145acc3
commit 389c86c8c1
1 changed files with 12 additions and 19 deletions

View File

@ -649,11 +649,9 @@ static void test_get_containing_output(void)
wine_dbgstr_w(output_desc.DeviceName), wine_dbgstr_w(output_desc2.DeviceName)); wine_dbgstr_w(output_desc.DeviceName), wine_dbgstr_w(output_desc2.DeviceName));
ok(!memcmp(&output_desc.DesktopCoordinates, &output_desc2.DesktopCoordinates, ok(!memcmp(&output_desc.DesktopCoordinates, &output_desc2.DesktopCoordinates,
sizeof(output_desc.DesktopCoordinates)), sizeof(output_desc.DesktopCoordinates)),
"Got unexpected desktop coordinates {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", "Got unexpected desktop coordinates %s, expected %s.\n",
output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, wine_dbgstr_rect(&output_desc.DesktopCoordinates),
output_desc.DesktopCoordinates.right, output_desc.DesktopCoordinates.bottom, wine_dbgstr_rect(&output_desc2.DesktopCoordinates));
output_desc2.DesktopCoordinates.left, output_desc2.DesktopCoordinates.top,
output_desc2.DesktopCoordinates.right, output_desc2.DesktopCoordinates.bottom);
refcount = IDXGIOutput_Release(output2); refcount = IDXGIOutput_Release(output2);
ok(!refcount, "IDXGIOuput has %u references left.\n", refcount); ok(!refcount, "IDXGIOuput has %u references left.\n", refcount);
@ -932,9 +930,8 @@ static void test_swapchain_resize(void)
ret = GetClientRect(window, &r); ret = GetClientRect(window, &r);
ok(ret, "Failed to get client rect.\n"); ok(ret, "Failed to get client rect.\n");
ok(EqualRect(&r, &client_rect), "Got unexpected rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n",
r.left, r.top, r.right, r.bottom, wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect));
client_rect.left, client_rect.top, client_rect.right, client_rect.bottom);
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr);
@ -997,9 +994,8 @@ static void test_swapchain_resize(void)
ret = GetClientRect(window, &r); ret = GetClientRect(window, &r);
ok(ret, "Failed to get client rect.\n"); ok(ret, "Failed to get client rect.\n");
ok(EqualRect(&r, &client_rect), "Got unexpected rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n",
r.left, r.top, r.right, r.bottom, wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect));
client_rect.left, client_rect.top, client_rect.right, client_rect.bottom);
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr);
@ -1068,9 +1064,8 @@ static void test_swapchain_resize(void)
ret = GetClientRect(window, &r); ret = GetClientRect(window, &r);
ok(ret, "Failed to get client rect.\n"); ok(ret, "Failed to get client rect.\n");
ok(EqualRect(&r, &client_rect), "Got unexpected rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n",
r.left, r.top, r.right, r.bottom, wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect));
client_rect.left, client_rect.top, client_rect.right, client_rect.bottom);
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr);
@ -1493,11 +1488,9 @@ static void test_output_desc(void)
ok(!lstrcmpW(desc.DeviceName, monitor_info.szDevice), "Got unexpected device name %s, expected %s.\n", ok(!lstrcmpW(desc.DeviceName, monitor_info.szDevice), "Got unexpected device name %s, expected %s.\n",
wine_dbgstr_w(desc.DeviceName), wine_dbgstr_w(monitor_info.szDevice)); wine_dbgstr_w(desc.DeviceName), wine_dbgstr_w(monitor_info.szDevice));
ok(!memcmp(&desc.DesktopCoordinates, &monitor_info.rcMonitor, sizeof(desc.DesktopCoordinates)), ok(!memcmp(&desc.DesktopCoordinates, &monitor_info.rcMonitor, sizeof(desc.DesktopCoordinates)),
"Got unexpected desktop coordinates {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", "Got unexpected desktop coordinates %s, expected %s.\n",
desc.DesktopCoordinates.left, desc.DesktopCoordinates.top, wine_dbgstr_rect(&desc.DesktopCoordinates),
desc.DesktopCoordinates.right, desc.DesktopCoordinates.bottom, wine_dbgstr_rect(&monitor_info.rcMonitor));
monitor_info.rcMonitor.left, monitor_info.rcMonitor.top,
monitor_info.rcMonitor.right, monitor_info.rcMonitor.bottom);
IDXGIOutput_Release(output); IDXGIOutput_Release(output);
refcount = get_refcount((IUnknown *)adapter); refcount = get_refcount((IUnknown *)adapter);