wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Nikolay Sivov : mf/topology: Remove logic already present in stream resize helper.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: af4d5c96d47169cf4c6782d12004eff945918ac3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af4d5c96d47169cf4c6782d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 17:15:10 2020 +0300 mf/topology: Remove logic already present in stream resize helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 91635fd6b8..432979206b 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1612,15 +1612,7 @@ static HRESULT WINAPI topology_node_SetInputPrefType(IMFTopologyNode *iface, DWO break; default: if (SUCCEEDED(hr = topology_node_reserve_streams(&node->inputs, index))) - { - if (index >= node->inputs.count) - { - memset(&node->inputs.streams[node->inputs.count], 0, - (index - node->inputs.count + 1) * sizeof(*node->inputs.streams)); - node->inputs.count = index + 1; - } topology_node_set_stream_type(&node->inputs.streams[index], mediatype); - } } LeaveCriticalSection(&node->cs);

1 0

Nikolay Sivov : mf/topology: Setting tee node input type does not create input stream.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: e196619f699b2e67d759dbf1f220892c31800639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e196619f699b2e67d759dbf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 17:15:09 2020 +0300 mf/topology: Setting tee node input type does not create input stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 91 +++++++++++++++++++++++++++++++++++++++++- dlls/mf/topology.c | 114 +++++++++++++++++++++++++++++++++-------------------- 2 files changed, 162 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e196619f699b2e67d759…

1 0

Paul Gofman : ntoskrnl.exe: Support 'xor Ev, Gv' opcode for x86_64.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 42ce4910a44fccba01f54783be803a0eddce7e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ce4910a44fccba01f54783… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 22 15:37:51 2020 +0300 ntoskrnl.exe: Support 'xor Ev, Gv' opcode for x86_64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 848a566d02..68140c09ef 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -39,6 +39,7 @@ enum instr_op { INSTR_OP_MOV, INSTR_OP_OR, + INSTR_OP_XOR, }; #ifdef __i386__ @@ -526,6 +527,10 @@ static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, i for (i = 0; i < op_size; ++i) reg[i] |= addr[i]; break; + case INSTR_OP_XOR: + for (i = 0; i < op_size; ++i) + reg[i] ^= addr[i]; + break; } } @@ -544,6 +549,9 @@ static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr, i case INSTR_OP_OR: *reg |= *addr; break; + case INSTR_OP_XOR: + *reg ^= *addr; + break; } } @@ -838,6 +846,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x8a: /* mov Eb, Gb */ case 0x8b: /* mov Ev, Gv */ case 0x0b: /* or Ev, Gv */ + case 0x33: /* xor Ev, Gv */ { BYTE *data = INSTR_GetOperandAddr( context, instr + 1, prefixlen + 1, long_addr, rex, segprefix, &len ); @@ -861,6 +870,10 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) store_reg_word( context, instr[1], wine_user_shared_data + offset, long_op, rex, INSTR_OP_OR ); break; + case 0x33: + store_reg_word( context, instr[1], wine_user_shared_data + offset, + long_op, rex, INSTR_OP_XOR ); + break; } context->Rip += prefixlen + len + 1; return ExceptionContinueExecution;

1 0

