Resend: gdi32: Use 0xffff as a default character as Vista does
Dmitry Timoshkov
dmitry at codeweavers.com
Tue Jun 17 22:35:58 CDT 2008
Hello,
this patch fixes the problem reported in the bug 12305. In Wine Tahoma
character ':' is mapped to glyph index 0x1f, and that seems to be confusing
Firefox.
Changelog:
gdi32: Use 0xffff as a default character as Vista does.
---
dlls/gdi32/freetype.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 9b5f18c..8bcb487 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4934,11 +4934,16 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize,
* symbol range to 0 - f0ff
*/
if (font->charset == SYMBOL_CHARSET)
+ {
TM.tmFirstChar = 0;
+ TM.tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0x1f;
+ }
else
+ {
TM.tmFirstChar = pOS2->usFirstCharIndex;
+ TM.tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0xffff;
+ }
TM.tmLastChar = pOS2->usLastCharIndex;
- TM.tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0x1f;
TM.tmBreakChar = pOS2->usBreakChar ? pOS2->usBreakChar : ' ';
TM.tmItalic = font->fake_italic ? 255 : ((ft_face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0);
TM.tmUnderlined = font->underline;
--
1.5.5.2
More information about the wine-patches
mailing list