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

gdi32/tests: Fix a test failure on Win10 1809. 

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2019-09-19 15:56:38 +01:00 committed by Alexandre Julliard
parent dfd6348445
commit 9cffe80fdc
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -731,19 +731,23 @@ static void test_DeleteDC(void)
ok(hdc != 0, "GetDC failed\n"); ok(hdc != 0, "GetDC failed\n");
ret = GetObjectType(hdc); ret = GetObjectType(hdc);
ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret);
ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(ret == DT_RASDISPLAY, "GetDeviceCaps rets %d\n", ret);
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); ok(!ret, "GetDeviceCaps 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");
ret = GetObjectType(hdc); ret = GetObjectType(hdc);
ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret);
ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(ret == DT_RASDISPLAY, "GetDeviceCaps rets %d\n", ret);
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); ok(!ret, "GetDeviceCaps should fail for a deleted DC\n");
DestroyWindow(hwnd); DestroyWindow(hwnd);
@ -755,19 +759,23 @@ static void test_DeleteDC(void)
ok(hdc != 0, "GetDC failed\n"); ok(hdc != 0, "GetDC failed\n");
ret = GetObjectType(hdc); ret = GetObjectType(hdc);
ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret);
ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(ret == DT_RASDISPLAY, "GetDeviceCaps rets %d\n", ret);
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); ok(!ret, "GetDeviceCaps 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");
ret = GetObjectType(hdc); ret = GetObjectType(hdc);
ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret);
ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(ret == DT_RASDISPLAY, "GetDeviceCaps rets %d\n", ret);
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); ok(!ret, "GetDeviceCaps should fail for a deleted DC\n");
/* CS_CLASSDC */ /* CS_CLASSDC */
memset(&cls, 0, sizeof(cls)); memset(&cls, 0, sizeof(cls));
@ -802,21 +810,25 @@ static void test_DeleteDC(void)
ok(hdc != 0, "GetDC failed\n"); ok(hdc != 0, "GetDC failed\n");
ret = GetObjectType(hdc); ret = GetObjectType(hdc);
ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret);
ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(ret == DT_RASDISPLAY, "GetDeviceCaps rets %d\n", ret);
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); ok(!ret, "GetDeviceCaps should fail for a deleted DC\n");
DestroyWindow(hwnd); DestroyWindow(hwnd);
ret = GetObjectType(hdc_test); ret = GetObjectType(hdc_test);
ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret);
ret = GetDeviceCaps(hdc_test, TECHNOLOGY);
ok(ret == DT_RASDISPLAY, "GetDeviceCaps rets %d\n", ret);
ret = UnregisterClassA("Wine class DC", GetModuleHandleA(NULL)); ret = UnregisterClassA("Wine class DC", GetModuleHandleA(NULL));
ok(ret, "UnregisterClassA failed\n"); ok(ret, "UnregisterClassA failed\n");
ret = GetObjectType(hdc_test); ret = GetDeviceCaps(hdc_test, TECHNOLOGY);
ok(!ret, "GetObjectType should fail for a deleted DC\n"); ok(!ret, "GetDeviceCaps should fail for a deleted DC\n");
/* CS_OWNDC */ /* CS_OWNDC */
memset(&cls, 0, sizeof(cls)); memset(&cls, 0, sizeof(cls));
@ -849,10 +861,12 @@ static void test_DeleteDC(void)
ok(hdc != 0, "GetDC failed\n"); ok(hdc != 0, "GetDC failed\n");
ret = GetObjectType(hdc); ret = GetObjectType(hdc);
ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret);
ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(ret == DT_RASDISPLAY, "GetDeviceCaps rets %d\n", ret);
ret = DeleteDC(hdc); ret = DeleteDC(hdc);
ok(ret, "DeleteDC failed\n"); ok(ret, "DeleteDC failed\n");
ret = GetObjectType(hdc); ret = GetDeviceCaps(hdc, TECHNOLOGY);
ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); ok(!ret, "GetDeviceCaps should fail for a deleted DC\n");
DestroyWindow(hwnd); DestroyWindow(hwnd);