Dmitry Timoshkov : gdi32: Add a test for PS_NULL pen being equal to NULL_PEN stock object.
Alexandre Julliard
julliard at winehq.org
Tue Sep 30 11:16:20 CDT 2008
Module: wine
Branch: master
Commit: 830f1563c63cabc0b65e615828dc7d6aa47c3763
URL: http://source.winehq.org/git/wine.git/?a=commit;h=830f1563c63cabc0b65e615828dc7d6aa47c3763
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date: Mon Sep 29 03:56:41 2008 +0900
gdi32: Add a test for PS_NULL pen being equal to NULL_PEN stock object.
---
dlls/gdi32/tests/pen.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c
index 8b2e41a..144875b 100644
--- a/dlls/gdi32/tests/pen.c
+++ b/dlls/gdi32/tests/pen.c
@@ -70,7 +70,7 @@ static void test_logpen(void)
for (i = 0; i < sizeof(pen)/sizeof(pen[0]); i++)
{
- trace("testing style %u\n", pen[i].style);
+ trace("%d: testing style %u\n", i, pen[i].style);
/********************** cosmetic pens **********************/
/* CreatePenIndirect behaviour */
@@ -144,6 +144,8 @@ static void test_logpen(void)
/* for some reason XP differentiates PS_NULL here */
if (pen[i].style == PS_NULL)
{
+ todo_wine
+ ok(hpen == GetStockObject(NULL_PEN), "hpen should be a stock NULL_PEN\n");
ok(size == sizeof(EXTLOGPEN), "GetObject returned %d, error %d\n", size, GetLastError());
ok(elp.elpPenStyle == pen[i].ret_style, "expected %u, got %u\n", pen[i].ret_style, elp.elpPenStyle);
ok(elp.elpWidth == 0, "expected 0, got %u\n", elp.elpWidth);
@@ -206,7 +208,11 @@ static void test_logpen(void)
obj_type = GetObjectType(hpen);
/* for some reason XP differentiates PS_NULL here */
if (pen[i].style == PS_NULL)
+ {
ok(obj_type == OBJ_PEN, "wrong object type %u\n", obj_type);
+ todo_wine
+ ok(hpen == GetStockObject(NULL_PEN), "hpen should be a stock NULL_PEN\n");
+ }
else
ok(obj_type == OBJ_EXTPEN, "wrong object type %u\n", obj_type);
More information about the wine-cvs
mailing list