[PATCH 0/1] MR7859: gdi32/tests: Fix NtGdiMakeFontDir test to adopt newer Windows behavior.

[Bernhard Übelacker]

Followup of 5a6a75a5ff.

[Link to the pattern page.](https://test.winehq.org/data/patterns.html#gdi32:font)

[A testbot run with this patch.](https://testbot.winehq.org/JobDetails.pl?Key=157999)

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7859

[PATCH 1/1] gdi32/tests: Fix NtGdiMakeFontDir test to adopt newer Windows behavior.

[Bernhard Übelacker]

From: Bernhard Übelacker <bernhardu(a)mailbox.org>

Followup of 5a6a75a5ff.
---
 dlls/gdi32/tests/font.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index f4ca6aeffb6..7e7ab786daf 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -6118,7 +6118,7 @@ static void test_CreateScalableFontResource(void)
         ret = pNtGdiMakeFontDir( 0, buffer, sizeof(*fontdir), nt_name.Buffer, 0 );
         ok( !ret, "got %lx\n", ret );
         ret = pNtGdiMakeFontDir( 0, buffer, sizeof(*fontdir), nt_name.Buffer, nt_name.Length + 6 );
-        ok( !ret, "got %lx\n", ret );
+        todo_wine ok( ret || broken(!ret) /* below Win10-1607 */, "got %lx\n", ret );
         ret = pNtGdiMakeFontDir( 0, buffer, sizeof(*fontdir), nt_name.Buffer, nt_name.Length + 2 );
         ok( ret, "NtGdiMakeFontDir failed\n" );
         ok( fontdir->dfSize == 0x95, "wrong size %lx\n", fontdir->dfSize );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7859

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about dlls/gdi32/tests/font.c:
> ret = pNtGdiMakeFontDir( 0, buffer, sizeof(*fontdir), nt_name.Buffer, 0 );
>          ok( !ret, "got %lx\n", ret );
>          ret = pNtGdiMakeFontDir( 0, buffer, sizeof(*fontdir), nt_name.Buffer, nt_name.Length + 6 );
> -        ok( !ret, "got %lx\n", ret );
> +        todo_wine ok( ret || broken(!ret) /* below Win10-1607 */, "got %lx\n", ret );

Perhaps we should just remove this test?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7859#note_101688