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

[PATCH 4/6] msscript: Reimplement state property using embedded script engine state.
by Jacek Caban 12 Jun '20

12 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)

1 0

[PATCH 3/6] msscript.ocx/tests: Add initial tests for Script Modules.
by Jacek Caban 12 Jun '20

12 Jun '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/tests/msscript.c | 195 ++++++++++++++++++++++++++++- 1 file changed, 191 insertions(+), 4 deletions(-)

1 0

[PATCH 2/6] msscript.ocx: Add initial IScriptModule stub implementation.
by Jacek Caban 12 Jun '20

12 Jun '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 245 ++++++++++++++++++++++++++++++++++- 1 file changed, 239 insertions(+), 6 deletions(-)

1 0

[PATCH 1/6] msscript.ocx: Add IScriptModuleCollection stub implementation.
by Jacek Caban 12 Jun '20

12 Jun '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 166 ++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 3 deletions(-)

1 0

[PATCH] widl: Make decl_needs_parens static
by Martin Storsjo 12 Jun '20

12 Jun '20

This function lacks a declaration in header.h and isn't used outside of this source file. This fixes warnings about missing a prototype, when built as part of mingw-w64-tools (where it is built with -Wmissing-prototypes). Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/widl/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index c00a3e1bb3e..a319f2425e3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -283,7 +283,7 @@ int needs_space_after(type_t *t) (!is_ptr(t) && (!is_array(t) || !type_array_is_decl_as_ptr(t) || t->name))); } -int decl_needs_parens(const type_t *t) +static int decl_needs_parens(const type_t *t) { if (type_is_alias(t)) return FALSE; -- 2.17.1

2 1

[PATCH 1/4] d3dx9: Use BitScanReverse in make_pow2.
by Jacek Caban 12 Jun '20

12 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I left behaviour for num == 1 unchanged, but according to the comment it should be 0. We don't seem to have a test for that. dlls/d3dx9_36/d3dx9_private.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)

3 3

[PATCH] dwrite: Keep current lookup feature mask in context.
by Nikolay Sivov 12 Jun '20

12 Jun '20

Lookups referenced from context-based lookups need to have access to original feature mask, set it once instead of propagating it on every recursive call. It's used for input matching and parametrized cases like alternate substitutions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 661e01123c9..be3f4b719e8 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -585,6 +585,7 @@ struct scriptshaping_context unsigned int range_count; } user_features; unsigned int global_mask; + unsigned int lookup_mask; /* Currently processed feature mask, set in main loop. */ struct shaping_glyph_info *glyph_infos; unsigned int cur; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index cb79a68d59e..22159e29885 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4802,6 +4802,8 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, const struct lookup *lookup = &lookups.lookups[i]; context->cur = 0; + context->lookup_mask = lookup->mask; + while (context->cur < context->glyph_count) { ret = FALSE; @@ -5037,8 +5039,8 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con if (!count) return FALSE; - BitScanForward(&shift, lookup->mask); - alt_index = (lookup->mask & context->glyph_infos[idx].mask) >> shift; + BitScanForward(&shift, context->lookup_mask); + alt_index = (context->lookup_mask & context->glyph_infos[idx].mask) >> shift; if (alt_index > count || !alt_index) return FALSE; @@ -5071,7 +5073,7 @@ static BOOL opentype_layout_context_match_input(const struct match_context *mc, match_positions[0] = context->cur; glyph_iterator_init(context, mc->lookup->flags, context->cur, count - 1, &iter); - iter.mask = mc->lookup->mask; + iter.mask = context->lookup_mask; iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = input; @@ -5933,6 +5935,8 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, { const struct lookup *lookup = &lookups.lookups[i]; + context->lookup_mask = lookup->mask; + if (!opentype_is_gsub_lookup_reversed(context, lookup)) { context->cur = 0; -- 2.27.0

1 0

[PATCH] msvcrt: Reset buffer in fflush on error.
by Piotr Caban 12 Jun '20

12 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 11 ++++++----- dlls/msvcrt/tests/file.c | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 6 deletions(-)

1 0

[PATCH 1/2] oleaut32: Add guid to SLTG_Header
by Vijay Kiran Kamuju 12 Jun '20

12 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH 1/2] ntdll: Create class section for proxy-stub interface entries.
by Nikolay Sivov 12 Jun '20

12 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/actctx.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 1fb337ea333..1fa97ac0379 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1778,12 +1778,40 @@ static BOOL parse_nummethods(const xmlstr_t *str, struct entity *entity) return TRUE; } +static void parse_add_interface_class( xmlbuf_t *xmlbuf, struct entity_array *entities, + struct actctx_loader *acl, WCHAR *clsid ) +{ + struct entity *entity; + WCHAR *str; + + if (!clsid) return; + + if (!(str = strdupW(clsid))) + { + set_error( xmlbuf ); + return; + } + + if (!(entity = add_entity(entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) + { + RtlFreeHeap(GetProcessHeap(), 0, str); + set_error( xmlbuf ); + return; + } + + entity->u.comclass.clsid = str; + entity->u.comclass.model = ThreadingModel_Both; + + acl->actctx->sections |= SERVERREDIRECT_SECTION; +} + static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, struct actctx_loader *acl, const struct xml_elem *parent ) { + WCHAR *psclsid = NULL; + struct entity *entity; struct xml_attr attr; BOOL end = FALSE; - struct entity* entity; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION))) { @@ -1815,8 +1843,12 @@ static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_red { if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } + else if (xml_attr_cmp(&attr, proxyStubClsid32W)) + { + if (!(psclsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); + } /* not used */ - else if (xml_attr_cmp(&attr, proxyStubClsid32W) || xml_attr_cmp(&attr, threadingmodelW)) + else if (xml_attr_cmp(&attr, threadingmodelW)) { } else if (!is_xmlns_attr( &attr )) @@ -1827,6 +1859,10 @@ static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_red acl->actctx->sections |= IFACEREDIRECT_SECTION; if (!end) parse_expect_end_elem(xmlbuf, parent); + + parse_add_interface_class(xmlbuf, &dll->entities, acl, psclsid ? psclsid : entity->u.ifaceps.iid); + + RtlFreeHeap(GetProcessHeap(), 0, psclsid); } static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity) -- 2.27.0

2 3