Skip to content

W
wine-cw
Commit c30c441e authored by Austin English's avatar Austin English Committed by Alexandre Julliard
Browse files
Options

gdi32/tests: Remove win9x hacks.

parent 372ad442
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
dlls/gdi32/tests/gdiobj.c
View file @ c30c441e
...@@ -221,7 +221,7 @@ static void test_GetCurrentObject(void) ...@@ -221,7 +221,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 || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj); ok(hobj == hpen, "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);
...@@ -257,7 +257,7 @@ static void test_GetCurrentObject(void) ...@@ -257,7 +257,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 || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj); ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj);
hcs = GetColorSpace(hdc); hcs = GetColorSpace(hdc);
if (hcs) if (hcs)
...@@ -268,7 +268,7 @@ static void test_GetCurrentObject(void) ...@@ -268,7 +268,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 || broken(hobj == 0) /* win9x */, "OBJ_COLORSPACE is wrong: %p\n", hobj); ok(hobj == hcs, "OBJ_COLORSPACE is wrong: %p\n", hobj);
} }
hrgn = CreateRectRgn(1, 1, 100, 100); hrgn = CreateRectRgn(1, 1, 100, 100);
......
dlls/gdi32/tests/palette.c
View file @ c30c441e
...@@ -110,9 +110,7 @@ static void test_DIB_PAL_COLORS(void) { ...@@ -110,9 +110,7 @@ static void test_DIB_PAL_COLORS(void) {
SetPixel( memhdc, 0, 0, setColor ); SetPixel( memhdc, 0, 0, setColor );
chkColor = RGB( logpalettedata[3].peRed, logpalettedata[3].peGreen, logpalettedata[3].peBlue ); chkColor = RGB( logpalettedata[3].peRed, logpalettedata[3].peGreen, logpalettedata[3].peBlue );
getColor = GetPixel( memhdc, 0, 0 ); getColor = GetPixel( memhdc, 0, 0 );
ok( getColor == chkColor || ok( getColor == chkColor, "getColor=%08X\n", (UINT)getColor );
broken(getColor == 0), /* win9x */
"getColor=%08X\n", (UINT)getColor );
SelectPalette( memhdc, hpalOld, FALSE ); SelectPalette( memhdc, hpalOld, FALSE );
DeleteObject( hpal ); DeleteObject( hpal );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment