Alexandre Julliard : user32: Use height from font metrics for empty text runs in TabbedTextOut().
Alexandre Julliard
julliard at winehq.org
Sun Mar 3 13:21:28 CST 2019
Module: wine
Branch: oldstable
Commit: 2ef6e07c4b1303a9f0f27880505a7998caa2a3c6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef6e07c4b1303a9f0f27880505a7998caa2a3c6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Oct 8 13:20:36 2018 +0200
user32: Use height from font metrics for empty text runs in TabbedTextOut().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39051
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 5d282ec64d1ad815586adcd57ff494b524ed1064)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/user32/text.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/text.c b/dlls/user32/text.c
index 2ac3afd..66cec61 100644
--- a/dlls/user32/text.c
+++ b/dlls/user32/text.c
@@ -1387,7 +1387,9 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr,
}
} else
x += extent.cx;
-
+
+ if (!extent.cy) extent.cy = tm.tmHeight;
+
if (fDisplayText)
{
r.top = y;
@@ -1400,9 +1402,6 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr,
lpstr += j;
}
- if(!extent.cy)
- extent.cy = tm.tmHeight;
-
return MAKELONG(x - start, extent.cy);
}
More information about the wine-cvs
mailing list