June 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Sort feature tags returned from GetTypographicFeatures().
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: b60796bd7308a9fcd76c12d522af15b56535ae26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b60796bd7308a9fcd76c12d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 16:29:43 2020 +0300 dwrite: Sort feature tags returned from GetTypographicFeatures(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 24 ++++------ dlls/dwrite/dwrite_private.h | 28 +++++++---- dlls/dwrite/opentype.c | 112 ++++++++++++++++++------------------------- dlls/dwrite/shape.c | 47 ++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 50 +++++-------------- 5 files changed, 135 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b60796bd7308a9fcd76c…

1 0

Nikolay Sivov : dwrite: Remove fixme from CreateFontFallback().
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 19e9b819f755339cb01740b9fd37c82d85f420b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19e9b819f755339cb01740b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 16:29:44 2020 +0300 dwrite: Remove fixme from CreateFontFallback(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 10c59f1bdc..909d6e91e3 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2357,7 +2357,7 @@ static HRESULT WINAPI fontfallbackbuilder_CreateFontFallback(IDWriteFontFallback struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); struct dwrite_fontfallback *fallback; - FIXME("%p, %p stub.\n", iface, ret); + TRACE("%p, %p.\n", iface, ret); *ret = NULL;

1 0

Nikolay Sivov : dwrite: Implement CheckTypographicFeature().
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: b4b33e13d2dc72cd70dfe6b7c39f55cddca4861e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4b33e13d2dc72cd70dfe6b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 16:29:45 2020 +0300 dwrite: Implement CheckTypographicFeature(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 29 ++++- dlls/dwrite/dwrite_private.h | 5 + dlls/dwrite/opentype.c | 249 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/shape.c | 25 +++++ 4 files changed, 304 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4b33e13d2dc72cd70df…

1 0

Nikolay Sivov : dwrite: Unify context lookup helpers.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 102272a4a9bd1c80d106b048d4033450fb06ccd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=102272a4a9bd1c80d106b048… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 16:29:46 2020 +0300 dwrite: Unify context lookup helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 7 +++++++ dlls/dwrite/opentype.c | 45 +++++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 966750c12b..3d7884cb57 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -489,6 +489,10 @@ struct shaping_glyph_properties UINT16 reserved2 : 4; }; +struct scriptshaping_context; + +typedef void (*p_apply_context_lookup)(struct scriptshaping_context *context, unsigned int lookup_index); + struct scriptshaping_context { struct scriptshaping_cache *cache; @@ -506,12 +510,14 @@ struct scriptshaping_context const UINT16 *glyphs; const DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; const UINT16 *clustermap; + p_apply_context_lookup apply_context_lookup; } pos; struct { UINT16 *glyphs; DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; UINT16 *clustermap; + p_apply_context_lookup apply_context_lookup; unsigned int max_glyph_count; unsigned int capacity; const WCHAR *digits; @@ -521,6 +527,7 @@ struct scriptshaping_context UINT16 *glyphs; struct shaping_glyph_properties *glyph_props; UINT16 *clustermap; + p_apply_context_lookup apply_context_lookup; } buffer; } u; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index aacf3661c1..9fe5652ba5 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4608,6 +4608,14 @@ static void opentype_layout_set_glyph_masks(struct scriptshaping_context *contex } } +static void opentype_layout_apply_gpos_context_lookup(struct scriptshaping_context *context, unsigned int lookup_index) +{ + struct lookup lookup = { 0 }; + /* Feature mask is intentionally zero, it's not used outside of main loop. */ + if (opentype_layout_init_lookup(context->table, lookup_index, 0, &lookup)) + opentype_layout_apply_gpos_lookup(context, &lookup); +} + void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) { @@ -4615,6 +4623,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int i; BOOL ret; + context->u.buffer.apply_context_lookup = opentype_layout_apply_gpos_context_lookup; opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); for (i = 0; i < context->glyph_count; ++i) @@ -5073,12 +5082,9 @@ static BOOL opentype_layout_context_match_lookahead(const struct match_context * return TRUE; } -static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, const struct lookup *lookup); - -static BOOL opentype_layout_context_gsub_apply_lookup(struct scriptshaping_context *context, unsigned int count, +static BOOL opentype_layout_context_apply_lookup(struct scriptshaping_context *context, unsigned int count, unsigned int *match_positions, unsigned int lookup_count, const UINT16 *lookup_records, unsigned int match_length) { - struct lookup lookup = { 0 }; unsigned int i, j; int end, delta; @@ -5097,8 +5103,8 @@ static BOOL opentype_layout_context_gsub_apply_lookup(struct scriptshaping_conte orig_len = context->glyph_count; lookup_index = GET_BE_WORD(lookup_records[i+1]); - if (opentype_layout_init_lookup(context->table, lookup_index, 0, &lookup)) - opentype_layout_apply_gsub_lookup(context, &lookup); + + context->u.buffer.apply_context_lookup(context, lookup_index); delta = context->glyph_count - orig_len; if (!delta) @@ -5141,7 +5147,7 @@ static BOOL opentype_layout_context_gsub_apply_lookup(struct scriptshaping_conte return TRUE; } -static BOOL opentype_layout_apply_gsub_chain_context_lookup(unsigned int backtrack_count, const UINT16 *backtrack, +static BOOL opentype_layout_apply_chain_context_match(unsigned int backtrack_count, const UINT16 *backtrack, unsigned int input_count, const UINT16 *input, unsigned int lookahead_count, const UINT16 *lookahead, unsigned int lookup_count, const UINT16 *lookup_records, const struct match_context *mc) { @@ -5151,7 +5157,7 @@ static BOOL opentype_layout_apply_gsub_chain_context_lookup(unsigned int backtra return opentype_layout_context_match_input(mc, input_count, input, &match_length, match_positions) && opentype_layout_context_match_backtrack(mc, backtrack_count, backtrack, &start_index) && opentype_layout_context_match_lookahead(mc, lookahead_count, lookahead, input_count, &end_index) && - opentype_layout_context_gsub_apply_lookup(mc->context, input_count, match_positions, lookup_count, lookup_records, match_length); + opentype_layout_context_apply_lookup(mc->context, input_count, match_positions, lookup_count, lookup_records, match_length); } static BOOL opentype_layout_apply_chain_rule_set(const struct match_context *mc, unsigned int offset) @@ -5191,7 +5197,7 @@ static BOOL opentype_layout_apply_chain_rule_set(const struct match_context *mc, lookup_records = table_read_ensure(table, rule_offset, lookup_count * 2 * sizeof(*lookup_records)); /* First applicable rule is used. */ - if (opentype_layout_apply_gsub_chain_context_lookup(backtrack_count, backtrack, input_count, input, lookahead_count, + if (opentype_layout_apply_chain_context_match(backtrack_count, backtrack, input_count, input, lookahead_count, lookahead, lookup_count, lookup_records, mc)) { return TRUE; @@ -5201,14 +5207,14 @@ static BOOL opentype_layout_apply_chain_rule_set(const struct match_context *mc, return FALSE; } -static BOOL opentype_layout_apply_gsub_context_lookup(unsigned int input_count, const UINT16 *input, unsigned int lookup_count, +static BOOL opentype_layout_apply_context_match(unsigned int input_count, const UINT16 *input, unsigned int lookup_count, const UINT16 *lookup_records, const struct match_context *mc) { unsigned int match_positions[GLYPH_CONTEXT_MAX_LENGTH]; unsigned int match_length = 0; return opentype_layout_context_match_input(mc, input_count, input, &match_length, match_positions) && - opentype_layout_context_gsub_apply_lookup(mc->context, input_count, match_positions, lookup_count, + opentype_layout_context_apply_lookup(mc->context, input_count, match_positions, lookup_count, lookup_records, match_length); } @@ -5243,7 +5249,7 @@ static BOOL opentype_layout_apply_rule_set(const struct match_context *mc, unsig continue; /* First applicable rule is used. */ - if (opentype_layout_apply_gsub_context_lookup(input_count, input, lookup_count, lookup_records, mc)) + if (opentype_layout_apply_context_match(input_count, input, lookup_count, lookup_records, mc)) return TRUE; } @@ -5344,7 +5350,7 @@ static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping mc.input_offset = subtable_offset; mc.match_func = opentype_match_coverage_func; - ret = opentype_layout_apply_gsub_context_lookup(input_count, input + 1, lookup_count, lookup_records, &mc); + ret = opentype_layout_apply_context_match(input_count, input + 1, lookup_count, lookup_records, &mc); } else WARN("Unknown contextual substitution format %u.\n", format); @@ -5461,8 +5467,8 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts mc.lookahead_offset = subtable_offset; mc.match_func = opentype_match_coverage_func; - ret = opentype_layout_apply_gsub_chain_context_lookup(backtrack_count, backtrack, input_count, input + 1, - lookahead_count, lookahead, lookup_count, lookup_records, &mc); + ret = opentype_layout_apply_chain_context_match(backtrack_count, backtrack, input_count, input + 1, lookahead_count, + lookahead, lookup_count, lookup_records, &mc); } else WARN("Unknown chaining contextual substitution format %u.\n", format); @@ -5679,6 +5685,14 @@ static BOOL opentype_is_gsub_lookup_reversed(const struct scriptshaping_context return lookup_type == GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST; } +static void opentype_layout_apply_gsub_context_lookup(struct scriptshaping_context *context, unsigned int lookup_index) +{ + struct lookup lookup = { 0 }; + /* Feature mask is intentionally zero, it's not used outside of main loop. */ + if (opentype_layout_init_lookup(context->table, lookup_index, 0, &lookup)) + opentype_layout_apply_gsub_lookup(context, &lookup); +} + void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) { @@ -5686,6 +5700,7 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int i; BOOL ret; + context->u.buffer.apply_context_lookup = opentype_layout_apply_gsub_context_lookup; opentype_layout_collect_lookups(context, script_index, language_index, features, context->table, &lookups); opentype_get_nominal_glyphs(context, features);

1 0

Nikolay Sivov : dwrite: Implement contextual positional lookups.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 8a52d3e7d9dc3243d515750f0b27bb972b7ba9a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a52d3e7d9dc3243d515750f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 16:29:47 2020 +0300 dwrite: Implement contextual positional lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 52 +++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 9fe5652ba5..8853f3a424 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -610,7 +610,7 @@ struct ot_gsub_lig UINT16 components[1]; }; -struct ot_gsub_context_subst_format1 +struct ot_gsubgpos_context_format1 { UINT16 format; UINT16 coverage; @@ -618,7 +618,7 @@ struct ot_gsub_context_subst_format1 UINT16 rulesets[1]; }; -struct ot_gsub_ruleset +struct ot_gsubgpos_ruleset { UINT16 count; UINT16 offsets[1]; @@ -4197,18 +4197,6 @@ static BOOL opentype_layout_apply_gpos_mark_to_mark_attachment(struct scriptshap return TRUE; } -static BOOL opentype_layout_apply_gpos_contextual_positioning(const struct scriptshaping_context *context, - const struct lookup *lookup, unsigned int subtable_offset) -{ - return FALSE; -} - -static BOOL opentype_layout_apply_gpos_chaining_contextual_positioning(const struct scriptshaping_context *context, - const struct lookup *lookup, unsigned int subtable_offset) -{ - return FALSE; -} - static unsigned int opentype_layout_adjust_extension_subtable(struct scriptshaping_context *context, unsigned int *subtable_offset) { @@ -4228,6 +4216,11 @@ static unsigned int opentype_layout_adjust_extension_subtable(struct scriptshapi return GET_BE_WORD(format1->lookup_type); } +static BOOL opentype_layout_apply_context(struct scriptshaping_context *context, const struct lookup *lookup, + unsigned int subtable_offset); +static BOOL opentype_layout_apply_chain_context(struct scriptshaping_context *context, const struct lookup *lookup, + unsigned int subtable_offset); + static BOOL opentype_layout_apply_gpos_lookup(struct scriptshaping_context *context, const struct lookup *lookup) { unsigned int i, lookup_type; @@ -4267,10 +4260,10 @@ static BOOL opentype_layout_apply_gpos_lookup(struct scriptshaping_context *cont ret = opentype_layout_apply_gpos_mark_to_mark_attachment(context, lookup, subtable_offset); break; case GPOS_LOOKUP_CONTEXTUAL_POSITION: - ret = opentype_layout_apply_gpos_contextual_positioning(context, lookup, subtable_offset); + ret = opentype_layout_apply_context(context, lookup, subtable_offset); break; case GPOS_LOOKUP_CONTEXTUAL_CHAINING_POSITION: - ret = opentype_layout_apply_gpos_chaining_contextual_positioning(context, lookup, subtable_offset); + ret = opentype_layout_apply_chain_context(context, lookup, subtable_offset); break; case GPOS_LOOKUP_EXTENSION_POSITION: WARN("Recursive extension lookup.\n"); @@ -5165,7 +5158,7 @@ static BOOL opentype_layout_apply_chain_rule_set(const struct match_context *mc, unsigned int backtrack_count, input_count, lookahead_count, lookup_count; const struct dwrite_fonttable *table = &mc->context->table->table; const UINT16 *backtrack, *lookahead, *input, *lookup_records; - const struct ot_gsub_ruleset *ruleset; + const struct ot_gsubgpos_ruleset *ruleset; unsigned int i, count; count = table_read_be_word(table, offset); @@ -5223,7 +5216,7 @@ static BOOL opentype_layout_apply_rule_set(const struct match_context *mc, unsig unsigned int input_count, lookup_count; const struct dwrite_fonttable *table = &mc->context->table->table; const UINT16 *input, *lookup_records; - const struct ot_gsub_ruleset *ruleset; + const struct ot_gsubgpos_ruleset *ruleset; unsigned int i, count; count = table_read_be_word(table, offset); @@ -5256,7 +5249,7 @@ static BOOL opentype_layout_apply_rule_set(const struct match_context *mc, unsig return FALSE; } -static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, +static BOOL opentype_layout_apply_context(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { struct match_context mc = { .context = context, .lookup = lookup }; @@ -5271,18 +5264,17 @@ static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping if (format == 1) { - coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsubgpos_context_format1, coverage)); coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - count = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, - ruleset_count)); + count = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsubgpos_context_format1, ruleset_count)); if (coverage_index >= count) return FALSE; - offset = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, + offset = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsubgpos_context_format1, rulesets[coverage_index])); offset += subtable_offset; @@ -5358,8 +5350,8 @@ static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping return ret; } -static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scriptshaping_context *context, - const struct lookup *lookup, unsigned int subtable_offset) +static BOOL opentype_layout_apply_chain_context(struct scriptshaping_context *context, const struct lookup *lookup, + unsigned int subtable_offset) { struct match_context mc = { .context = context, .lookup = lookup }; const struct dwrite_fonttable *table = &context->table->table; @@ -5373,17 +5365,17 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts if (format == 1) { - coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsubgpos_context_format1, coverage)); coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - count = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, ruleset_count)); + count = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsubgpos_context_format1, ruleset_count)); if (coverage_index >= count) return FALSE; - offset = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_context_subst_format1, + offset = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsubgpos_context_format1, rulesets[coverage_index])); offset += subtable_offset; @@ -5571,10 +5563,10 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont ret = opentype_layout_apply_gsub_lig_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_CONTEXTUAL_SUBST: - ret = opentype_layout_apply_gsub_context_substitution(context, lookup, subtable_offset); + ret = opentype_layout_apply_context(context, lookup, subtable_offset); break; case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: - ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); + ret = opentype_layout_apply_chain_context(context, lookup, subtable_offset); break; case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: ret = opentype_layout_apply_gsub_reverse_chain_context_substitution(context, lookup, subtable_offset);

