File 0001-Fix-Font-display-problem-text-and-dc-rotat... of Package wine

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-Font-display-problem-text-and-dc-rotation-using-.patch of Package wine (Revision 207cf3e589f26e19710000a07c6d7fa7)

Currently displaying revision 207cf3e589f26e19710000a07c6d7fa7 , Show latest

From 334004c8c0ea73e394ca4928f308103f2729088b Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 17 Nov 2023 19:55:13 +0100
Subject: [PATCH] Fix 'Font display problem text and dc rotation using
 GM_ADVANCED graphics mode'

From Dmitry Timoshkov

https://bugs.winehq.org/show_bug.cgi?id=33190
---
 dlls/win32u/font.c | 83 +++++-----------------------------------------
 1 file changed, 9 insertions(+), 74 deletions(-)

diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c
index edeba90b981..14bb3ccc0f7 100644
--- a/dlls/win32u/font.c
+++ b/dlls/win32u/font.c
@@ -4391,51 +4391,6 @@ static INT font_GetTextFace( PHYSDEV dev, INT count, WCHAR *str )
 }
 
 
-static void scale_font_metrics( struct gdi_font *font, TEXTMETRICW *tm )
-{
-    double scale_x, scale_y;
-
-    /* Make sure that the font has sane width/height ratio */
-    if (font->aveWidth && (font->aveWidth + tm->tmHeight - 1) / tm->tmHeight > 100)
-    {
-        WARN( "Ignoring too large font->aveWidth %d\n", font->aveWidth );
-        font->aveWidth = 0;
-    }
-
-    if (font->aveWidth)
-    {
-        scale_x = (double)font->aveWidth;
-        scale_x /= (double)font->otm.otmTextMetrics.tmAveCharWidth;
-    }
-    else
-        scale_x = font->scale_y;
-
-    scale_x *= fabs(font->matrix.eM11);
-    scale_y = font->scale_y * fabs(font->matrix.eM22);
-
-#define SCALE_X(x) (x) = GDI_ROUND((x) * scale_x)
-#define SCALE_Y(y) (y) = GDI_ROUND((y) * scale_y)
-
-    SCALE_Y(tm->tmHeight);
-    SCALE_Y(tm->tmAscent);
-    SCALE_Y(tm->tmDescent);
-    SCALE_Y(tm->tmInternalLeading);
-    SCALE_Y(tm->tmExternalLeading);
-
-    SCALE_X(tm->tmOverhang);
-    if (font->fake_bold)
-    {
-        if (!font->scalable) tm->tmOverhang++;
-        tm->tmAveCharWidth++;
-        tm->tmMaxCharWidth++;
-    }
-    SCALE_X(tm->tmAveCharWidth);
-    SCALE_X(tm->tmMaxCharWidth);
-
-#undef SCALE_X
-#undef SCALE_Y
-}
-
 /*************************************************************
  * font_GetTextMetrics
  */
@@ -4455,7 +4410,6 @@ static BOOL font_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics )
         font_funcs->set_bitmap_text_metrics( physdev->font ))
     {
         *metrics = physdev->font->otm.otmTextMetrics;
-        scale_font_metrics( physdev->font, metrics );
         ret = TRUE;
     }
     pthread_mutex_unlock( &font_lock );
@@ -5345,16 +5299,14 @@ BOOL WINAPI NtGdiGetTextExtentExW( HDC hdc, const WCHAR *str, INT count, INT max
         {
             for (i = 0; i < count; i++)
             {
-                unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) +
-                    (i + 1) * dc->attr->char_extra;
+                unsigned int dx = pos[i] + (i + 1) * dc->attr->char_extra;
                 if (nfit && dx > (unsigned int)max_ext) break;
 		if (dxs) dxs[i] = dx;
             }
             if (nfit) *nfit = i;
         }
 
-        size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->attr->char_extra;
-        size->cy = abs( INTERNAL_YDSTOWS( dc, size->cy ));
+        size->cx += count * dc->attr->char_extra;
     }
 
     if (pos != buffer && pos != dxs) free( pos );
@@ -5385,14 +5337,6 @@ BOOL WINAPI NtGdiGetTextMetricsW( HDC hdc, TEXTMETRICW *metrics, ULONG flags )
 
         metrics->tmDigitizedAspectX = NtGdiGetDeviceCaps(hdc, LOGPIXELSX);
         metrics->tmDigitizedAspectY = NtGdiGetDeviceCaps(hdc, LOGPIXELSY);
-        metrics->tmHeight           = height_to_LP( dc, metrics->tmHeight );
-        metrics->tmAscent           = height_to_LP( dc, metrics->tmAscent );
-        metrics->tmDescent          = height_to_LP( dc, metrics->tmDescent );
-        metrics->tmInternalLeading  = height_to_LP( dc, metrics->tmInternalLeading );
-        metrics->tmExternalLeading  = height_to_LP( dc, metrics->tmExternalLeading );
-        metrics->tmAveCharWidth     = width_to_LP( dc, metrics->tmAveCharWidth );
-        metrics->tmMaxCharWidth     = width_to_LP( dc, metrics->tmMaxCharWidth );
-        metrics->tmOverhang         = width_to_LP( dc, metrics->tmOverhang );
         ret = TRUE;
 
         TRACE("text metrics:\n"
@@ -5534,14 +5478,7 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars,
 
     if (ret)
     {
-        if (flags & NTGDI_GETCHARWIDTH_INT)
-        {
-            INT *buffer = buf;
-            /* convert device units to logical */
-            for (i = 0; i < count; i++)
-                buffer[i] = width_to_LP( dc, buffer[i] );
-        }
-        else
+        if (!(flags & NTGDI_GETCHARWIDTH_INT))
         {
             float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f;
             for (i = 0; i < count; i++)
@@ -5967,12 +5904,6 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr
         goto done;
     }
 
-    pt.x = x;
-    pt.y = y;
-    lp_to_dp(dc, &pt, 1);
-    x = pt.x;
-    y = pt.y;
-
     char_extra = dc->attr->char_extra;
     if (char_extra && lpDx && NtGdiGetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER)
         char_extra = 0; /* Printer drivers don't add char_extra if lpDx is supplied */
@@ -6069,8 +6000,6 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr
         width = desired[1];
     }
 
-    tm.tmAscent = abs(INTERNAL_YWSTODS(dc, tm.tmAscent));
-    tm.tmDescent = abs(INTERNAL_YWSTODS(dc, tm.tmDescent));
     switch( align & (TA_LEFT | TA_RIGHT | TA_CENTER) )
     {
     case TA_LEFT:
@@ -6138,6 +6067,12 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr
         }
     }
 
+    pt.x = x;
+    pt.y = y;
+    lp_to_dp(dc, &pt, 1);
+    x = pt.x;
+    y = pt.y;
+
     ret = physdev->funcs->pExtTextOut( physdev, x, y, (flags & ~ETO_OPAQUE), &rc,
                                        str, count, (INT*)deltas );
 
-- 
2.35.3

Places

File 0001-Fix-Font-display-problem-text-and-dc-rotation-using-.patch of Package wine (Revision 207cf3e589f26e19710000a07c6d7fa7)

Places