Commit 820460fc authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard

user32: Handle PosFromChar if the string is empty and so we have no ssa.

parent 31f8a525
...@@ -1069,11 +1069,16 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) ...@@ -1069,11 +1069,16 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap)
EDIT_UpdateUniscribeData(es, NULL, 0); EDIT_UpdateUniscribeData(es, NULL, 0);
if (es->x_offset) if (es->x_offset)
{ {
if (es->x_offset>= get_text_length(es)) if (es->x_offset >= get_text_length(es))
{ {
const SIZE *size; if (es->ssa)
size = ScriptString_pSize(es->ssa); {
xoff = size->cx; const SIZE *size;
size = ScriptString_pSize(es->ssa);
xoff = size->cx;
}
else
xoff = 0;
} }
ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff);
} }
...@@ -1081,9 +1086,14 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) ...@@ -1081,9 +1086,14 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap)
{ {
if (index >= get_text_length(es)) if (index >= get_text_length(es))
{ {
const SIZE *size; if (es->ssa)
size = ScriptString_pSize(es->ssa); {
xi = size->cx; const SIZE *size;
size = ScriptString_pSize(es->ssa);
xi = size->cx;
}
else
xi = 0;
} }
else else
ScriptStringCPtoX(es->ssa, index, FALSE, &xi); ScriptStringCPtoX(es->ssa, index, FALSE, &xi);
......
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