[pkg-wine-party] [SCM] Debian Wine packaging branch, lenny, updated. wine-1.0.0-1-126-gccc5cbd

[Alexandre Julliard]

The following commit has been merged in the lenny branch:
commit 0c0083a2cedfa6ba72fd988dbd40851078844f74
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Wed Jun 18 12:35:58 2008 +0900

    gdi32: Use 0xffff as a default character as Vista does.
    (cherry picked from commit ecd5048ea7e2d40c449ed29a3cd6831ddd433f1d)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 459558d..2d614af 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -5034,11 +5034,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;

-- 
Debian Wine packaging