Huw Davies : gdi32/tests: Fix tests on NT4.
Alexandre Julliard
julliard at winehq.org
Wed Mar 4 09:00:58 CST 2009
Module: wine
Branch: master
Commit: 17a866df2967c2c263b9670b5d2ede9927beb4a9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a866df2967c2c263b9670b5d2ede9927beb4a9
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Mar 4 11:47:10 2009 +0000
gdi32/tests: Fix tests on NT4.
---
dlls/gdi32/tests/clipping.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c
index 0ae3eb6..eff87c3 100644
--- a/dlls/gdi32/tests/clipping.c
+++ b/dlls/gdi32/tests/clipping.c
@@ -162,12 +162,16 @@ static void verify_region(HRGN hrgn, const RECT *rc)
if (IsRectEmpty(rc))
{
ok(rgn.data.rdh.nCount == 0, "expected 0, got %u\n", rgn.data.rdh.nCount);
- ok(rgn.data.rdh.nRgnSize == 0, "expected 0, got %u\n", rgn.data.rdh.nRgnSize);
+ ok(rgn.data.rdh.nRgnSize == 0 ||
+ broken(rgn.data.rdh.nRgnSize == 168), /* NT4 */
+ "expected 0, got %u\n", rgn.data.rdh.nRgnSize);
}
else
{
ok(rgn.data.rdh.nCount == 1, "expected 1, got %u\n", rgn.data.rdh.nCount);
- ok(rgn.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize);
+ ok(rgn.data.rdh.nRgnSize == sizeof(RECT) ||
+ broken(rgn.data.rdh.nRgnSize == 168), /* NT4 */
+ "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize);
}
ok(EqualRect(&rgn.data.rdh.rcBound, rc), "rects don't match\n");
}
@@ -236,9 +240,14 @@ if (0) /* crashes under Win9x */
SetLastError(0xdeadbeef);
hrgn = ExtCreateRegion(NULL, 1, &rgn.data);
- ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError());
- verify_region(hrgn, &rc);
- DeleteObject(hrgn);
+ ok(hrgn != 0 ||
+ broken(GetLastError() == 0xdeadbeef), /* NT4 */
+ "ExtCreateRegion error %u\n", GetLastError());
+ if(hrgn)
+ {
+ verify_region(hrgn, &rc);
+ DeleteObject(hrgn);
+ }
xform.eM11 = 0.5; /* 50% width */
xform.eM12 = 0.0;
More information about the wine-cvs
mailing list