Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-20 15:35:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDI32_APITEST]

Browse source 
- Comment out tests that fail on windows 2003
- Try to fix a number of tests for Windows 2003

svn path=/trunk/; revision=56509
This commit is contained in:
Timo Kreuzer 2012-05-05 12:21:56 +00:00
parent e8beca164c
commit bc53e4ea25
4 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rostests/apitests/gdi32/CombineRgn.c
View file

@ -21,7 +21,7 @@ void Test_CombineRgn_Params()
ok_long(CombineRgn(NULL, NULL, NULL, 0), ERROR);
ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, 0), ERROR);
ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, 6), ERROR);
ok_long(GetLastError(), 0xbadbabe);
ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_PARAMETER), "wrong error: %ld\n", GetLastError());
}
@ -38,7 +38,7 @@ void Test_CombineRgn_COPY()
ok_long(CombineRgn(NULL, hrgn1, NULL, RGN_COPY), ERROR);
ok_long(CombineRgn(NULL, NULL, hrgn1, RGN_COPY), ERROR);
ok_long(CombineRgn(NULL, hrgn1, hrgn2, RGN_COPY), ERROR);
ok_long(GetLastError(), 0xbadbabe);
ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError());
ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, RGN_COPY), SIMPLEREGION);
ok(EqualRgn(hrgn1, hrgn2), "Region is not correct\n");
@ -58,7 +58,7 @@ void Test_CombineRgn_COPY()
ok_long(CombineRgn(hrgn1, NULL, NULL, RGN_COPY), ERROR);
ok(EqualRgn(hrgn1, hrgn3), "Region is not correct\n");
ok_long(GetLastError(), 0xbadbabe);
ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError());
}
@ -77,7 +77,7 @@ void Test_CombineRgn_AND()
ok_long(CombineRgn(hrgn1, NULL, hrgn2, RGN_AND), ERROR);
ok_long(CombineRgn(hrgn1, GetStockObject(BLACK_PEN), hrgn2, RGN_AND), ERROR);
ok_long(CombineRgn(hrgn1, hrgn2, GetStockObject(BLACK_PEN), RGN_AND), ERROR);
ok_long(GetLastError(), 0xbadbabe);
ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError());
ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, RGN_AND), SIMPLEREGION);
@ -152,7 +152,7 @@ void Test_CombineRgn_DIFF()
ok_long(CombineRgn(hrgn1, NULL, hrgn2, RGN_DIFF), ERROR);
ok_long(CombineRgn(hrgn1, GetStockObject(BLACK_PEN), hrgn2, RGN_DIFF), ERROR);
ok_long(CombineRgn(hrgn1, hrgn2, GetStockObject(BLACK_PEN), RGN_DIFF), ERROR);
ok_long(GetLastError(), 0xbadbabe);
ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError());
ok_long(CombineRgn(hrgn1, hrgn1, hrgn1, RGN_DIFF), NULLREGION);
ok_long(CombineRgn(hrgn1, hrgn2, hrgn2, RGN_DIFF), NULLREGION);
@ -182,7 +182,7 @@ void Test_CombineRgn_XOR()
ok_long(CombineRgn(hrgn1, NULL, hrgn2, RGN_XOR), ERROR);
ok_long(CombineRgn(hrgn1, GetStockObject(BLACK_PEN), hrgn2, RGN_XOR), ERROR);
ok_long(CombineRgn(hrgn1, hrgn2, GetStockObject(BLACK_PEN), RGN_XOR), ERROR);
ok_long(GetLastError(), 0xbadbabe);
ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError());
ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, RGN_XOR), COMPLEXREGION);
ok_long(CombineRgn(hrgn4, hrgn2, hrgn3, RGN_OR), COMPLEXREGION);

34
rostests/apitests/gdi32/CombineTransform.c
View file

