ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Fix the DeleteDC test failures under Win9x.

This commit is contained in:
Dmitry Timoshkov 2010-02-25 13:17:44 +08:00 committed by Alexandre Julliard
parent f08206b31f
commit 2f7053e6c0
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/gdi32/tests/dc.c
View File

@ -347,7 +347,7 @@ static void test_DeleteDC(void)
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); 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); hdc = GetWindowDC(hwnd);
ok(hdc != 0, "GetDC failed\n"); ok(hdc != 0, "GetDC failed\n");
@ -356,7 +356,7 @@ static void test_DeleteDC(void)
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); 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); DestroyWindow(hwnd);
@ -371,7 +371,7 @@ static void test_DeleteDC(void)
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); 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); hdc = GetWindowDC(hwnd);
ok(hdc != 0, "GetDC failed\n"); ok(hdc != 0, "GetDC failed\n");
@ -380,7 +380,7 @@ static void test_DeleteDC(void)
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); 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 */ /* CS_CLASSDC */
memset(&cls, 0, sizeof(cls)); memset(&cls, 0, sizeof(cls));
@ -418,7 +418,7 @@ static void test_DeleteDC(void)
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); 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); DestroyWindow(hwnd);
@ -466,13 +466,10 @@ todo_wine
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); 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); DestroyWindow(hwnd);
ret = GetObjectType(hdc_test);
ok(!ret, "GetObjectType should fail for a deleted DC\n");
ret = UnregisterClassA("Wine own DC", GetModuleHandle(NULL)); ret = UnregisterClassA("Wine own DC", GetModuleHandle(NULL));
ok(ret, "UnregisterClassA failed\n"); ok(ret, "UnregisterClassA failed\n");
} }