gdi32/tests: Fix some test failures on Win9x.
This commit is contained in:
parent
e4cc0bc422
commit
73423c1a40
|
@ -43,7 +43,7 @@ static void test_gdi_objects(void)
|
||||||
*/
|
*/
|
||||||
SetLastError(0);
|
SetLastError(0);
|
||||||
hp = SelectObject(NULL, GetStockObject(BLACK_PEN));
|
hp = SelectObject(NULL, GetStockObject(BLACK_PEN));
|
||||||
ok(!hp && GetLastError() == ERROR_INVALID_HANDLE,
|
ok(!hp && (GetLastError() == ERROR_INVALID_HANDLE || broken(!GetLastError())),
|
||||||
"SelectObject(NULL DC) expected 0, ERROR_INVALID_HANDLE, got %p, %u\n",
|
"SelectObject(NULL DC) expected 0, ERROR_INVALID_HANDLE, got %p, %u\n",
|
||||||
hp, GetLastError());
|
hp, GetLastError());
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ static void test_gdi_objects(void)
|
||||||
/* GetObject does not SetLastError() on a null object */
|
/* GetObject does not SetLastError() on a null object */
|
||||||
SetLastError(0);
|
SetLastError(0);
|
||||||
i = GetObjectA(NULL, sizeof(buff), buff);
|
i = GetObjectA(NULL, sizeof(buff), buff);
|
||||||
ok (!i && !GetLastError(),
|
ok (!i && (GetLastError() == 0 || GetLastError() == ERROR_INVALID_PARAMETER),
|
||||||
"GetObject(NULL obj), expected 0, NO_ERROR, got %d, %u\n",
|
"GetObject(NULL obj), expected 0, NO_ERROR, got %d, %u\n",
|
||||||
i, GetLastError());
|
i, GetLastError());
|
||||||
|
|
||||||
|
@ -207,7 +207,7 @@ static void test_GetCurrentObject(void)
|
||||||
hobj = GetCurrentObject(hdc, OBJ_PEN);
|
hobj = GetCurrentObject(hdc, OBJ_PEN);
|
||||||
ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj);
|
ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj);
|
||||||
hobj = GetCurrentObject(hdc, OBJ_EXTPEN);
|
hobj = GetCurrentObject(hdc, OBJ_EXTPEN);
|
||||||
ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj);
|
ok(hobj == hpen || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj);
|
||||||
|
|
||||||
hbrush = CreateSolidBrush(RGB(10, 20, 30));
|
hbrush = CreateSolidBrush(RGB(10, 20, 30));
|
||||||
assert(hbrush != 0);
|
assert(hbrush != 0);
|
||||||
|
@ -243,7 +243,7 @@ static void test_GetCurrentObject(void)
|
||||||
hobj = GetCurrentObject(hdc, OBJ_PEN);
|
hobj = GetCurrentObject(hdc, OBJ_PEN);
|
||||||
ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj);
|
ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj);
|
||||||
hobj = GetCurrentObject(hdc, OBJ_EXTPEN);
|
hobj = GetCurrentObject(hdc, OBJ_EXTPEN);
|
||||||
ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj);
|
ok(hobj == hpen || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj);
|
||||||
|
|
||||||
hcs = GetColorSpace(hdc);
|
hcs = GetColorSpace(hdc);
|
||||||
if (hcs)
|
if (hcs)
|
||||||
|
@ -254,7 +254,7 @@ static void test_GetCurrentObject(void)
|
||||||
ok(hcs != 0, "CreateColorSpace failed\n");
|
ok(hcs != 0, "CreateColorSpace failed\n");
|
||||||
SelectObject(hdc, hcs);
|
SelectObject(hdc, hcs);
|
||||||
hobj = GetCurrentObject(hdc, OBJ_COLORSPACE);
|
hobj = GetCurrentObject(hdc, OBJ_COLORSPACE);
|
||||||
ok(hobj == hcs, "OBJ_COLORSPACE is wrong: %p\n", hobj);
|
ok(hobj == hcs || broken(hobj == 0) /* win9x */, "OBJ_COLORSPACE is wrong: %p\n", hobj);
|
||||||
}
|
}
|
||||||
|
|
||||||
hrgn = CreateRectRgn(1, 1, 100, 100);
|
hrgn = CreateRectRgn(1, 1, 100, 100);
|
||||||
|
|
Loading…
Reference in New Issue