1 0

Gijs Vermeulen : quartz/filtergraph: Add a stub IVideoFrameStep interface.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 2680b076e33747bd20dcd283f6d526b1130d079d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2680b076e33747bd20dcd283… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jun 8 10:17:22 2020 -0500 quartz/filtergraph: Add a stub IVideoFrameStep interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42372 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 57 ++++++++++++++++++++++++++++++++++++++++- dlls/quartz/tests/filtergraph.c | 1 + include/axextend.idl | 13 ++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6217516db1..918c41a3d6 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -181,7 +181,7 @@ typedef struct _IFilterGraphImpl { /* IRegisterServiceProvider */ /* IResourceManager */ /* IServiceProvider */ - /* IVideoFrameStep */ + IVideoFrameStep IVideoFrameStep_iface; IUnknown *outer_unk; LONG ref; @@ -454,6 +454,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { *ppvObj = &This->IGraphVersion_iface; TRACE(" returning IGraphVersion interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IVideoFrameStep, riid)) { + *ppvObj = &This->IVideoFrameStep_iface; + TRACE(" returning IVideoFrameStep interface (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid)); @@ -5638,6 +5641,57 @@ static const IGraphVersionVtbl IGraphVersion_VTable = GraphVersion_QueryVersion, }; +static IFilterGraphImpl *impl_from_IVideoFrameStep(IVideoFrameStep *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IVideoFrameStep_iface); +} + +static HRESULT WINAPI VideoFrameStep_QueryInterface(IVideoFrameStep *iface, REFIID iid, void **out) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); +} + +static ULONG WINAPI VideoFrameStep_AddRef(IVideoFrameStep *iface) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_AddRef(graph->outer_unk); +} + +static ULONG WINAPI VideoFrameStep_Release(IVideoFrameStep *iface) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_Release(graph->outer_unk); +} + +static HRESULT WINAPI VideoFrameStep_Step(IVideoFrameStep *iface, DWORD frame_count, IUnknown *filter) +{ + FIXME("iface %p, frame_count %u, filter %p, stub!\n", iface, frame_count, filter); + return E_NOTIMPL; +} + +static HRESULT WINAPI VideoFrameStep_CanStep(IVideoFrameStep *iface, LONG multiple, IUnknown *filter) +{ + FIXME("iface %p, multiple %d, filter %p, stub!\n", iface, multiple, filter); + return E_NOTIMPL; +} + +static HRESULT WINAPI VideoFrameStep_CancelStep(IVideoFrameStep *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static const IVideoFrameStepVtbl VideoFrameStep_vtbl = +{ + VideoFrameStep_QueryInterface, + VideoFrameStep_AddRef, + VideoFrameStep_Release, + VideoFrameStep_Step, + VideoFrameStep_CanStep, + VideoFrameStep_CancelStep +}; + static const IUnknownVtbl IInner_VTable = { FilterGraphInner_QueryInterface, @@ -5668,6 +5722,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; + fimpl->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; fimpl->ref = 1; list_init(&fimpl->filters); list_init(&fimpl->sorted_filters); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f0aa084192..a3378efe0b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -125,6 +125,7 @@ static void test_interfaces(void) check_interface(graph, &IID_IMediaPosition, TRUE); check_interface(graph, &IID_IMediaSeeking, TRUE); check_interface(graph, &IID_IObjectWithSite, TRUE); + check_interface(graph, &IID_IVideoFrameStep, TRUE); check_interface(graph, &IID_IVideoWindow, TRUE); check_interface(graph, &IID_IBaseFilter, FALSE); diff --git a/include/axextend.idl b/include/axextend.idl index 8b46d665b5..7630ea247c 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -1471,3 +1471,16 @@ interface IAMTVTuner : IAMTuner HRESULT get_VideoFrequency([out] long *freq); HRESULT get_AudioFrequency([out] long *freq); } + +[ + local, + object, + uuid(e46a9787-2b71-444d-a4b5-1fab7b708d6a), + pointer_default(unique), +] +interface IVideoFrameStep : IUnknown +{ + HRESULT Step(DWORD frame_count, [in] IUnknown *filter); + HRESULT CanStep(long multiple, [in] IUnknown *filter); + HRESULT CancelStep(); +}

1 0

Piotr Caban : msvcrt: Use internal sprintf implementation.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: bfa1e3ef8f592d74f1dfcc89ba940946ad327591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfa1e3ef8f592d74f1dfcc89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 8 17:20:39 2020 +0200 msvcrt: Use internal sprintf implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/errno.c | 4 ++-- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/math.c | 8 ++++---- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/printf.h | 10 ++++++---- dlls/msvcrt/string.c | 4 ++-- dlls/msvcrt/undname.c | 2 +- 9 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index a80ac61f11..0497e59739 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -323,9 +323,9 @@ char* CDECL MSVCRT__strerror(const char* str) if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; if (str && *str) - sprintf( data->strerror_buffer, "%s: %s\n", str, MSVCRT__sys_errlist[err] ); + MSVCRT_sprintf( data->strerror_buffer, "%s: %s\n", str, MSVCRT__sys_errlist[err] ); else - sprintf( data->strerror_buffer, "%s\n", MSVCRT__sys_errlist[err] ); + MSVCRT_sprintf( data->strerror_buffer, "%s\n", MSVCRT__sys_errlist[err] ); return data->strerror_buffer; } diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index b357b83b33..f631d4d727 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -237,7 +237,7 @@ void CDECL _amsg_exit(int errnum) ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2))) { char text[32]; - sprintf(text, "Error: R60%d",errnum); + MSVCRT_sprintf(text, "Error: R60%d",errnum); DoMessageBox("Runtime error!", text); } else diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 72a52a20a9..bbcaed0ae0 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -454,7 +454,7 @@ static BOOL update_threadlocinfo_category(LCID lcid, unsigned short cp, len += GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY |LOCALE_NOUSEROVERRIDE, &buf[len], 256-len); buf[len-1] = '.'; - sprintf(buf+len, "%d", cp); + MSVCRT_sprintf(buf+len, "%d", cp); len += strlen(buf+len); return init_category_name(buf, len, locinfo, category); @@ -507,7 +507,7 @@ static inline char* construct_lc_all(MSVCRT_pthreadlocinfo locinfo) { if(i==MSVCRT_LC_MAX) return locinfo->lc_category[MSVCRT_LC_COLLATE].locale; - sprintf(current_lc_all, + MSVCRT_sprintf(current_lc_all, "LC_COLLATE=%s;LC_CTYPE=%s;LC_MONETARY=%s;LC_NUMERIC=%s;LC_TIME=%s", locinfo->lc_category[MSVCRT_LC_COLLATE].locale, locinfo->lc_category[MSVCRT_LC_CTYPE].locale, diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 19a4da222b..eae917076f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1735,7 +1735,7 @@ char * CDECL MSVCRT__ecvt( double number, int ndigits, int *decpt, int *sign ) /* handle cases with zero ndigits or less */ prec = ndigits; if( prec < 1) prec = 2; - len = snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number); + len = MSVCRT__snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number); /* take the decimal "point away */ if( prec != 1) memmove( data->efcvt_buffer + 1, data->efcvt_buffer + 2, len - 1 ); @@ -1795,7 +1795,7 @@ int CDECL MSVCRT__ecvt_s( char *buffer, MSVCRT_size_t length, double number, int number = -number; } else *sign = FALSE; - len = snprintf(result, prec + 7, "%.*le", prec - 1, number); + len = MSVCRT__snprintf(result, prec + 7, "%.*le", prec - 1, number); /* take the decimal "point away */ if( prec != 1) memmove( result + 1, result + 2, len - 1 ); @@ -1837,7 +1837,7 @@ char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign ) number = -number; } else *sign = 0; - stop = snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); + stop = MSVCRT__snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); ptr1 = buf; ptr2 = data->efcvt_buffer; first = NULL; @@ -1920,7 +1920,7 @@ int CDECL MSVCRT__fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int number = -number; } else *sign = 0; - stop = snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); + stop = MSVCRT__snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); ptr1 = buf; ptr2 = outbuffer; first = NULL; diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 39f94b17a3..5215eff0e3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -239,7 +239,7 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) } if(lcid == -1) { - sprintf(bufA, format, newcp); + MSVCRT_sprintf(bufA, format, newcp); mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA, NULL, NULL); } else { mbcinfo->mblcid = lcid; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a45b82a944..3ffc785d06 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1191,6 +1191,7 @@ int __cdecl MSVCRT_strcmp(const char*, const char*); char* __cdecl MSVCRT_strstr(const char*, const char*); unsigned int __cdecl MSVCRT__get_output_format(void); char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); +char* __cdecl MSVCRT__itoa(int, char*, int); double parse_double(MSVCRT_wchar_t (*)(void*), void (*)(void*), void*, MSVCRT_pthreadlocinfo, int*); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index d7f3b6f225..a5a2f5c4a1 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -282,7 +282,9 @@ static inline void FUNC_NAME(pf_rebuild_format_string)(char *p, FUNC_NAME(pf_fla if(flags->Alternate) *p++ = flags->Alternate; if(flags->Precision >= 0) { - p += sprintf(p, ".%d", flags->Precision); + *p++ = '.'; + MSVCRT__itoa(flags->Precision, p, 10); + p += strlen(p); } *p++ = flags->Format; *p++ = 0; @@ -663,11 +665,11 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API static const char ind_str[] = "nan(ind)"; static const char nan_str[] = "nan"; if(inf) - sprintf(tmp, inf_str); + memcpy(tmp, inf_str, ARRAY_SIZE(inf_str)); else if(ind) - sprintf(tmp, ind_str); + memcpy(tmp, ind_str, ARRAY_SIZE(ind_str)); else - sprintf(tmp, nan_str); + memcpy(tmp, nan_str, ARRAY_SIZE(nan_str)); if (strchr("EFG", flags.Format)) for(i=0; tmp[i]; i++) tmp[i] = MSVCRT__toupper_l(tmp[i], NULL); diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 7baf8eee8e..1e3e0d15bf 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2301,8 +2301,8 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 prec = 0; } - sprintf(format, "%%.%dle", prec); - sprintf(buf, format, d); + MSVCRT_sprintf(format, "%%.%dle", prec); + MSVCRT_sprintf(buf, format, d); buf[1] = buf[0]; data->pos = atoi(buf+prec+3); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index df3e4e8cc8..69eef44654 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -331,7 +331,7 @@ static const char* get_number(struct parsed_symbol* sym) if (*sym->current != '@') return NULL; ptr = und_alloc(sym, 17); - sprintf(ptr, "%s%u", sgn ? "-" : "", ret); + MSVCRT_sprintf(ptr, "%s%u", sgn ? "-" : "", ret); sym->current++; } else return NULL;

