David Moore : gdi: Fix display of fonts using Symbol codepages and assorted other

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 1ef9a6db4e1c96efb1e44842bd152ee94c151817
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=1ef9a6db4e1c96efb1e44842...

Author: David Moore <davidm(a)sjsoft.com>
Date:   Fri Jan 13 14:25:16 2006 +0100

gdi: Fix display of fonts using Symbol codepages and assorted other
codepages.

---

 dlls/gdi/freetype.c |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index aff355d..3023ab3 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -2679,14 +2679,38 @@ static void FTVectorToPOINTFX(FT_Vector 
     return;
 }
 
+/***************************************************
+ * According to the MSDN documentation on WideCharToMultiByte,
+ * certain codepages cannot set the default_used parameter.
+ * This returns TRUE if the codepage can set that parameter, false else
+ * so that calls to WideCharToMultiByte don't fail with ERROR_INVALID_PARAMETER
+ */
+static BOOL codepage_sets_default_used(UINT codepage)
+{
+   switch (codepage)
+   {
+       case CP_UTF7:
+       case CP_UTF8:
+       case CP_SYMBOL:
+           return FALSE;
+       default:
+           return TRUE;
+   }
+}
+
 static FT_UInt get_glyph_index(GdiFont font, UINT glyph)
 {
     if(font->ft_face->charmap->encoding == FT_ENCODING_NONE) {
         WCHAR wc = (WCHAR)glyph;
         BOOL default_used;
+        BOOL *default_used_pointer;
         FT_UInt ret;
         char buf;
-        if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, &default_used) || default_used)
+        default_used_pointer = NULL;
+        default_used = FALSE;
+        if (codepage_sets_default_used(font->codepage))
+            default_used_pointer = &default_used;
+        if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || default_used)
             ret = 0;
         else
             ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)buf);