ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Pass the modifiable string buffer directly to TEXT_NextLineW(). 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2018-05-09 09:23:26 +01:00 committed by Alexandre Julliard
parent b6da3547d8
commit c267bbb300
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/user32/text.c
View File

@ -606,7 +606,7 @@ static BOOL remainder_is_none_or_newline (int num_chars, const WCHAR *str)
*/ */
static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
WCHAR *dest, int *len, int width, DWORD format, WCHAR *dest, int *len, int width, DWORD format,
SIZE *retsize, int last_line, WCHAR **p_retstr, SIZE *retsize, int last_line, WCHAR *modstr,
int tabwidth, int *pprefix_offset, int tabwidth, int *pprefix_offset,
ellipsis_data *pellip) ellipsis_data *pellip)
{ {
@ -722,7 +722,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
if (!line_fits && (format & DT_PATH_ELLIPSIS)) if (!line_fits && (format & DT_PATH_ELLIPSIS))
{ {
TEXT_PathEllipsify (hdc, dest + seg_j, maxl-seg_j, &j_in_seg, TEXT_PathEllipsify (hdc, dest + seg_j, maxl-seg_j, &j_in_seg,
max_seg_width, &size, *p_retstr, pellip); max_seg_width, &size, modstr, pellip);
line_fits = (size.cx <= max_seg_width); line_fits = (size.cx <= max_seg_width);
ellipsified = TRUE; ellipsified = TRUE;
} }
@ -735,7 +735,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
{ {
int before, len_ellipsis; int before, len_ellipsis;
TEXT_Ellipsify (hdc, dest + seg_j, maxl-seg_j, &j_in_seg, TEXT_Ellipsify (hdc, dest + seg_j, maxl-seg_j, &j_in_seg,
max_seg_width, &size, *p_retstr, &before, &len_ellipsis); max_seg_width, &size, modstr, &before, &len_ellipsis);
if (before > pellip->before) if (before > pellip->before)
{ {
/* We must have done a path ellipsis too */ /* We must have done a path ellipsis too */
@ -872,7 +872,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
{ {
SIZE size; SIZE size;
const WCHAR *strPtr; const WCHAR *strPtr;
WCHAR *retstr, *p_retstr; WCHAR *retstr;
size_t size_retstr; size_t size_retstr;
WCHAR line[MAX_BUFFER]; WCHAR line[MAX_BUFFER];
int len, lh, count=i_count; int len, lh, count=i_count;
@ -968,7 +968,6 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
size_retstr = 0; size_retstr = 0;
retstr = NULL; retstr = NULL;
} }
p_retstr = retstr;
do do
{ {
@ -977,7 +976,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) < rect->bottom; last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) < rect->bottom;
else else
last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom;
strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, retstr, tabwidth, &prefix_offset, &ellip);
if (flags & DT_CENTER) x = (rect->left + rect->right - if (flags & DT_CENTER) x = (rect->left + rect->right -
size.cx) / 2; size.cx) / 2;