Skip to content

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

user32: Early versions of usp10 are not well behaved with ScriptString_pSize…

user32: Early versions of usp10 are not well behaved with ScriptString_pSize when SCRIPT_STRING_ANALYSIS is NULL.
parent 7ee1250e
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
dlls/user32/edit.c
View file @ 64adeb02
......@@ -783,12 +783,13 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
*/
static void EDIT_CalcLineWidth_SL(EDITSTATE *es)
{
const SIZE *size;
EDIT_UpdateUniscribeData(es, NULL, 0);
size = ScriptString_pSize(es->ssa);
if (size)
if (es->ssa)
{
const SIZE *size;
size = ScriptString_pSize(es->ssa);
es->text_width = size->cx;
}
else
es->text_width = 0;
}
......@@ -884,8 +885,9 @@ static INT EDIT_CharFromPos(EDITSTATE *es, INT x, INT y, LPBOOL after_wrap)
{
if (x)
{
const SIZE *size;
size = ScriptString_pSize(es->ssa);
const SIZE *size = NULL;
if (es->ssa)
size = ScriptString_pSize(es->ssa);
if (!size)
index = 0;
else if (x > size->cx)
......
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