Peter Oberndorfer : gdi: Do not convert string paramter when rendering glyph indexes.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Apr 12 04:52:01 CDT 2006


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

Author: Peter Oberndorfer <kumbayo84 at arcor.de>
Date:   Tue Apr 11 19:20:52 2006 +0000

gdi: Do not convert string paramter when rendering glyph indexes.

---

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

diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c
index 31825e4..adc7e97 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;
 




More information about the wine-cvs mailing list