From 2f7053e6c040c4a491fbfbdbdd3f1c63c7240823 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 25 Feb 2010 13:17:44 +0800 Subject: [PATCH] gdi32: Fix the DeleteDC test failures under Win9x. --- dlls/gdi32/tests/dc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 43c248073a..193832c5e1 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"); } -- 2.32.0.93.g670b81a890