Konstantin L. Metlov : gdi32: Handle pre-Unicode "broken" symbol TTFs with symbols at U+00XX.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 834378183ad2dffa84fab63b080c31241ac33cba
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=834378183ad2dffa84fab63b08...

Author: Konstantin L. Metlov <metlov(a)fti.dn.ua>
Date:   Fri May  6 20:32:03 2011 +0300

gdi32: Handle pre-Unicode "broken" symbol TTFs with symbols at U+00XX.

---

 dlls/gdi32/freetype.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index b329b33..a3e9cec 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4554,8 +4554,14 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph)
     }
 
     if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL && glyph < 0x100)
-        glyph = glyph + 0xf000;
-    glyphId = pFT_Get_Char_Index(font->ft_face, glyph);
+    {
+        /* there is a number of old pre-Unicode "broken" TTFs, which
+           do have symbols at U+00XX instead of U+f0XX */
+        if (!(glyphId = pFT_Get_Char_Index(font->ft_face, glyph + 0xf000)))
+            glyphId = pFT_Get_Char_Index(font->ft_face, glyph);
+    }
+    else glyphId = pFT_Get_Char_Index(font->ft_face, glyph);
+
     return get_GSUB_vert_glyph(font,glyphId);
 }