system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 07:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

user32: Check return code from ScriptStringAnalyse.

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

11
dlls/user32/edit.c
View file

@ -403,6 +403,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD
HFONT old_font = NULL;
HDC udc = dc;
SCRIPT_TABDEF tabdef;
HRESULT hr;
if (!udc)
udc = GetDC(es->hwndSelf);
@ -414,7 +415,15 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD
tabdef.pTabStops = es->tabs;
tabdef.iTabOrigin = 0;
ScriptStringAnalyse(udc, &es->text[index], line_def->net_length, (1.5*line_def->net_length+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa);
hr = ScriptStringAnalyse(udc, &es->text[index], line_def->net_length,
(1.5*line_def->net_length+16), -1,
SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1,
NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa);
if (FAILED(hr))
{
WARN("ScriptStringAnalyse failed (%x)\n",hr);
line_def->ssa = NULL;
}
if (es->font)
SelectObject(udc, old_font);