[PATCH v2 0/2] MR669: gdi32/tests: Add more tests for GetTextMetrics().

[Zhiyi Zhang (＠zhiyi)]

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>

--
  v2: win32u: Choose a smaller ppem to avoid exceeding the requested font height.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/669

[PATCH v2 1/2] gdi32/tests: Add more tests for GetTextMetrics().

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/gdi32/tests/font.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 76d787c1440..b7624942ead 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -4102,7 +4102,10 @@ static INT CALLBACK enum_truetype_font_proc(const LOGFONTA *lf, const TEXTMETRIC
 
 static void test_GetTextMetrics(void)
 {
+    HFONT old_hf, hf;
+    TEXTMETRICA tm;
     LOGFONTA lf;
+    BOOL ret;
     HDC hdc;
     INT enumed;
 
@@ -4113,6 +4116,19 @@ static void test_GetTextMetrics(void)
     enumed = 0;
     EnumFontFamiliesExA(hdc, &lf, enum_truetype_font_proc, (LPARAM)&enumed, 0);
 
+    /* Test a bug triggered by rounding up FreeType ppem */
+    hf = CreateFontA(20, 0, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, DEFAULT_CHARSET,
+                     OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH,
+                     "Tahoma");
+    ok(hf != NULL, "CreateFontA failed, error %lu\n", GetLastError());
+    old_hf = SelectObject(hdc, hf);
+    ret = GetTextMetricsA(hdc, &tm);
+    ok(ret, "GetTextMetricsA failed, error %lu\n", GetLastError());
+    todo_wine
+    ok(tm.tmHeight <= 20, "Got unexpected tmHeight %ld\n", tm.tmHeight);
+    SelectObject(hdc, old_hf);
+    DeleteObject(hf);
+
     ReleaseDC(0, hdc);
 }
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/669

[PATCH v2 2/2] win32u: Choose a smaller ppem to avoid exceeding the requested font height.

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

When height > 0, CreateFontA/W() should not return a font face exceeding the requested height.
For instance, Tahoma has 2049 units of ascent, 423 units of descent and its units per EM square is
2048. When requesting a font 20 pixels in height, ppem = units_per_EM * requested_height / (ascent + descent)
= 2048 * 20 / (2049 + 423) = 16.57 ~= 17. When getting the resulting height back from the ppem,
resulting_height = (ascent + descent) * ppem / units_per_EM = (2049.0 + 423) * 17 / 2048 = 20.52
~=21. So it ends up getting a larger font than requested and violates the spec.

Fix Nancy Drew: Legend of the Crystal Skull crash at start.

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/gdi32/tests/font.c |  1 -
 dlls/win32u/freetype.c  | 12 ++++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index b7624942ead..12a5bff5969 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -4124,7 +4124,6 @@ static void test_GetTextMetrics(void)
     old_hf = SelectObject(hdc, hf);
     ret = GetTextMetricsA(hdc, &tm);
     ok(ret, "GetTextMetricsA failed, error %lu\n", GetLastError());
-    todo_wine
     ok(tm.tmHeight <= 20, "Got unexpected tmHeight %ld\n", tm.tmHeight);
     SelectObject(hdc, old_hf);
     DeleteObject(hf);
diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c
index f00df7ed86d..5b9693fb7da 100644
--- a/dlls/win32u/freetype.c
+++ b/dlls/win32u/freetype.c
@@ -1927,10 +1927,18 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height)
 
     if(height > 0) {
         USHORT windescent = get_fixed_windescent(pOS2->usWinDescent);
+        LONG units;
+
         if(pOS2->usWinAscent + windescent == 0)
-            ppem = pFT_MulDiv(ft_face->units_per_EM, height, pHori->Ascender - pHori->Descender);
+            units = pHori->Ascender - pHori->Descender;
         else
-            ppem = pFT_MulDiv(ft_face->units_per_EM, height, pOS2->usWinAscent + windescent);
+            units = pOS2->usWinAscent + windescent;
+        ppem = pFT_MulDiv(ft_face->units_per_EM, height, units);
+
+        /* If rounding ends up getting a font exceeding height, choose a smaller ppem */
+        if(ppem > 1 && pFT_MulDiv(units, ppem, ft_face->units_per_EM) > height)
+            --ppem;
+
         if(ppem > MAX_PPEM) {
             WARN("Ignoring too large height %d, ppem %d\n", height, ppem);
             ppem = 1;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/669

[Byeongsik Jeon (＠bsjeon)]

Hi.

It appears that the VDMX table is not used. It seems that there is a problem with bCharSet processing in load_VDMX(), but I did not investigate it in detail.

MS Tahoma and Wine Tahoma contain the VDMX table.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/669#note_6540

[Byeongsik Jeon (＠bsjeon)]

On Fri Aug 19 14:55:04 2022 +0000, Byeongsik Jeon wrote:
> Hi.
> It appears that the VDMX table is not used. It seems that there is a
> problem with bCharSet processing in load_VDMX(), but I did not
> investigate it in detail.
> MS Tahoma and Wine Tahoma contain the VDMX table.
> Please ignore my comments. I'm sorry for making noise.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/669#note_6546