Paul Gofman : ntoskrnl.exe: Support 'or Ev, Gv' opcode for x86_64.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: e7778dd9f925b498994c26aec23a483dd2588583 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7778dd9f925b498994c26ae… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 22 15:37:50 2020 +0300 ntoskrnl.exe: Support 'or Ev, Gv' opcode for x86_64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 53 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index dad4e5d660..848a566d02 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -35,6 +35,12 @@ #define KSHARED_USER_DATA_PAGE_SIZE 0x1000 +enum instr_op +{ + INSTR_OP_MOV, + INSTR_OP_OR, +}; + #ifdef __i386__ WINE_DEFAULT_DEBUG_CHANNEL(int); @@ -503,20 +509,42 @@ static inline int get_op_size( int long_op, int rex ) } /* store an operand into a register */ -static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op, int rex ) +static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op, int rex, + enum instr_op op ) { int index = REGMODRM_REG( regmodrm, rex ); BYTE *reg = (BYTE *)get_int_reg( context, index ); - memcpy( reg, addr, get_op_size( long_op, rex ) ); + int op_size = get_op_size( long_op, rex ); + int i; + + switch (op) + { + case INSTR_OP_MOV: + memcpy( reg, addr, op_size ); + break; + case INSTR_OP_OR: + for (i = 0; i < op_size; ++i) + reg[i] |= addr[i]; + break; + } } /* store an operand into a byte register */ -static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int rex ) +static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int rex, enum instr_op op ) { int index = REGMODRM_REG( regmodrm, rex ); BYTE *reg = (BYTE *)get_int_reg( context, index ); if (!rex && index >= 4 && index < 8) reg -= (4 * sizeof(DWORD64) - 1); /* special case: ah, ch, dh, bh */ - *reg = *addr; + + switch (op) + { + case INSTR_OP_MOV: + *reg = *addr; + break; + case INSTR_OP_OR: + *reg |= *addr; + break; + } } /*********************************************************************** @@ -798,7 +826,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); memcpy( &temp, wine_user_shared_data + offset, data_size ); - store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex ); + store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex, INSTR_OP_MOV ); context->Rip += prefixlen + len + 2; return ExceptionContinueExecution; } @@ -809,6 +837,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x8a: /* mov Eb, Gb */ case 0x8b: /* mov Ev, Gv */ + case 0x0b: /* or Ev, Gv */ { BYTE *data = INSTR_GetOperandAddr( context, instr + 1, prefixlen + 1, long_addr, rex, segprefix, &len ); @@ -820,8 +849,18 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); switch (*instr) { - case 0x8a: store_reg_byte( context, instr[1], wine_user_shared_data + offset, rex ); break; - case 0x8b: store_reg_word( context, instr[1], wine_user_shared_data + offset, long_op, rex ); break; + case 0x8a: + store_reg_byte( context, instr[1], wine_user_shared_data + offset, + rex, INSTR_OP_MOV ); + break; + case 0x8b: + store_reg_word( context, instr[1], wine_user_shared_data + offset, + long_op, rex, INSTR_OP_MOV ); + break; + case 0x0b: + store_reg_word( context, instr[1], wine_user_shared_data + offset, + long_op, rex, INSTR_OP_OR ); + break; } context->Rip += prefixlen + len + 1; return ExceptionContinueExecution;

1 0

Nikolay Sivov : dwrite: Use mirrored character only if font supports it.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: da55f010dfe1b8e51582f11259637f9cf0c45499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da55f010dfe1b8e51582f112… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 13:58:09 2020 +0300 dwrite: Use mirrored character only if font supports it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 106 ++++++------------------------------------- dlls/dwrite/bidi.c | 7 --- dlls/dwrite/dwrite_private.h | 7 ++- dlls/dwrite/font.c | 40 +++++++++++----- dlls/dwrite/opentype.c | 67 ++++++++++++++++++++++++++- dlls/dwrite/shape.c | 12 ++--- 6 files changed, 119 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da55f010dfe1b8e51582…

1 0

