system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 19:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

user32: Have a fallback in linebreaking if uniscribe fails to analyse a string.

Browse source
This commit is contained in:
Aric Stewart 2012-01-30 07:30:12 -06:00 committed by Alexandre Julliard
parent 4bc418b356
commit 1967fae847
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dlls/user32/edit.c
View file

@ -598,9 +598,13 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
const SIZE *sz;
EDIT_InvalidateUniscribeData_linedef(current_line);
EDIT_UpdateUniscribeData_linedef(es, NULL, current_line);
sz = ScriptString_pSize(current_line->ssa);
/* Calculate line width */
current_line->width = sz->cx;
if (current_line->ssa)
{
sz = ScriptString_pSize(current_line->ssa);
/* Calculate line width */
current_line->width = sz->cx;
}
else current_line->width = es->char_width * current_line->net_length;
}
else current_line->width = 0;
@ -644,18 +648,23 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
EDIT_InvalidateUniscribeData_linedef(current_line);
EDIT_UpdateUniscribeData_linedef(es, NULL, current_line);
count = ScriptString_pcOutChars(current_line->ssa);
piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count));
ScriptStringGetLogicalWidths(current_line->ssa,piDx);
if (current_line->ssa)
{
count = ScriptString_pcOutChars(current_line->ssa);
piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count));
ScriptStringGetLogicalWidths(current_line->ssa,piDx);
prev = current_line->net_length-1;
do {
current_line->width -= piDx[prev];
prev--;
} while ( prev > 0 && current_line->width > fw);
if (prev<=0)
prev = 1;
HeapFree(GetProcessHeap(),0,piDx);
prev = current_line->net_length-1;
do {
current_line->width -= piDx[prev];
prev--;
} while ( prev > 0 && current_line->width > fw);
if (prev<=0)
prev = 1;
HeapFree(GetProcessHeap(),0,piDx);
}
else
prev = (fw / es->char_width);
}
/* If the first line we are calculating, wrapped before istart, we must