@ -19,9 +19,13 @@ typedef union
#define ok_flt(x, y) \
{ \
FLT_LONG __x, __y; \
__x.e = (x); \
__y.e = (y); \
ok(__x.l == __y.l, "Wrong value for " #x ", expected " #y " (%f), got %f\n", (double)(y), (double)(x)); \
__x.e = (x); \
__y.e = (y); \
if (_isnan(y)) {\
ok((__x.l == __y.l) || (__x.l == 0), "Wrong value for " #x ", expected " #y " (%f), got %f\n", (double)(y), (double)(x)); \
} else {\
ok(__x.l == __y.l, "Wrong value for " #x ", expected " #y " (%f), got %f\n", (double)(y), (double)(x)); \
} \
}
#define ok_xform(xform, m11, m12, m21, m22, dx, dy) \
@ -122,33 +126,33 @@ void Test_CombineTransform()
set_xform(&xform1, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
set_xform(&xform2, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
set_xform(&xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
xform1.eDx = 4294967167.999999761;
xform1.eDx = (FLOAT)4294967167.999999761;
ok(xform1.eDx == 4294967040.0, "float rounding error.\n");
ret = CombineTransform(&xform3, &xform1, &xform2);
ok(ret == 1, "expected ret = 1, got %d\n", ret);
ok_xform(xform3, 1.0, 0.0, 0.0, 1.0, 4294967040.0, 0.0);
set_xform(&xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
xform1.eDx = 4294967167.999999762;
xform1.eDx = (FLOAT)4294967167.999999762;
ok(xform1.eDx == 4294967296.0, "float rounding error.\n");
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_int(ret, 0);
ok_int(GetLastError(), ERROR_SUCCESS);
ok_xform(xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
xform1.eDx = -4294967167.999999761;
xform1.eDx = (FLOAT)-4294967167.999999761;
ok(xform1.eDx == -4294967040.0, "float rounding error.\n");
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_int(ret, 1);
xform1.eDx = -4294967167.999999762;
xform1.eDx = (FLOAT)-4294967167.999999762;
ok(xform1.eDx == -4294967296.0, "float rounding error.\n");
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_int(ret, 0);
ok_int(GetLastError(), ERROR_SUCCESS);
xform1.eDx = 0;
xform1.eDy = 4294967167.999999761;
xform1.eDy = (FLOAT)4294967167.999999761;
ok(xform1.eDy == 4294967040.0, "float rounding error.\n");
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_int(ret, 1);
@ -158,18 +162,18 @@ void Test_CombineTransform()
ok_int(ret, 1);
ok_flt(xform3.eDy, 4294967040.0);
xform1.eDy = 4294967167.999999762;
xform1.eDy = (FLOAT)4294967167.999999762;
ok(xform1.eDy == 4294967296.0, "float rounding error.\n");
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_int(ret, 0);
ok_int(GetLastError(), ERROR_SUCCESS);
xform1.eDy = -4294967167.999999761;
xform1.eDy = (FLOAT)-4294967167.999999761;
ok(xform1.eDy == -4294967040.0, "float rounding error.\n");
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_int(ret, 1);
xform1.eDy = -4294967167.999999762;
xform1.eDy = (FLOAT)-4294967167.999999762;
ok(xform1.eDy == -4294967296.0, "float rounding error.\n");
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_int(ret, 0);
@ -180,7 +184,7 @@ void Test_CombineTransform()
ok_int(ret, 1);
set_xform(&xform1, 1000.0, 0.0, 0.0, 0.0, 0.0, 0.0);
xform1.eDx = -4294967167.999999762;
xform1.eDx = (FLOAT)-4294967167.999999762;
xform2.eM11 = 1000.0;
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_int(ret, 0);
@ -207,18 +211,18 @@ void Test_CombineTransform()
ok_xform(xform3, geIND, geIND, geINF, geINF, 0.0, 0.0);
ok_int(GetLastError(), ERROR_SUCCESS);
set_xform(&xform1, 18446743500000000000.0, 0.0, 1.0, 0.0, 0.0, 0.0);
set_xform(&xform1, (FLOAT)18446743500000000000.0, 0.0, 1.0, 0.0, 0.0, 0.0);
xform2 = xform1;
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_int(ret, 1);
ok_flt(xform3.eM11, 340282326356119260000000000000000000000.0);
xform1.eM11 = 18446745000000000000.0;
xform1.eM11 = (FLOAT)18446745000000000000.0;
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_int(ret, 1);
ok_flt(xform3.eM11, 340282346638528860000000000000000000000.0);
xform1.eM11 = 18446746000000000000.0;
xform1.eM11 = (FLOAT)18446746000000000000.0;
ret = CombineTransform(&xform3, &xform1, &xform2);
ok_long(*(DWORD*)&xform3.eM11, 0x7f800000);

4
rostests/apitests/gdi32/CreateBitmap.c
View file

@ -66,7 +66,7 @@ void Test_CreateBitmap_Params()
/* Check for maximum height */
hbmp = CreateBitmap(1, 0x1FFFFF00, 1, 1, NULL);
ok(hbmp != 0, "\n");
//ok(hbmp != 0, "\n"); // fails on windows 2003
DeleteObject(hbmp);
SetLastError(0);
hbmp = CreateBitmap(1, 0x1FFFFFFF, 1, 1, NULL);
@ -75,7 +75,7 @@ void Test_CreateBitmap_Params()
/* Check for overflow in width * height */
hbmp = CreateBitmap(0x20000, 0x1FFFF, 1, 1, NULL);
ok(hbmp != 0, "\n");
//ok(hbmp != 0, "\n"); // fails on windows 2003
DeleteObject(hbmp);
SetLastError(0);
hbmp = CreateBitmap(0x20000, 0x20000, 1, 1, NULL);

2
rostests/apitests/gdi32/CreateBitmapIndirect.c
View file

@ -68,7 +68,7 @@ void Test_CreateBitmapIndirect()
win_bitmap.bmWidth = 0x8000;
win_bitmap.bmWidthBytes = win_bitmap.bmWidth;
win_hBmp = CreateBitmapIndirect(&win_bitmap);
ok(win_hBmp != 0, "CreateBitmapIndirect failed\n");
//ok(win_hBmp != 0, "CreateBitmapIndirect failed\n"); // fails on win 2003
DeleteObject(win_hBmp);
}