Nikolay Sivov : dwrite: Silence warning for name entries with platform 3/encoding 10.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: bb91e877b3d06d17c6da45b020ec3b79ac4a72a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb91e877b3d06d17c6da45b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 13:58:08 2020 +0300 dwrite: Silence warning for name entries with platform 3/encoding 10. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index cb1743c5cc..35b02d5573 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -778,7 +778,7 @@ typedef struct { enum TT_NAME_WINDOWS_ENCODING_ID { TT_NAME_WINDOWS_ENCODING_SYMBOL = 0, - TT_NAME_WINDOWS_ENCODING_UCS2, + TT_NAME_WINDOWS_ENCODING_UNICODE_BMP, TT_NAME_WINDOWS_ENCODING_SJIS, TT_NAME_WINDOWS_ENCODING_PRC, TT_NAME_WINDOWS_ENCODING_BIG5, @@ -787,7 +787,7 @@ enum TT_NAME_WINDOWS_ENCODING_ID TT_NAME_WINDOWS_ENCODING_RESERVED1, TT_NAME_WINDOWS_ENCODING_RESERVED2, TT_NAME_WINDOWS_ENCODING_RESERVED3, - TT_NAME_WINDOWS_ENCODING_UCS4 + TT_NAME_WINDOWS_ENCODING_UNICODE_FULL }; enum TT_NAME_MAC_ENCODING_ID @@ -1972,7 +1972,8 @@ static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT switch (encoding) { case TT_NAME_WINDOWS_ENCODING_SYMBOL: - case TT_NAME_WINDOWS_ENCODING_UCS2: + case TT_NAME_WINDOWS_ENCODING_UNICODE_BMP: + case TT_NAME_WINDOWS_ENCODING_UNICODE_FULL: break; case TT_NAME_WINDOWS_ENCODING_SJIS: codepage = 932;

1 0

Nikolay Sivov : dwrite: Set per-glyph feature mask.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 8962f82210b2cdc733ce3eee1c257f846bb54a9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8962f82210b2cdc733ce3eee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 13:58:07 2020 +0300 dwrite: Set per-glyph feature mask. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 18 ++++++++++++++-- dlls/dwrite/dwrite_private.h | 6 ++++++ dlls/dwrite/opentype.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/shape.c | 3 +++ 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 98e1ef4a0d..62258ec441 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1259,6 +1259,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; + context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * max_glyph_count); script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; scriptprops = &dwritescripts_properties[script]; @@ -1268,6 +1269,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, text_props, glyph_props); done: + heap_free(context.glyph_infos); heap_free(string); return hr; @@ -1284,6 +1286,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 struct scriptshaping_context context; struct dwrite_fontface *font_obj; unsigned int i, script; + HRESULT hr; TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, is_sideways, @@ -1327,8 +1330,13 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; + context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + + hr = shape_get_positions(&context, scriptprops->scripttags); - return shape_get_positions(&context, scriptprops->scripttags); + heap_free(context.glyph_infos); + + return hr; } static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWriteTextAnalyzer2 *iface, @@ -1344,6 +1352,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite DWRITE_MEASURING_MODE measuring_mode; struct dwrite_fontface *font_obj; unsigned int i, script; + HRESULT hr; TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, ppdip, @@ -1389,8 +1398,13 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; + context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + + hr = shape_get_positions(&context, scriptprops->scripttags); - return shape_get_positions(&context, scriptprops->scripttags); + heap_free(context.glyph_infos); + + return hr; } static HRESULT apply_cluster_spacing(float leading_spacing, float trailing_spacing, float min_advance_width, diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index ef48ec18c4..afa4bce91d 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -461,6 +461,11 @@ struct scriptshaping_cache } gdef; }; +struct shaping_glyph_info +{ + unsigned int mask; +}; + struct scriptshaping_context { struct scriptshaping_cache *cache; @@ -493,6 +498,7 @@ struct scriptshaping_context unsigned int range_count; } user_features; unsigned int global_mask; + struct shaping_glyph_info *glyph_infos; unsigned int glyph_count; float emsize; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 1cb61027b4..cb1743c5cc 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4311,6 +4311,53 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex } } +static int feature_search_compare(const void *a, const void* b) +{ + unsigned int tag = *(unsigned int *)a; + const struct shaping_feature *feature = b; + + return tag < feature->tag ? -1 : tag > feature->tag ? 1 : 0; +} + +static unsigned int shaping_features_get_mask(const struct shaping_features *features, unsigned int tag, unsigned int *shift) +{ + struct shaping_feature *feature; + + feature = bsearch(&tag, features->features, features->count, sizeof(*features->features), feature_search_compare); + + if (!feature || feature->index == 0xffff) + return 0; + + *shift = feature->shift; + return feature->mask; +} + +static void opentype_layout_set_glyph_masks(struct scriptshaping_context *context, const struct shaping_features *features) +{ + const DWRITE_TYPOGRAPHIC_FEATURES **user_features = context->user_features.features; + unsigned int f, r, g, start_glyph = 0, mask, shift, value; + + for (g = 0; g < context->glyph_count; ++g) + context->glyph_infos[g].mask = context->global_mask; + + /* FIXME: set shaper masks */ + + for (r = 0; r < context->user_features.range_count; ++r) + { + for (f = 0; f < user_features[r]->featureCount; ++f) + { + mask = shaping_features_get_mask(features, user_features[r]->features[f].nameTag, &shift); + if (!mask) + continue; + + value = (user_features[r]->features[f].parameter << shift) & mask; + for (g = 0; g < context->user_features.range_lengths[r]; ++g) + context->glyph_infos[g + start_glyph].mask = (context->glyph_infos[g + start_glyph].mask & ~mask) | value; + start_glyph += context->user_features.range_lengths[r]; + } + } +} + void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) { @@ -4319,6 +4366,8 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); + opentype_layout_set_glyph_masks(context, features); + for (i = 0; i < lookups.count; ++i) opentype_layout_apply_gpos_lookup(context, lookups.lookups[i].index); @@ -4629,6 +4678,8 @@ HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *contex opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gsub, &lookups); + opentype_layout_set_glyph_masks(context, features); + for (i = 0; i < lookups.count; ++i) opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, lookups.lookups[i].index); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 0f88ad4821..18afb2212b 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -370,7 +370,10 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i if (!context->is_sideways) { if (context->is_rtl) + { shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','a')); + shape_add_feature_full(&features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','m'), 0, 1); + } else { shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','a'));

1 0

Nikolay Sivov : dwrite: Keep track of shaping stage feature applies to.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: b8625c7f035deddcc3129d76627c54b6faabd3ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8625c7f035deddcc3129d76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 13:58:06 2020 +0300 dwrite: Keep track of shaping stage feature applies to. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/opentype.c | 117 +++++++++++++++++++++++++------------------ dlls/dwrite/shape.c | 2 + 3 files changed, 71 insertions(+), 50 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3145daba4b..ef48ec18c4 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -528,6 +528,7 @@ struct shaping_feature unsigned int default_value; unsigned int mask; unsigned int shift; + unsigned int stage; }; struct shaping_features @@ -535,6 +536,7 @@ struct shaping_features struct shaping_feature *features; size_t count; size_t capacity; + unsigned int stage; }; extern void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index d2a9318da8..1cb61027b4 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4131,14 +4131,57 @@ static int lookups_sorting_compare(const void *a, const void *b) return left->index < right->index ? -1 : left->index > right->index ? 1 : 0; }; +static void opentype_layout_add_lookups(const struct ot_feature_list *feature_list, UINT16 total_lookup_count, + struct ot_gsubgpos_table *table, struct shaping_feature *feature, struct lookups *lookups) +{ + UINT16 feature_offset, lookup_count; + unsigned int i, j; + + /* Feature wasn't found */ + if (feature->index == 0xffff) + return; + + /* FIXME: skip non-global ones for now. */ + if (!(feature->flags & FEATURE_GLOBAL)) + return; + + feature_offset = GET_BE_WORD(feature_list->features[feature->index].offset); + + lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookup_count)); + if (!lookup_count) + return; + + if (!dwrite_array_reserve((void **)&lookups->lookups, &lookups->capacity, lookups->count + lookup_count, + sizeof(*lookups->lookups))) + { + return; + } + + for (i = 0; i < lookup_count; ++i) + { + UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookuplist_index[i])); + + if (lookup_index >= total_lookup_count) + continue; + + j = lookups->count; + lookups->lookups[j].index = lookup_index; + lookups->lookups[j].mask = feature->mask; + lookups->count++; + } +} + static void opentype_layout_collect_lookups(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features, struct ot_gsubgpos_table *table, struct lookups *lookups) { UINT16 table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; const struct ot_feature_list *feature_list; + unsigned int last_num_lookups = 0, stage; struct shaping_feature *feature; - unsigned int i, j, l, next_bit; + unsigned int i, j, next_bit; unsigned int global_bit_shift = 1; unsigned int global_bit_mask = 1; UINT16 feature_index; @@ -4235,51 +4278,37 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex } } - /* Collect lookups for all given features. */ - for (i = 0; i < features->count; ++i) + for (stage = 0; stage <= features->stage; ++stage) { - UINT16 feature_offset, lookup_count; - - feature = &features->features[i]; - - /* Feature wasn't found */ - if (feature->index == 0xffff) - continue; - - /* FIXME: skip non-global ones for now. */ - if (!(feature->flags & FEATURE_GLOBAL)) - continue; - - feature_offset = GET_BE_WORD(feature_list->features[feature->index].offset); - - lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + - FIELD_OFFSET(struct ot_feature, lookup_count)); - if (!lookup_count) - continue; - - if (!dwrite_array_reserve((void **)&lookups->lookups, &lookups->capacity, lookups->count + lookup_count, - sizeof(*lookups->lookups))) + for (i = 0; i < features->count; ++i) { - return; + if (features->features[i].stage == stage) + opentype_layout_add_lookups(feature_list, total_lookup_count, table, &features->features[i], lookups); } - for (l = 0; l < lookup_count; ++l) + /* Sort and merge lookups for current stage. */ + if (last_num_lookups < lookups->count) { - UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + - FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); + qsort(lookups->lookups + last_num_lookups, lookups->count - last_num_lookups, sizeof(*lookups->lookups), + lookups_sorting_compare); - if (lookup_index >= total_lookup_count) - continue; - - j = lookups->count; - lookups->lookups[j].index = lookup_index; - lookups->lookups[j].mask = feature->mask; - lookups->count++; + j = last_num_lookups; + for (i = j + 1; i < lookups->count; ++i) + { + if (lookups->lookups[i].index != lookups->lookups[j].index) + { + lookups->lookups[++j] = lookups->lookups[i]; + } + else + { + lookups->lookups[j].mask |= lookups->lookups[i].mask; + } + } + lookups->count = j + 1; } - } - /* Sort lookups. */ - qsort(lookups->lookups, lookups->count, sizeof(*lookups->lookups), lookups_sorting_compare); + last_num_lookups = lookups->count; + } } void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, @@ -4291,13 +4320,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); for (i = 0; i < lookups.count; ++i) - { - /* Skip duplicates. */ - if (i && lookups.lookups[i].index == lookups.lookups[i - 1].index) - continue; - opentype_layout_apply_gpos_lookup(context, lookups.lookups[i].index); - } heap_free(lookups.lookups); } @@ -4607,13 +4630,7 @@ HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *contex opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gsub, &lookups); for (i = 0; i < lookups.count; ++i) - { - /* Skip duplicates. */ - if (i && lookups.lookups[i].index == lookups.lookups[i - 1].index) - continue; - opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, lookups.lookups[i].index); - } heap_free(lookups.lookups); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index df680373a2..0f88ad4821 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -213,6 +213,7 @@ static void shape_add_feature_full(struct shaping_features *features, unsigned i features->features[i].flags = flags; features->features[i].max_value = value; features->features[i].default_value = flags & FEATURE_GLOBAL ? value : 0; + features->features[i].stage = features->stage; features->count++; } @@ -267,6 +268,7 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s features->features[j].flags ^= FEATURE_GLOBAL; features->features[j].max_value = max(features->features[j].max_value, features->features[i].max_value); } + features->features[j].stage = min(features->features[j].stage, features->features[i].stage); } } features->count = j + 1;

1 0

Nikolay Sivov : dwrite: Propagate feature mask to lookups collected from it.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 7780d7856be3ea3d272b32036b73fac610aa8b2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7780d7856be3ea3d272b3203… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 13:58:05 2020 +0300 dwrite: Propagate feature mask to lookups collected from it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 + dlls/dwrite/opentype.c | 144 ++++++++++++++++++++++++++++++++----------- 2 files changed, 111 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7780d7856be3ea3d272b…

1 0

Daniel Lehman : vcruntime140_1: Use return address from catch block routine if not provided by catch block info.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 2f5ea32377fc977ef14282c276020fba58799235 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f5ea32377fc977ef14282c2… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu May 21 20:51:30 2020 -0700 vcruntime140_1: Use return address from catch block routine if not provided by catch block info. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 4cc6897223..e1a39c0662 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -603,7 +603,8 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, (ULONG_PTR)rva_to_ptr(ci.handler, dispatch->ImageBase); catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; catch_record.ExceptionInformation[7] = (ULONG_PTR)context; - catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( + if (ci.ret_addr) + catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( ci.ret_addr + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL); }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020