Aric Stewart : user32: Check return code from ScriptStringAnalyse.

Alexandre Julliard julliard at winehq.org
Mon Jan 30 14:05:57 CST 2012


Module: wine
Branch: master
Commit: 4bc418b3568ebc8000976674ac069124147396e0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4bc418b3568ebc8000976674ac069124147396e0

Author: Aric Stewart <aric at codeweavers.com>
Date:   Mon Jan 30 07:30:00 2012 -0600

user32: Check return code from ScriptStringAnalyse.

---

 dlls/user32/edit.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 81cb6cc..ab58145 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -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);




More information about the wine-cvs mailing list