Alexandre Julliard : gdi32: Allow GetCharABCWidths on all scalable fonts, not just TrueType ones.

Alexandre Julliard julliard at winehq.org
Thu Sep 27 15:39:08 CDT 2012


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Sep 26 22:42:28 2012 +0200

gdi32: Allow GetCharABCWidths on all scalable fonts, not just TrueType ones.

---

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

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 5fefa2f..85a27f1 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2692,9 +2692,9 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar,
         return FALSE;
     }
 
-    /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-TrueType fonts */
+    /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-scalable fonts */
     dev = GET_DC_PHYSDEV( dc, pGetTextMetrics );
-    if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_TRUETYPE))
+    if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_VECTOR))
     {
         release_dc_ptr( dc );
         return FALSE;




More information about the wine-cvs mailing list