Qian Hong : gdi32: Fixed get_name_table_entry for symbol fonts.

[Alexandre Julliard]

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

Author: Qian Hong <fracting(a)gmail.com>
Date:   Tue Sep 11 01:06:39 2012 +0800

gdi32: Fixed get_name_table_entry for symbol fonts.

---

 dlls/gdi32/freetype.c   |    3 +--
 dlls/gdi32/tests/font.c |    4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index efb12a4..9412df2 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -1146,7 +1146,7 @@ static BOOL get_name_table_entry(FT_Face ft_face, FT_SfntName *req)
             if(!pFT_Get_Sfnt_Name(ft_face, name_index, &name))
             {
                 if((name.platform_id == req->platform_id) &&
-                   (name.encoding_id == req->encoding_id) &&
+                   ((name.encoding_id == TT_MS_ID_UNICODE_CS) || (name.encoding_id == TT_MS_ID_SYMBOL_CS)) &&
                    (name.language_id == req->language_id) &&
                    (name.name_id     == req->name_id))
                 {
@@ -1168,7 +1168,6 @@ static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, FT_UShort langua
     FT_SfntName name;
 
     name.platform_id = TT_PLATFORM_MICROSOFT;
-    name.encoding_id = TT_MS_ID_UNICODE_CS;
     name.language_id = language_id;
     name.name_id     = name_id;
 
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index ef4e51d..0c67fe7 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -4151,9 +4151,7 @@ static void test_fullname2_helper(const char *Family)
         ok(ret, "UNIQUE_ID (full name) could not be read\n");
         WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE);
         otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName;
-        if (efnd.elf[i].elfLogFont.lfCharSet == SYMBOL_CHARSET)
-            todo_wine ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA);
-        else ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA);
+        ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA);
 
         SelectObject(hdc, of);
         DeleteObject(hfont);