[PATCH 1/3] gdi32/uniscribe: Use space as fallback in mark_invalid_combinations().

[समीर सिंह Sameer Singh]

From: समीर सिंह Sameer Singh <[e-mail]>

If a font does not have a Dotted Circle (0x25cc) glyph then use the
space character (0x0020) as a fallback.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59680
---
 dlls/gdi32/uniscribe/shape.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/gdi32/uniscribe/shape.c b/dlls/gdi32/uniscribe/shape.c
index baee7e3ec6e..85e65819e91 100644
--- a/dlls/gdi32/uniscribe/shape.c
+++ b/dlls/gdi32/uniscribe/shape.c
@@ -923,7 +923,11 @@ static HRESULT mark_invalid_combinations(HDC hdc, const WCHAR* pwcChars, INT cCh
     for (i = 0; i < cChars; i++)
        context_type[i] = lex(pwcChars[i]);
 
-    NtGdiGetGlyphIndicesW(hdc, &invalid, 1, &invalid_glyph, 0);
+    if (NtGdiGetGlyphIndicesW(hdc, &invalid, 1, &invalid_glyph, 0) == GDI_ERROR || invalid_glyph == 0x0000)
+    {
+        invalid = 0x0020;
+        NtGdiGetGlyphIndicesW(hdc, &invalid, 1, &invalid_glyph, 0);
+    }
     for (i = 1, g=1; i < cChars - 1; i++, g++)
     {
         if (context_type[i] != 0 && context_type[i+write_dir]==context_type[i])
-- 
GitLab


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