Skip to content

W
wine-winehq
Commit 2f7053e6 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

gdi32: Fix the DeleteDC test failures under Win9x.

parent f08206b3
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
dlls/gdi32/tests/dc.c
View file @ 2f7053e6
...@@ -347,7 +347,7 @@ static void test_DeleteDC(void) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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 ...@@ -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");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment