Dmitry Timoshkov : gdi32: Fix the DeleteDC test failures under Win9x.
Alexandre Julliard
julliard at winehq.org
Thu Feb 25 11:36:22 CST 2010
Module: wine
Branch: master
Commit: 2f7053e6c040c4a491fbfbdbdd3f1c63c7240823
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7053e6c040c4a491fbfbdbdd3f1c63c7240823
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date: Thu Feb 25 13:17:44 2010 +0800
gdi32: Fix the DeleteDC test failures under Win9x.
---
dlls/gdi32/tests/dc.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c
index 43c2480..193832c 100644
--- a/dlls/gdi32/tests/dc.c
+++ b/dlls/gdi32/tests/dc.c
@@ -347,7 +347,7 @@ static void test_DeleteDC(void)
ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc);
- ok(!ret, "GetObjectType should fail for a deleted DC\n");
+ ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n");
hdc = GetWindowDC(hwnd);
ok(hdc != 0, "GetDC failed\n");
@@ -356,7 +356,7 @@ static void test_DeleteDC(void)
ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc);
- ok(!ret, "GetObjectType should fail for a deleted DC\n");
+ ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n");
DestroyWindow(hwnd);
@@ -371,7 +371,7 @@ static void test_DeleteDC(void)
ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc);
- ok(!ret, "GetObjectType should fail for a deleted DC\n");
+ ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n");
hdc = GetWindowDC(hwnd);
ok(hdc != 0, "GetDC failed\n");
@@ -380,7 +380,7 @@ static void test_DeleteDC(void)
ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc);
- ok(!ret, "GetObjectType should fail for a deleted DC\n");
+ ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n");
/* CS_CLASSDC */
memset(&cls, 0, sizeof(cls));
@@ -418,7 +418,7 @@ static void test_DeleteDC(void)
ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc);
- ok(!ret, "GetObjectType should fail for a deleted DC\n");
+ ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n");
DestroyWindow(hwnd);
@@ -466,13 +466,10 @@ todo_wine
ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc);
- ok(!ret, "GetObjectType should fail for a deleted DC\n");
+ ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n");
DestroyWindow(hwnd);
- ret = GetObjectType(hdc_test);
- ok(!ret, "GetObjectType should fail for a deleted DC\n");
-
ret = UnregisterClassA("Wine own DC", GetModuleHandle(NULL));
ok(ret, "UnregisterClassA failed\n");
}
More information about the wine-cvs
mailing list