Rémi Bernon : d3d9/tests: Explicit test_window_style results on w1064v1809.
Alexandre Julliard
julliard at winehq.org
Fri Mar 6 16:38:40 CST 2020
Module: wine
Branch: master
Commit: 64188baffed8177e668a1c3f95d27335305cb542
URL: https://source.winehq.org/git/wine.git/?a=commit;h=64188baffed8177e668a1c3f95d27335305cb542
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Thu Mar 5 20:55:04 2020 +0100
d3d9/tests: Explicit test_window_style results on w1064v1809.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/tests/device.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 8c1ebc1719..86936b0cc1 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -4859,12 +4859,12 @@ static void test_window_style(void)
style = GetWindowLongA(device_window, GWL_STYLE);
expected_style = device_style | tests[i].style;
- todo_wine ok(style == expected_style || broken(style == (expected_style & 0xff000000)),
+ todo_wine ok(style == expected_style || broken(style == (expected_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */,
"Expected device window style %#x, got %#x, i=%u.\n",
expected_style, style, i);
style = GetWindowLongA(device_window, GWL_EXSTYLE);
expected_style = device_exstyle | tests[i].exstyle;
- todo_wine ok(style == expected_style || broken(style == (expected_style & 0xff)),
+ todo_wine ok(style == expected_style || broken(style == (expected_style & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */,
"Expected device window extended style %#x, got %#x, i=%u.\n",
expected_style, style, i);
@@ -4883,7 +4883,7 @@ static void test_window_style(void)
ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s, i=%u.\n",
wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r), i);
GetClientRect(device_window, &r2);
- todo_wine ok(!EqualRect(&r, &r2) || broken(!(style & WS_THICKFRAME)),
+ todo_wine ok(!EqualRect(&r, &r2) || broken(!(style & WS_THICKFRAME)) /* w1064v1809 */,
"Client rect and window rect are equal, i=%u.\n", i);
GetWindowRect(focus_window, &r);
ok(EqualRect(&r, &focus_rect), "Expected %s, got %s, i=%u.\n",
More information about the wine-cvs
mailing list