[PATCH 1/2] gdi32/tests: Fix a test failure on Win10 1809.

[Zhiyi Zhang]

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/gdi32/tests/dc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c
index 2d9ef1dd88..3e23ce4020 100644
--- a/dlls/gdi32/tests/dc.c
+++ b/dlls/gdi32/tests/dc.c
@@ -816,7 +816,7 @@ static void test_DeleteDC(void)
     ok(ret, "UnregisterClassA failed\n");
 
     ret = GetObjectType(hdc_test);
-    ok(!ret, "GetObjectType should fail for a deleted DC\n");
+    ok(!ret || broken(ret) /* win10 1809 */, "GetObjectType should fail for a deleted DC\n");
 
     /* CS_OWNDC */
     memset(&cls, 0, sizeof(cls));
-- 
2.23.0

[Huw Davies]

On Wed, Sep 11, 2019 at 09:43:48PM +0800, Zhiyi Zhang wrote:
> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
> ---
>  dlls/gdi32/tests/dc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c
> index 2d9ef1dd88..3e23ce4020 100644
> --- a/dlls/gdi32/tests/dc.c
> +++ b/dlls/gdi32/tests/dc.c
> @@ -816,7 +816,7 @@ static void test_DeleteDC(void)
>      ok(ret, "UnregisterClassA failed\n");
>
> ret = GetObjectType(hdc_test);
> -    ok(!ret, "GetObjectType should fail for a deleted DC\n");
> +    ok(!ret || broken(ret) /* win10 1809 */, "GetObjectType should fail for a deleted DC\n");

It would be better to fix this is a different way.
GetDeviceCaps(hdc_test, TECHNOLOGY) fails here (returning 0), while
before the call to UnregisterClass() it returns DT_RASDISPLAY.  So I'd
add calls to GetDeviceCaps() and remove this call to GetObjectType().

Huw.