Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USER32] Sync DrawTextExW() with Wine Staging 1.7.37. CORE-9246 CORE-9585

Browse source 
svn path=/trunk/; revision=67388
This commit is contained in:
Amine Khaldi 2015-04-25 09:50:09 +00:00
parent 4d11a69ba2
commit 56556c95f2
1 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

53
reactos/win32ss/user/user32/windows/font.c
View file

@ -1096,7 +1096,7 @@ static void TEXT_DrawUnderscore (HDC hdc, int x, int y, const WCHAR *str, int of
/* /*
* @implemented * @implemented
* *
* Synced with wine 1.1.32 * Synced with Wine Staging 1.7.37
*/ */
INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp )
@ -1116,12 +1116,12 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
int tabwidth /* to keep gcc happy */ = 0; int tabwidth /* to keep gcc happy */ = 0;
int prefix_offset; int prefix_offset;
ellipsis_data ellip; ellipsis_data ellip;
int invert_y=0; BOOL invert_y=FALSE;
TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count,
wine_dbgstr_rect(rect), flags); wine_dbgstr_rect(rect), flags);
if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n",
dtp->iTabLength, dtp->iLeftMargin, dtp->iRightMargin); dtp->iTabLength, dtp->iLeftMargin, dtp->iRightMargin);
if (!str) return 0; if (!str) return 0;
@ -1143,6 +1143,15 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS)) if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS))
return 0; return 0;
if (GetGraphicsMode(hdc) == GM_COMPATIBLE)
{
SIZE window_ext, viewport_ext;
GetWindowExtEx(hdc, &window_ext);
GetViewportExtEx(hdc, &viewport_ext);
if ((window_ext.cy > 0) != (viewport_ext.cy > 0))
invert_y = TRUE;
}
if (count == -1) if (count == -1)
{ {
count = strlenW(str); count = strlenW(str);
@ -1152,7 +1161,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
{ {
rect->right = rect->left; rect->right = rect->left;
if( flags & DT_SINGLELINE) if( flags & DT_SINGLELINE)
rect->bottom = rect->top + lh; rect->bottom = rect->top + (invert_y ? -lh : lh);
else else
rect->bottom = rect->top; rect->bottom = rect->top;
} }
@ -1160,15 +1169,6 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
} }
} }
if (GetGraphicsMode(hdc) == GM_COMPATIBLE)
{
SIZE window_ext, viewport_ext;
GetWindowExtEx(hdc, &window_ext);
GetViewportExtEx(hdc, &viewport_ext);
if ((window_ext.cy > 0) != (viewport_ext.cy > 0))
invert_y = 1;
}
if (dtp) if (dtp)
{ {
lmargin = dtp->iLeftMargin; lmargin = dtp->iLeftMargin;
@ -1215,9 +1215,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
if (flags & DT_SINGLELINE) if (flags & DT_SINGLELINE)
{ {
if (flags & DT_VCENTER) y = rect->top + if (flags & DT_VCENTER)
(rect->bottom - rect->top) / 2 - size.cy / 2; y = rect->top + (rect->bottom - rect->top) / 2 + (invert_y ? (size.cy / 2) : (-size.cy / 2));
else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; else if (flags & DT_BOTTOM)
y = rect->bottom + (invert_y ? 0 : -size.cy);
} }
if (!(flags & DT_CALCRECT)) if (!(flags & DT_CALCRECT))
@ -1234,7 +1235,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
p = str; while (p < str+len && *p != TAB) p++; p = str; while (p < str+len && *p != TAB) p++;
len_seg = p - str; len_seg = p - str;
if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size)) if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size))
{
HeapFree (GetProcessHeap(), 0, retstr);
return 0; return 0;
}
} }
else else
len_seg = len; len_seg = len;
@ -1242,7 +1246,11 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
if (!ExtTextOutW( hdc, xseg, y, if (!ExtTextOutW( hdc, xseg, y,
((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) |
((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0),
rect, str, len_seg, NULL )) return 0; rect, str, len_seg, NULL ))
{
HeapFree (GetProcessHeap(), 0, retstr);
return 0;
}
if (prefix_offset != -1 && prefix_offset < len_seg) if (prefix_offset != -1 && prefix_offset < len_seg)
{ {
TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect); TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect);
@ -1271,14 +1279,11 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
} }
} }
} }
} }
else if (size.cx > max_width) else if (size.cx > max_width)
max_width = size.cx; max_width = size.cx;
if (invert_y) y += invert_y ? -lh : lh;
y -= lh;
else
y += lh;
if (dtp) if (dtp)
dtp->uiLengthDrawn += len; dtp->uiLengthDrawn += len;
} }