1 0

Alexandre Julliard : twain_32: Fix potentially uninitialized variable compiler warnings.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 4d60ab3744d08f487626427038a580e7c2669806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d60ab3744d08f4876264270… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 14:17:35 2020 +0200 twain_32: Fix potentially uninitialized variable compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/tests/dsm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 1e9764dccb..cf0f7b4270 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -72,7 +72,10 @@ static BOOL get_onevalue(TW_HANDLE hcontainer, TW_UINT32 *ret, TW_UINT16 *type) return TRUE; } else + { *ret = 0; + if (type) *type = 0; + } return FALSE; }

1 0

Alexandre Julliard : ntdll: Use NtContinue() to set the thread initial context.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 20c91c5e803090bd40fe3045a0d9fea0a68913e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c91c5e803090bd40fe3045… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 6 15:41:24 2020 +0200 ntdll: Use NtContinue() to set the thread initial context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 -- dlls/ntdll/unix/signal_arm.c | 3 +- dlls/ntdll/unix/signal_arm64.c | 43 +++++------------------ dlls/ntdll/unix/signal_i386.c | 76 ++++++++++++++++++----------------------- dlls/ntdll/unix/signal_x86_64.c | 59 ++++++++++++++------------------ 5 files changed, 69 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20c91c5e803090bd40fe…

