Module: wine Branch: master Commit: c30c441ea7d6d6066a41e259d438f454b327a6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30c441ea7d6d6066a41e259d4...
Author: Austin English austinenglish@gmail.com Date: Tue Jul 26 18:01:07 2011 -0700
gdi32/tests: Remove win9x hacks.
---
dlls/gdi32/tests/gdiobj.c | 6 +++--- dlls/gdi32/tests/palette.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index bc00b3d..c854311 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -221,7 +221,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_PEN); ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj); 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)); assert(hbrush != 0); @@ -257,7 +257,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_PEN); ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj); 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); if (hcs) @@ -268,7 +268,7 @@ static void test_GetCurrentObject(void) ok(hcs != 0, "CreateColorSpace failed\n"); SelectObject(hdc, hcs); 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); diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 851c321..c9455ca 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -110,9 +110,7 @@ static void test_DIB_PAL_COLORS(void) { SetPixel( memhdc, 0, 0, setColor ); chkColor = RGB( logpalettedata[3].peRed, logpalettedata[3].peGreen, logpalettedata[3].peBlue ); getColor = GetPixel( memhdc, 0, 0 ); - ok( getColor == chkColor || - broken(getColor == 0), /* win9x */ - "getColor=%08X\n", (UINT)getColor ); + ok( getColor == chkColor, "getColor=%08X\n", (UINT)getColor );
SelectPalette( memhdc, hpalOld, FALSE ); DeleteObject( hpal );