ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Use temporary buffers for GetGlyphs(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-05-26 11:16:10 +03:00 committed by Alexandre Julliard
parent 5625a8e52d
commit 76b1f3fd72
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/dwrite/analyzer.c
View File

@ -1173,10 +1173,11 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface,
context.length = length; context.length = length;
context.is_rtl = is_rtl; context.is_rtl = is_rtl;
context.is_sideways = is_sideways; context.is_sideways = is_sideways;
context.u.subst.glyphs = glyphs; context.u.subst.glyphs = heap_calloc(max_glyph_count, sizeof(*glyphs));
context.u.subst.glyph_props = glyph_props; context.u.subst.glyph_props = heap_calloc(max_glyph_count, sizeof(*glyph_props));
context.u.subst.clustermap = clustermap; context.u.subst.clustermap = clustermap;
context.u.subst.max_glyph_count = max_glyph_count; context.u.subst.max_glyph_count = max_glyph_count;
context.u.subst.capacity = max_glyph_count;
context.u.subst.digits = digits; context.u.subst.digits = digits;
context.language_tag = get_opentype_language(locale); context.language_tag = get_opentype_language(locale);
context.user_features.features = features; context.user_features.features = features;
@ -1190,10 +1191,14 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface,
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
*actual_glyph_count = context.glyph_count; *actual_glyph_count = context.glyph_count;
memcpy(glyphs, context.u.subst.glyphs, context.glyph_count * sizeof(*glyphs));
memcpy(glyph_props, context.u.subst.glyph_props, context.glyph_count * sizeof(*glyph_props));
hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyphs, *actual_glyph_count, hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyphs, *actual_glyph_count,
text_props, glyph_props); text_props, glyph_props);
} }
heap_free(context.u.subst.glyph_props);
heap_free(context.u.subst.glyphs);
heap_free(context.glyph_infos); heap_free(context.glyph_infos);
return hr; return hr;

1
dlls/dwrite/dwrite_private.h
View File

@ -491,6 +491,7 @@ struct scriptshaping_context
DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props;
UINT16 *clustermap; UINT16 *clustermap;
unsigned int max_glyph_count; unsigned int max_glyph_count;
unsigned int capacity;
const WCHAR *digits; const WCHAR *digits;
} subst; } subst;
} u; } u;

2
dlls/dwrite/shape.c
View File

@ -400,5 +400,5 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i
heap_free(features.features); heap_free(features.features);
return S_OK; return (context->glyph_count <= context->u.subst.max_glyph_count) ? S_OK : E_NOT_SUFFICIENT_BUFFER;
} }