gdi32: Don't try to get glyph index when default char is 0.

Fixes a regression from 5bdc6e0f, this is what the code was originally doing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50175Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Don't try to get glyph index when default char is 0.
06206f16 · Rémi Bernon · Alexandre Julliard · 6245f072 · 06206f16 · 06206f16
Commit 06206f16 authored Dec 08, 2020 by Rémi Bernon Committed by Alexandre Julliard Dec 08, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

freetype.c dlls/gdi32/freetype.c +1 -1

font.c dlls/gdi32/tests/font.c +2 -2

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2601,7 +2601,7 @@ static UINT CDECL freetype_get_default_glyph( struct gdi_font *font )
    if ((pOS2 = pFT_Get_Sfnt_Table( ft_face, ft_sfnt_os2 )))
    {
        UINT glyph = pOS2->usDefaultChar;
-        freetype_get_glyph_index( font, &glyph, TRUE );
+        if (glyph) freetype_get_glyph_index( font, &glyph, TRUE );
        return glyph;
    }
    if (!pFT_Get_WinFNT_Header( ft_face, &winfnt )) return winfnt.default_char + winfnt.first_char;

--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -1716,8 +1716,8 @@ static void test_GetGlyphIndices(void)
    testtext[0] = 'T';
    charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags);
    ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount);
-    todo_wine ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]);
-    todo_wine ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]);
+    ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]);
+    ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]);
    DeleteObject(SelectObject(hdc, hOldFont));

    ret = pRemoveFontMemResourceEx(rsrc);