[PATCH] d3d8, 9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio)
Nikolay Sivov
nsivov at codeweavers.com
Tue Oct 13 16:32:11 CDT 2015
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/d3d8/tests/device.c | 16 ++++++++--------
dlls/d3d9/tests/device.c | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index ccc16c6..827f144 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -834,12 +834,12 @@ static void test_cursor(void)
ok(SUCCEEDED(hr), "Failed to create cursor surface, hr %#x.\n", hr);
/* Initially hidden */
- hr = IDirect3DDevice8_ShowCursor(device, TRUE);
- ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr);
+ ret = IDirect3DDevice8_ShowCursor(device, TRUE);
+ ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret);
/* Not enabled without a surface*/
- hr = IDirect3DDevice8_ShowCursor(device, TRUE);
- ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr);
+ ret = IDirect3DDevice8_ShowCursor(device, TRUE);
+ ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret);
/* Fails */
hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, NULL);
@@ -857,12 +857,12 @@ static void test_cursor(void)
ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */
/* Still hidden */
- hr = IDirect3DDevice8_ShowCursor(device, TRUE);
- ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr);
+ ret = IDirect3DDevice8_ShowCursor(device, TRUE);
+ ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret);
/* Enabled now*/
- hr = IDirect3DDevice8_ShowCursor(device, TRUE);
- ok(hr == TRUE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr);
+ ret = IDirect3DDevice8_ShowCursor(device, TRUE);
+ ok(ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret);
memset(&info, 0, sizeof(info));
info.cbSize = sizeof(info);
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 3bf0ff2..326e789 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -1638,12 +1638,12 @@ static void test_cursor(void)
ok(SUCCEEDED(hr), "Failed to create cursor surface, hr %#x.\n", hr);
/* Initially hidden */
- hr = IDirect3DDevice9_ShowCursor(device, TRUE);
- ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr);
+ ret = IDirect3DDevice9_ShowCursor(device, TRUE);
+ ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret);
/* Not enabled without a surface*/
- hr = IDirect3DDevice9_ShowCursor(device, TRUE);
- ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr);
+ ret = IDirect3DDevice9_ShowCursor(device, TRUE);
+ ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret);
/* Fails */
hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, NULL);
@@ -1661,12 +1661,12 @@ static void test_cursor(void)
ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */
/* Still hidden */
- hr = IDirect3DDevice9_ShowCursor(device, TRUE);
- ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr);
+ ret = IDirect3DDevice9_ShowCursor(device, TRUE);
+ ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret);
/* Enabled now*/
- hr = IDirect3DDevice9_ShowCursor(device, TRUE);
- ok(hr == TRUE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr);
+ ret = IDirect3DDevice9_ShowCursor(device, TRUE);
+ ok(ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret);
memset(&info, 0, sizeof(info));
info.cbSize = sizeof(info);
--
2.6.1
More information about the wine-patches
mailing list