gdi: do not convert string paramter when rendering glyph indexes

Peter Oberndorfer kumbayo84 at arcor.de
Tue Apr 11 14:20:52 CDT 2006


Glyph indexes were interpreted as a string when using the ETO_GLYPH_INDEX flag

Changelog:
gdi: do not convert string paramter when rendering glyph indexes
---

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

16464027de77a614f9fd81a222bca8466456fb85
diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c
index 40f85cf..812cec0 100644
--- a/dlls/gdi/font.c
+++ b/dlls/gdi/font.c
@@ -1676,10 +1676,15 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x,
 {
     INT wlen;
     UINT codepage;
-    LPWSTR p = FONT_mbtowc(hdc, str, count, &wlen, &codepage);
+    LPWSTR p;
     BOOL ret;
     LPINT lpDxW = NULL;
 
+    if (flags & ETO_GLYPH_INDEX)
+        return ExtTextOutW( hdc, x, y, flags, lprect, (LPCWSTR)str, count, lpDx );
+
+    p = FONT_mbtowc(hdc, str, count, &wlen, &codepage);
+
     if (lpDx) {
         unsigned int i = 0, j = 0;
 
-- 
1.2.6




More information about the wine-patches mailing list