wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against d62035da4aa91327c6e38a2c8a66b829eb0983ed.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2025-10-18 15:15:14 +11:00
parent efcf9f948e
commit 588afb2427
4 changed files with 11 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/user32-DrawTextExW/0001-user32-Fix-handling-of-invert_y-in-DrawTextExW.patch
View File

@@ -1,4 +1,4 @@
From 6e42e27181a16cc0b427e3504ec3ac8b7ab21f65 Mon Sep 17 00:00:00 2001
From 6d5290b821d6fa6d0690b5df96653d8898476da6 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 13 Nov 2014 06:43:43 +0100
Subject: [PATCH] user32: Fix handling of invert_y in DrawTextExW.
@@ -8,10 +8,10 @@ Subject: [PATCH] user32: Fix handling of invert_y in DrawTextExW.
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/dlls/user32/text.c b/dlls/user32/text.c
index dd9d711cd48..647fff30c30 100644
index c86593ffafb..44644261278 100644
--- a/dlls/user32/text.c
+++ b/dlls/user32/text.c
@@ -909,6 +909,15 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
@@ -914,6 +914,15 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS))
return 0;
@@ -27,7 +27,7 @@ index dd9d711cd48..647fff30c30 100644
if (count == -1)
{
count = lstrlenW(str);
@@ -918,7 +927,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
@@ -923,7 +932,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
{
rect->right = rect->left;
if( flags & DT_SINGLELINE)
@@ -36,7 +36,7 @@ index dd9d711cd48..647fff30c30 100644
else
rect->bottom = rect->top;
}
@@ -926,15 +935,6 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
@@ -931,15 +940,6 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
}
}
@@ -52,7 +52,7 @@ index dd9d711cd48..647fff30c30 100644
if (dtp)
{
lmargin = dtp->iLeftMargin;
@@ -982,9 +982,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
@@ -991,9 +991,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
if (flags & DT_SINGLELINE)
{
@@ -66,7 +66,7 @@ index dd9d711cd48..647fff30c30 100644
}
if (!(flags & DT_CALCRECT))
@@ -1042,10 +1043,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
@@ -1051,10 +1052,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
else if (size.cx > max_width)
max_width = size.cx;
@@ -75,9 +75,9 @@ index dd9d711cd48..647fff30c30 100644
- else
- y += lh;
+ y += invert_y ? -lh : lh;
if (dtp)
dtp->uiLengthDrawn += len;
}
while (strPtr && !last_line);
--
2.28.0
2.51.0