[PATCH 1/4] ddraw/tests: Don't test functions directly when reporting GetLastError()

[André Hentschel]

Signed-off-by: André Hentschel <nerv at dawncrow.de>
---
 dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++---------
 dlls/ddraw/tests/ddraw2.c | 28 +++++++++++++++++++---------
 dlls/ddraw/tests/ddraw4.c | 28 +++++++++++++++++++---------
 dlls/ddraw/tests/ddraw7.c | 28 +++++++++++++++++++---------
 4 files changed, 76 insertions(+), 36 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index e1a315f291f..df5c8ac8400 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -13964,6 +13964,7 @@ static void test_cursor_clipping(void)
     IDirectDraw *ddraw;
     HWND window;
     HRESULT hr;
+    BOOL ret;
 
     window = create_window();
     ok(!!window, "Failed to create a window.\n");
@@ -13986,9 +13987,11 @@ static void test_cursor_clipping(void)
         goto done;
     }
 
-    ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError());
+    ret = ClipCursor(NULL);
+    ok(ret, "ClipCursor failed, error %#x.\n", GetLastError());
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -13997,7 +14000,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -14010,7 +14014,8 @@ static void test_cursor_clipping(void)
     }
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -14018,7 +14023,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -14027,7 +14033,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     SetRect(&rect, 0, 0, param.old_width, param.old_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -14040,7 +14047,8 @@ static void test_cursor_clipping(void)
     }
     flush_events();
     SetRect(&rect, 0, 0, param.new_width, param.new_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -14049,7 +14057,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr);
     flush_events();
     SetRect(&rect, 0, 0, param.old_width, param.old_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -14058,7 +14067,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 849d510a349..bc915c97864 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -14925,6 +14925,7 @@ static void test_cursor_clipping(void)
     IDirectDraw2 *ddraw;
     HWND window;
     HRESULT hr;
+    BOOL ret;
 
     window = create_window();
     ok(!!window, "Failed to create a window.\n");
@@ -14947,9 +14948,11 @@ static void test_cursor_clipping(void)
         goto done;
     }
 
-    ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError());
+    ret = ClipCursor(NULL);
+    ok(ret, "ClipCursor failed, error %#x.\n", GetLastError());
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -14958,7 +14961,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -14971,7 +14975,8 @@ static void test_cursor_clipping(void)
     }
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -14979,7 +14984,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -14988,7 +14994,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     SetRect(&rect, 0, 0, param.old_width, param.old_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -15001,7 +15008,8 @@ static void test_cursor_clipping(void)
     }
     flush_events();
     SetRect(&rect, 0, 0, param.new_width, param.new_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -15010,7 +15018,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr);
     flush_events();
     SetRect(&rect, 0, 0, param.old_width, param.old_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -15019,7 +15028,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 56a4777add5..f009b4583f4 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -17985,6 +17985,7 @@ static void test_cursor_clipping(void)
     IDirectDraw4 *ddraw;
     HWND window;
     HRESULT hr;
+    BOOL ret;
 
     window = create_window();
     ok(!!window, "Failed to create a window.\n");
@@ -18007,9 +18008,11 @@ static void test_cursor_clipping(void)
         goto done;
     }
 
-    ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError());
+    ret = ClipCursor(NULL);
+    ok(ret, "ClipCursor failed, error %#x.\n", GetLastError());
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18018,7 +18021,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18031,7 +18035,8 @@ static void test_cursor_clipping(void)
     }
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18039,7 +18044,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18048,7 +18054,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     SetRect(&rect, 0, 0, param.old_width, param.old_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18061,7 +18068,8 @@ static void test_cursor_clipping(void)
     }
     flush_events();
     SetRect(&rect, 0, 0, param.new_width, param.new_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18070,7 +18078,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr);
     flush_events();
     SetRect(&rect, 0, 0, param.old_width, param.old_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18079,7 +18088,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index c9ba50287be..613f8dae98b 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -18247,6 +18247,7 @@ static void test_cursor_clipping(void)
     IDirectDraw7 *ddraw;
     HWND window;
     HRESULT hr;
+    BOOL ret;
 
     window = create_window();
     ok(!!window, "Failed to create a window.\n");
@@ -18269,9 +18270,11 @@ static void test_cursor_clipping(void)
         goto done;
     }
 
-    ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError());
+    ret = ClipCursor(NULL);
+    ok(ret, "ClipCursor failed, error %#x.\n", GetLastError());
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18280,7 +18283,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18293,7 +18297,8 @@ static void test_cursor_clipping(void)
     }
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18301,7 +18306,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18310,7 +18316,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     SetRect(&rect, 0, 0, param.old_width, param.old_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18323,7 +18330,8 @@ static void test_cursor_clipping(void)
     }
     flush_events();
     SetRect(&rect, 0, 0, param.new_width, param.new_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18332,7 +18340,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr);
     flush_events();
     SetRect(&rect, 0, 0, param.old_width, param.old_height);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
@@ -18341,7 +18350,8 @@ static void test_cursor_clipping(void)
     ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr);
     flush_events();
     get_virtual_rect(&rect);
-    ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
+    ret = GetClipCursor(&clip_rect);
+    ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError());
     ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
             wine_dbgstr_rect(&clip_rect));
 
-- 
2.25.1