Alexandre Julliard : gdi32/tests: Take into account multi-monitor setups in the clip region tests.

Alexandre Julliard julliard at winehq.org
Fri Apr 20 12:49:28 CDT 2012


Module: wine
Branch: master
Commit: caf15dd7979b5eb0a446a89116fb4000ac614242
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=caf15dd7979b5eb0a446a89116fb4000ac614242

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Apr 20 12:12:06 2012 +0200

gdi32/tests: Take into account multi-monitor setups in the clip region tests.

---

 dlls/gdi32/tests/clipping.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c
index dcdc8d7..04b2785 100644
--- a/dlls/gdi32/tests/clipping.c
+++ b/dlls/gdi32/tests/clipping.c
@@ -333,7 +333,7 @@ static void test_GetClipRgn(void)
 
     /* Try unsetting and then query the clipping region. */
     ret = SelectClipRgn(hdc, NULL);
-    ok(ret == SIMPLEREGION,
+    ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1),
        "Expected SelectClipRgn to return SIMPLEREGION, got %d\n", ret);
 
     ret = GetClipRgn(hdc, NULL);
@@ -434,7 +434,8 @@ static void test_window_dc_clipping(void)
     ok(ret == 0, "expected 0, got %d\n", ret);
 
     ret = ExtSelectClipRgn(hdc, hrgn_empty, RGN_DIFF);
-    ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret);
+    ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1),
+       "expected SIMPLEREGION, got %d\n", ret);
 
     ret = GetClipRgn(hdc, hrgn);
     ok(ret == 1, "expected 1, got %d\n", ret);
@@ -446,7 +447,8 @@ static void test_window_dc_clipping(void)
         rc.left, rc.top, rc.right, rc.bottom);
 
     ret = ExtSelectClipRgn(hdc, 0, RGN_COPY);
-    ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret);
+    ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1),
+       "expected SIMPLEREGION, got %d\n", ret);
 
     ret = GetClipRgn(hdc, hrgn);
     ok(ret == 0, "expected 0, got %d\n", ret);




More information about the wine-cvs mailing list