Nikolay Sivov : dwrite: Simplify multiple substitution handler.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 78ea46f6a908656e4958aabfd5951f4332722c8a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=78ea46f6a908656e4958aabfd...

Author: Nikolay Sivov 
Date:   Wed Jun 17 14:47:52 2020 +0300

dwrite: Simplify multiple substitution handler.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/dwrite/opentype.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index c0a29d08df..e729be9b20 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -4862,37 +4862,34 @@ static BOOL opentype_layout_gsub_ensure_buffer(struct scriptshaping_context *con
 static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_context *context, const struct lookup *lookup,
         unsigned int subtable_offset)
 {
-    const struct dwrite_fonttable *gsub = &context->table->table;
-    UINT16 format, coverage, glyph, seq_count, glyph_count;
-    const struct ot_gsub_multsubst_format1 *format1;
+    const struct dwrite_fonttable *table = &context->table->table;
+    UINT16 format, coverage, glyph, glyph_count;
     unsigned int i, idx, coverage_index;
     const UINT16 *glyphs;

idx = context->cur;
     glyph = context->u.subst.glyphs[idx];

-    format = table_read_be_word(gsub, subtable_offset);
+    format = table_read_be_word(table, subtable_offset);

-    coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, coverage));
+    coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, coverage));

if (format == 1)
     {
-        coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph);
-        if (coverage_index == GLYPH_NOT_COVERED)
-            return FALSE;
-
-        seq_count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq_count));
+        UINT16 seq_offset;

-        format1 = table_read_ensure(gsub, subtable_offset, FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq[seq_count]));
+        coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph);
+        if (coverage_index == GLYPH_NOT_COVERED) return FALSE;

-        if (!seq_count || seq_count <= coverage_index || !format1)
+        if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq_count),
+                coverage_index, &seq_offset))
+        {
             return FALSE;
+        }

-        glyph_count = table_read_be_word(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index]));
+        glyph_count = table_read_be_word(table, subtable_offset + seq_offset);

-        glyphs = table_read_ensure(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index]) + 2,
-                glyph_count * sizeof(*glyphs));
-        if (!glyphs)
+        if (!(glyphs = table_read_ensure(table, subtable_offset + seq_offset + 2, glyph_count * sizeof(*glyphs))))
             return FALSE;

if (glyph_count == 1)