1 0

Alexandre Julliard : ntdll: Implement NtContinue() in the Unix library.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 95e2d05e5d6b92a2f6b28e00f36064b7bf6b249a URL: https://source.winehq.org/git/wine.git/?a=commit;h=95e2d05e5d6b92a2f6b28e00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 6 15:16:38 2020 +0200 ntdll: Implement NtContinue() in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/thread.c | 9 +++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/thread.c | 12 ++++++++++++ dlls/ntdll/unixlib.h | 3 ++- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 11fa03b4d1..766e458621 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -157,7 +157,7 @@ @ stdcall NtCompleteConnectPort(ptr) # @ stub NtCompressKey @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) -@ stub NtContinue +@ stdcall NtContinue(ptr long) # @ stub NtCreateDebugObject @ stdcall NtCreateDirectoryObject(ptr long ptr) @ stdcall NtCreateEvent(ptr long ptr long long) @@ -1145,7 +1145,7 @@ @ stdcall -private ZwCompleteConnectPort(ptr) NtCompleteConnectPort # @ stub ZwCompressKey @ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort -@ stub ZwContinue +@ stdcall -private ZwContinue(ptr long) NtContinue # @ stub ZwCreateDebugObject @ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall -private ZwCreateEvent(ptr long ptr long long) NtCreateEvent diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 18664030df..d045466f6d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -602,6 +602,15 @@ NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int fla } +/*********************************************************************** + * NtContinue (NTDLL.@) + */ +NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) +{ + return unix_funcs->NtContinue( context, alertable ); +} + + /*********************************************************************** * NtSetContextThread (NTDLL.@) * ZwSetContextThread (NTDLL.@) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3116c885d1..618e3d6adb 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -988,6 +988,7 @@ static struct unix_funcs unix_funcs = NtCancelTimer, NtClearEvent, NtClose, + NtContinue, NtCreateEvent, NtCreateKeyedEvent, NtCreateMutant, diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 1fc7dc8454..d4b7a51a62 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -470,6 +470,18 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL } +/*********************************************************************** + * NtContinue (NTDLL.@) + */ +NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) +{ + static const LARGE_INTEGER zero_timeout; + + if (alertable) server_wait( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, &zero_timeout ); + return NtSetContextThread( GetCurrentThread(), context ); +} + + /*********************************************************************** * set_thread_context */ diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 779b91c89b..017a0a71b3 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct ldt_copy; struct msghdr; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 31 +#define NTDLL_UNIXLIB_VERSION 32 struct unix_funcs { @@ -39,6 +39,7 @@ struct unix_funcs NTSTATUS (WINAPI *NtCancelTimer)( HANDLE handle, BOOLEAN *state ); NTSTATUS (WINAPI *NtClearEvent)( HANDLE handle ); NTSTATUS (WINAPI *NtClose)( HANDLE handle ); + NTSTATUS (WINAPI *NtContinue)( CONTEXT *context, BOOLEAN alertable ); NTSTATUS (WINAPI *NtCreateEvent)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN state ); NTSTATUS (WINAPI *NtCreateKeyedEvent)( HANDLE *handle, ACCESS_MASK access,

1 0