Skip to content

W
wine-cw
Commit bd7e8df6 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

user32: More instances where early versions of usp10 are not well behaved with…

user32: More instances where early versions of usp10 are not well behaved with ScriptString_pSize being NULL. Issue discovered by Qian Hong.
parent 423d50eb
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
dlls/user32/edit.c
View file @ bd7e8df6
......@@ -640,7 +640,9 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
current_line->net_length = prev;
EDIT_InvalidateUniscribeData_linedef(current_line);
EDIT_UpdateUniscribeData_linedef(es, NULL, current_line);
if (current_line->ssa)
sz = ScriptString_pSize(current_line->ssa);
else sz = 0;
if (sz)
current_line->width = sz->cx;
else
......@@ -697,9 +699,14 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
if (current_line->net_length > 0)
{
EDIT_UpdateUniscribeData_linedef(es, NULL, current_line);
if (current_line->ssa)
{
sz = ScriptString_pSize(current_line->ssa);
current_line->width = sz->cx;
}
else
current_line->width = 0;
}
else current_line->width = 0;
}
else if (current_line == start_line &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment