ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw/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>
This commit is contained in:
André Hentschel 2020-12-19 15:53:36 +01:00 committed by Alexandre Julliard
parent 560ac90ba0
commit 36ece53533
4 changed files with 76 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/ddraw/tests/ddraw1.c
View File

@ -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));

28
dlls/ddraw/tests/ddraw2.c
View File

@ -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));

28
dlls/ddraw/tests/ddraw4.c
View File

@ -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));

28
dlls/ddraw/tests/ddraw7.c
View File

@ -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));