gdi32: Beautifully handle pre-Unicode symbol TTFs with symbols at U+00XX.

[Konstantin L. Metlov]

This patch augments the beautiful commit 834378183ad2dffa84fab63b080c31241ac33cba with the code, which actually 
makes it work. This is done while attempting to minimally distort the beauty. ;-)

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

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index a3e9cec..bdbcc33 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4553,12 +4553,14 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph)
         return get_GSUB_vert_glyph(font,ret);
     }
 
-    if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL && glyph < 0x100)
+    if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL)
     {
+        if (glyph < 0x100)
+            glyph = glyph + 0xf000;
         /* 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);
+        if (!(glyphId = pFT_Get_Char_Index(font->ft_face, glyph)))
+            glyphId = pFT_Get_Char_Index(font->ft_face, glyph-0xf000);
     }
     else glyphId = pFT_Get_Char_Index(font->ft_face, glyph);
 
-- 
1.7.0.4