Dmitry Timoshkov : gdi32: Make GetKerningPairsA not fail for fonts with SYMBOL charset.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Apr 2 06:23:01 CDT 2007


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

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Sun Apr  1 20:17:33 2007 +0900

gdi32: Make GetKerningPairsA not fail for fonts with SYMBOL charset.

---

 dlls/gdi32/font.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index ea2e66c..263454d 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2662,7 +2662,11 @@ DWORD WINAPI GetKerningPairsA( HDC hDC, DWORD cPairs,
         FIXME("Can't find codepage for charset %d\n", charset);
         return 0;
     }
-    if (!GetCPInfo(csi.ciACP, &cpi))
+    /* GetCPInfo() will fail on CP_SYMBOL, and WideCharToMultiByte is supposed
+     * to fail on an invalid character for CP_SYMBOL.
+     */
+    cpi.DefaultChar[0] = 0;
+    if (csi.ciACP != CP_SYMBOL && !GetCPInfo(csi.ciACP, &cpi))
     {
         FIXME("Can't find codepage %u info\n", csi.ciACP);
         return 0;




More information about the wine-cvs mailing list