November 2018 - Wine-Commits

Jacek Caban : widl: Use for_each_iface in process_tfs.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 212cffbf996d6134c47011686645b4fac95f8d67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=212cffbf996d6134c4701168… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 16:14:31 2018 +0100 widl: Use for_each_iface in process_tfs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 51 +++++++++++++++++---------------------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5e4b36d..f2061b0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3675,52 +3675,35 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty return write_type_tfs(file, 2, attrs, type, name, write_ptr ? TYPE_CONTEXT_CONTAINER : TYPE_CONTEXT_CONTAINER_NO_POINTERS, tfsoff); } -static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts, - type_pred_t pred, unsigned int *typeformat_offset) +static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned int *offset) { + const statement_t *stmt_func; var_t *var; - const statement_t *stmt; - if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + current_iface = iface; + STATEMENTS_FOR_EACH_FUNC( stmt_func, type_iface_get_stmts(iface) ) { - const type_t *iface; - const statement_t *stmt_func; + const var_t *func = stmt_func->u.var; + current_func = func; + if (is_local(func->attrs)) continue; - if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) - continue; + var = type_function_get_retval(func->type); + if (!is_void(var->type)) + var->typestring_offset = write_type_tfs( file, 2, func->attrs, var->type, func->name, + TYPE_CONTEXT_PARAM, offset); - iface = stmt->u.type; - if (!pred(iface)) - continue; - - current_iface = iface; - STATEMENTS_FOR_EACH_FUNC( stmt_func, type_iface_get_stmts(iface) ) - { - const var_t *func = stmt_func->u.var; - current_func = func; - if (is_local(func->attrs)) continue; - - var = type_function_get_retval(func->type); - if (!is_void(var->type)) - var->typestring_offset = write_type_tfs( file, 2, func->attrs, var->type, func->name, - TYPE_CONTEXT_PARAM, typeformat_offset); - - if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, - TYPE_CONTEXT_TOPLEVELPARAM, - typeformat_offset ); - } + if (type_get_function_args(func->type)) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) + var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, + TYPE_CONTEXT_TOPLEVELPARAM, offset ); } - - return *typeformat_offset + 1; } static unsigned int process_tfs(FILE *file, const statement_list_t *stmts, type_pred_t pred) { unsigned int typeformat_offset = 2; - - return process_tfs_stmts(file, stmts, pred, &typeformat_offset); + for_each_iface(stmts, process_tfs_iface, pred, file, 0, &typeformat_offset); + return typeformat_offset + 1; }

1 0

Jacek Caban : widl: Introduce for_each_iface helper and use it in write_procformatstring.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 53e54833f65475de30748564cd53dc892160eb51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e54833f65475de30748564… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 16:14:20 2018 +0100 widl: Introduce for_each_iface helper and use it in write_procformatstring. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ce4c578..5e4b36d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1465,27 +1465,34 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i } } -static void write_procformatstring_stmts(FILE *file, int indent, const statement_list_t *stmts, - type_pred_t pred, unsigned int *offset) +static void for_each_iface(const statement_list_t *stmts, + void (*proc)(type_t *iface, FILE *file, int indent, unsigned int *offset), + type_pred_t pred, FILE *file, int indent, unsigned int *offset) { const statement_t *stmt; + type_t *iface; + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { - if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) - { - const statement_t *stmt_func; - const type_t *iface = stmt->u.type; - const type_t *parent = type_iface_get_inherit( iface ); - int count = parent ? count_methods( parent ) : 0; + if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) + continue; + iface = stmt->u.type; + if (!pred(iface)) continue; + proc(iface, file, indent, offset); + } +} - if (!pred(iface)) continue; - STATEMENTS_FOR_EACH_FUNC(stmt_func, type_iface_get_stmts(iface)) - { - var_t *func = stmt_func->u.var; - if (is_local(func->attrs)) continue; - write_procformatstring_func( file, indent, iface, func, offset, count++ ); - } - } +static void write_iface_procformatstring(type_t *iface, FILE *file, int indent, unsigned int *offset) +{ + const statement_t *stmt; + const type_t *parent = type_iface_get_inherit( iface ); + int count = parent ? count_methods( parent ) : 0; + + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + var_t *func = stmt->u.var; + if (is_local(func->attrs)) continue; + write_procformatstring_func( file, indent, iface, func, offset, count++ ); } } @@ -1501,7 +1508,7 @@ void write_procformatstring(FILE *file, const statement_list_t *stmts, type_pred print_file(file, indent, "{\n"); indent++; - write_procformatstring_stmts(file, indent, stmts, pred, &offset); + for_each_iface(stmts, write_iface_procformatstring, pred, file, indent, &offset); print_file(file, indent, "0x0\n"); indent--;

1 0

Alexandre Julliard : mscoree/tests: Fix some uninitialized buffers.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 6427276c275bdbda6312d36666e792a35d2c5e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6427276c275bdbda6312d366… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 19:33:38 2018 +0100 mscoree/tests: Fix some uninitialized buffers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/comtest.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 5d6f23e..eec5d9a 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -186,6 +186,8 @@ static void prepare_and_run_test(const char *dll_source, run_type run) ULONG_PTR cookie; HANDLE handle_context = 0; + path_manifest_exe[0] = path_manifest_dll[0] = path_dll_source[0] = 0; + GetTempPathA(MAX_PATH, path_tmp); GetTempPathA(MAX_PATH, path_tmp_manifest); PathAppendA(path_tmp_manifest, "manifests");

1 0

Jacek Caban : widl: Use for_each_iface in get_size_procformatstring.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 3a8dbbb63447752494a7427bbede52f78c43da37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a8dbbb63447752494a7427b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 16:14:42 2018 +0100 widl: Use for_each_iface in get_size_procformatstring. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f2061b0..10e6eba 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4537,30 +4537,21 @@ unsigned int get_size_procformatstring_func(const type_t *iface, const var_t *fu return offset; } -unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_t pred) +static void get_size_procformatstring_iface(type_t *iface, FILE *file, int indent, unsigned int *size) { const statement_t *stmt; - unsigned int size = 1; - - if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) { - const type_t *iface; - const statement_t *stmt_func; - - if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) - continue; - - iface = stmt->u.type; - if (!pred(iface)) - continue; - - STATEMENTS_FOR_EACH_FUNC( stmt_func, type_iface_get_stmts(iface) ) - { - const var_t *func = stmt_func->u.var; - if (!is_local(func->attrs)) - size += get_size_procformatstring_func( iface, func ); - } + const var_t *func = stmt->u.var; + if (!is_local(func->attrs)) + *size += get_size_procformatstring_func( iface, func ); } +} + +unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_t pred) +{ + unsigned int size = 1; + for_each_iface(stmts, get_size_procformatstring_iface, pred, NULL, 0, &size); return size; }

1 0

Jacek Caban : widl: Support async interfaces proxy.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 89a1dade805debfe558b5a0366cde9c75612d2a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89a1dade805debfe558b5a03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 16:14:56 2018 +0100 widl: Support async interfaces proxy. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 19 ++++++++++++++++--- tools/widl/typegen.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 12424d9..a6c3c32 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -736,7 +736,9 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "},\n"); print_proxy( "{\n"); indent++; - print_proxy( "CStdStubBuffer_%s\n", need_delegation_indirect(iface) ? "DELEGATING_METHODS" : "METHODS"); + print_proxy( "%s_%s\n", + iface->details.iface->async_iface == iface ? "CStdAsyncStubBuffer" : "CStdStubBuffer", + need_delegation_indirect(iface) ? "DELEGATING_METHODS" : "METHODS"); indent--; print_proxy( "}\n"); indent--; @@ -832,8 +834,13 @@ static void write_proxy_stmts(const statement_list_t *stmts, unsigned int *proc_ { if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { - if (need_proxy(stmt->u.type)) - write_proxy(stmt->u.type, proc_offset); + type_t *iface = stmt->u.type; + if (need_proxy(iface)) + { + write_proxy(iface, proc_offset); + if (iface->details.iface->async_iface) + write_proxy(iface->details.iface->async_iface, proc_offset); + } } } } @@ -861,6 +868,12 @@ static void build_iface_list( const statement_list_t *stmts, type_t **ifaces[], { *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(**ifaces) ); (*ifaces)[(*count)++] = iface; + if (iface->details.iface->async_iface) + { + iface = iface->details.iface->async_iface; + *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(**ifaces) ); + (*ifaces)[(*count)++] = iface; + } } } } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 10e6eba..8b23c63 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1381,6 +1381,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, if (is_attr( func->attrs, ATTR_NOTIFY )) ext_flags |= 0x08; /* HasNotify */ if (is_attr( func->attrs, ATTR_NOTIFYFLAG )) ext_flags |= 0x10; /* HasNotify2 */ + if (iface == iface->details.iface->async_iface) oi2_flags |= 0x20; size = get_function_buffer_size( func, PASS_IN ); print_file( file, indent, "NdrFcShort(0x%x),\t/* client buffer = %u */\n", size, size ); @@ -1479,6 +1480,8 @@ static void for_each_iface(const statement_list_t *stmts, iface = stmt->u.type; if (!pred(iface)) continue; proc(iface, file, indent, offset); + if (iface->details.iface->async_iface) + proc(iface->details.iface->async_iface, file, indent, offset); } }

1 0

Jacek Caban : widl: Generate async interface table.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 824d51358511621616570b66a436034dac2f5140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=824d51358511621616570b66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 16:15:22 2018 +0100 widl: Generate async interface table. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index a6c3c32..4c7d85d 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -895,6 +895,7 @@ static void write_proxy_routines(const statement_list_t *stmts) unsigned int proc_offset = 0; char *file_id = proxy_token; int i, count, have_baseiid = 0; + unsigned int table_version; type_t **interfaces; const type_t * delegate_to; @@ -1006,6 +1007,26 @@ static void write_proxy_routines(const statement_list_t *stmts) fprintf(proxy, "}\n"); fprintf(proxy, "\n"); + table_version = get_stub_mode() == MODE_Oif ? 2 : 1; + for (i = 0; i < count; i++) + { + if (interfaces[i]->details.iface->async_iface != interfaces[i]) continue; + if (table_version != 6) + { + fprintf(proxy, "static const IID *_AsyncInterfaceTable[] =\n"); + fprintf(proxy, "{\n"); + table_version = 6; + } + fprintf(proxy, " &IID_%s,\n", interfaces[i]->name); + fprintf(proxy, " (IID*)(LONG_PTR)-1,\n"); + } + if (table_version == 6) + { + fprintf(proxy, " 0\n"); + fprintf(proxy, "};\n"); + fprintf(proxy, "\n"); + } + fprintf(proxy, "const ExtendedProxyFileInfo %s_ProxyFileInfo DECLSPEC_HIDDEN =\n", file_id); fprintf(proxy, "{\n"); fprintf(proxy, " (const PCInterfaceProxyVtblList*)_%s_ProxyVtblList,\n", file_id); @@ -1015,8 +1036,8 @@ static void write_proxy_routines(const statement_list_t *stmts) else fprintf(proxy, " 0,\n"); fprintf(proxy, " _%s_IID_Lookup,\n", file_id); fprintf(proxy, " %d,\n", count); - fprintf(proxy, " %d,\n", get_stub_mode() == MODE_Oif ? 2 : 1); - fprintf(proxy, " 0,\n"); + fprintf(proxy, " %u,\n", table_version); + fprintf(proxy, " %s,\n", table_version == 6 ? "_AsyncInterfaceTable" : "0"); fprintf(proxy, " 0,\n"); fprintf(proxy, " 0,\n"); fprintf(proxy, " 0\n");

1 0

Jacek Caban : widl: Support async interfaces in headers generation.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 069d7b02b7ef2e70cfc66010728293e51bee806a URL: https://source.winehq.org/git/wine.git/?a=commit;h=069d7b02b7ef2e70cfc66010… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 16:14:06 2018 +0100 widl: Support async interfaces in headers generation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 92bd391..c4b26d3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1611,8 +1611,13 @@ static void write_forward_decls(FILE *header, const statement_list_t *stmts) case STMT_TYPE: if (type_get_type(stmt->u.type) == TYPE_INTERFACE) { - if (is_object(stmt->u.type) || is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE)) - write_forward(header, stmt->u.type); + type_t *iface = stmt->u.type; + if (is_object(iface) || is_attr(iface->attrs, ATTR_DISPINTERFACE)) + { + write_forward(header, iface); + if (iface->details.iface->async_iface) + write_forward(header, iface->details.iface->async_iface); + } } else if (type_get_type(stmt->u.type) == TYPE_COCLASS) write_coclass_forward(header, stmt->u.type); @@ -1647,12 +1652,18 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons if (type_get_type(stmt->u.type) == TYPE_INTERFACE) { type_t *iface = stmt->u.type; + type_t *async_iface = iface->details.iface->async_iface; if (is_object(iface)) is_object_interface++; if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type)) { write_com_interface_start(header, iface); write_header_stmts(header, type_iface_get_stmts(iface), stmt->u.type, TRUE); write_com_interface_end(header, iface); + if (async_iface) + { + write_com_interface_start(header, async_iface); + write_com_interface_end(header, async_iface); + } } else {

1 0

Jacek Caban : widl: Create type for async variant of an interface with async_uuid attribute.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: b467f2de9b23599d936a421610bcd79338c088aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b467f2de9b23599d936a4216… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 16:13:47 2018 +0100 widl: Create type for async variant of an interface with async_uuid attribute. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 106 +++++++++++++++++++++++++++++++++++++++++++++++-- tools/widl/typetree.c | 3 ++ tools/widl/widltypes.h | 1 + 3 files changed, 107 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0f85498..757d796 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -113,6 +113,8 @@ const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func); static void check_def(const type_t *t); +static void check_async_uuid(type_t *iface); + static statement_t *make_statement(enum statement_type type); static statement_t *make_statement_type_decl(type_t *type); static statement_t *make_statement_reference(type_t *type); @@ -909,6 +911,7 @@ interfacedef: interfacehdr inherit if($$ == $2) error_loc("Interface can't inherit from itself\n"); type_interface_define($$, $2, $4); + check_async_uuid($$); pointer_default = $1.old_pointer_default; } /* MIDL is able to import the definition of a base class from inside the @@ -1236,10 +1239,13 @@ static attr_list_t *append_attr_list(attr_list_t *new_list, attr_list_t *old_lis return new_list; } -static attr_list_t *dupattrs(const attr_list_t *list) +typedef int (*map_attrs_filter_t)(attr_list_t*,const attr_t*); + +static attr_list_t *map_attrs(const attr_list_t *list, map_attrs_filter_t filter) { attr_list_t *new_list; const attr_t *attr; + attr_t *new_attr; if (!list) return NULL; @@ -1247,7 +1253,8 @@ static attr_list_t *dupattrs(const attr_list_t *list) list_init( new_list ); LIST_FOR_EACH_ENTRY(attr, list, const attr_t, entry) { - attr_t *new_attr = xmalloc(sizeof(*new_attr)); + if (filter && !filter(new_list, attr)) continue; + new_attr = xmalloc(sizeof(*new_attr)); *new_attr = *attr; list_add_tail(new_list, &new_attr->entry); } @@ -1297,7 +1304,7 @@ static decl_spec_t *make_decl_spec(type_t *type, decl_spec_t *left, decl_spec_t { attr_list_t *attrs; declspec->type = duptype(type, 1); - attrs = dupattrs(type->attrs); + attrs = map_attrs(type->attrs, NULL); declspec->type->attrs = append_attr_list(attrs, declspec->attrs); declspec->attrs = NULL; } @@ -1734,6 +1741,18 @@ var_t *make_var(char *name) return v; } +static var_t *copy_var(var_t *src, char *name, map_attrs_filter_t attr_filter) +{ + var_t *v = xmalloc(sizeof(var_t)); + v->name = name; + v->type = src->type; + v->attrs = map_attrs(src->attrs, attr_filter); + v->eval = src->eval; + v->stgclass = src->stgclass; + v->loc_info = src->loc_info; + return v; +} + static declarator_list_t *append_declarator(declarator_list_t *list, declarator_t *d) { if (!d) return list; @@ -2742,6 +2761,87 @@ static void check_functions(const type_t *iface, int is_inside_library) } } +static char *concat_str(const char *prefix, const char *str) +{ + char *ret = xmalloc(strlen(prefix) + strlen(str) + 1); + strcpy(ret, prefix); + strcat(ret, str); + return ret; +} + +static int async_iface_attrs(attr_list_t *attrs, const attr_t *attr) +{ + switch(attr->type) + { + case ATTR_UUID: + return 0; + case ATTR_ASYNCUUID: + append_attr(attrs, make_attrp(ATTR_UUID, attr->u.pval)); + return 0; + default: + return 1; + } +} + +static int arg_in_attrs(attr_list_t *attrs, const attr_t *attr) +{ + return attr->type != ATTR_OUT && attr->type != ATTR_RETVAL; +} + +static int arg_out_attrs(attr_list_t *attrs, const attr_t *attr) +{ + return attr->type != ATTR_IN; +} + +static void check_async_uuid(type_t *iface) +{ + statement_list_t *stmts = NULL; + statement_t *stmt; + type_t *async_iface; + type_t *inherit; + + if (!is_attr(iface->attrs, ATTR_ASYNCUUID)) return; + + inherit = iface->details.iface->inherit; + if (inherit && strcmp(inherit->name, "IUnknown")) + inherit = inherit->details.iface->async_iface; + if (!inherit) + error_loc("async_uuid applied to an interface with incompatible parent\n"); + + async_iface = get_type(TYPE_INTERFACE, concat_str("Async", iface->name), iface->namespace, 0); + async_iface->attrs = map_attrs(iface->attrs, async_iface_attrs); + + STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) + { + var_t *begin_func, *finish_func, *func = stmt->u.var, *arg; + var_list_t *begin_args = NULL, *finish_args = NULL, *args; + + args = func->type->details.function->args; + if (args) LIST_FOR_EACH_ENTRY(arg, args, var_t, entry) + { + if (is_attr(arg->attrs, ATTR_IN) || !is_attr(arg->attrs, ATTR_OUT)) + begin_args = append_var(begin_args, copy_var(arg, strdup(arg->name), arg_in_attrs)); + if (is_attr(arg->attrs, ATTR_OUT)) + finish_args = append_var(finish_args, copy_var(arg, strdup(arg->name), arg_out_attrs)); + } + + begin_func = copy_var(func, concat_str("Begin_", func->name), NULL); + begin_func->type = type_new_function(begin_args); + begin_func->type->attrs = func->attrs; + begin_func->type->details.function->retval = func->type->details.function->retval; + stmts = append_statement(stmts, make_statement_declaration(begin_func)); + + finish_func = copy_var(func, concat_str("Finish_", func->name), NULL); + finish_func->type = type_new_function(finish_args); + finish_func->type->attrs = func->attrs; + finish_func->type->details.function->retval = func->type->details.function->retval; + stmts = append_statement(stmts, make_statement_declaration(finish_func)); + } + + type_interface_define(async_iface, inherit, stmts); + iface->details.iface->async_iface = async_iface->details.iface->async_iface = async_iface; +} + static void check_statements(const statement_list_t *stmts, int is_inside_library) { const statement_t *stmt; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 10657b0..b93806b 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -444,6 +444,7 @@ void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stm iface->details.iface->stmts = stmts; iface->details.iface->inherit = inherit; iface->details.iface->disp_inherit = NULL; + iface->details.iface->async_iface = NULL; iface->defined = TRUE; compute_method_indexes(iface); } @@ -457,6 +458,7 @@ void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *met iface->details.iface->inherit = find_type("IDispatch", NULL, 0); if (!iface->details.iface->inherit) error_loc("IDispatch is undefined\n"); iface->details.iface->disp_inherit = NULL; + iface->details.iface->async_iface = NULL; iface->defined = TRUE; compute_method_indexes(iface); } @@ -470,6 +472,7 @@ void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface) dispiface->details.iface->inherit = find_type("IDispatch", NULL, 0); if (!dispiface->details.iface->inherit) error_loc("IDispatch is undefined\n"); dispiface->details.iface->disp_inherit = iface; + dispiface->details.iface->async_iface = NULL; dispiface->defined = TRUE; compute_method_indexes(dispiface); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index b4eb003..08584de 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -344,6 +344,7 @@ struct iface_details var_list_t *disp_props; struct _type_t *inherit; struct _type_t *disp_inherit; + struct _type_t *async_iface; }; struct module_details

1 0

Dmitry Timoshkov : server: Map FILE_NOTIFY_CHANGE_LAST_ACCESS to IN_MODIFY.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: bfa98dbb1ba8db7c43a16ad520c65fcdc00c7769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfa98dbb1ba8db7c43a16ad5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 6 17:05:56 2018 +0300 server: Map FILE_NOTIFY_CHANGE_LAST_ACCESS to IN_MODIFY. Using IN_ACCESS leads to generating stray change notifications. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/change.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/change.c b/server/change.c index 3335e7a..3dd52aa 100644 --- a/server/change.c +++ b/server/change.c @@ -742,11 +742,9 @@ static unsigned int filter_from_event( struct inotify_event *ie ) if (ie->mask & (IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE | IN_CREATE)) filter |= FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME; if (ie->mask & IN_MODIFY) - filter |= FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE; + filter |= FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_LAST_ACCESS; if (ie->mask & IN_ATTRIB) filter |= FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SECURITY; - if (ie->mask & IN_ACCESS) - filter |= FILE_NOTIFY_CHANGE_LAST_ACCESS; if (ie->mask & IN_CREATE) filter |= FILE_NOTIFY_CHANGE_CREATION; @@ -979,7 +977,7 @@ static int map_flags( unsigned int filter ) if (filter & FILE_NOTIFY_CHANGE_LAST_WRITE) mask |= IN_MODIFY; if (filter & FILE_NOTIFY_CHANGE_LAST_ACCESS) - mask |= IN_ACCESS; + mask |= IN_MODIFY; if (filter & FILE_NOTIFY_CHANGE_SECURITY) mask |= IN_ATTRIB;

1 0

Nikolay Sivov : user32/tests: Fix Listbox test failures on some configurations.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 54cd4464c68fca8639cda848c1ab43db39c380cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=54cd4464c68fca8639cda848… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 7 14:52:35 2018 +0300 user32/tests: Fix Listbox test failures on some configurations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index dfa8de7..019d284 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -741,6 +741,7 @@ static void test_listbox_item_data(void) static void test_listbox_LB_DIR(void) { + char path[MAX_PATH], curdir[MAX_PATH]; HWND hList; int res, itemCount; int itemCount_justFiles; @@ -753,6 +754,16 @@ static void test_listbox_LB_DIR(void) char driveletter; const char *wildcard = "*"; HANDLE file; + BOOL ret; + + GetCurrentDirectoryA(ARRAY_SIZE(curdir), curdir); + + GetTempPathA(ARRAY_SIZE(path), path); + ret = SetCurrentDirectoryA(path); + ok(ret, "Failed to set current directory.\n"); + + ret = CreateDirectoryA("lb_dir_test", NULL); + ok(ret, "Failed to create test directory.\n"); file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); @@ -1084,11 +1095,11 @@ static void test_listbox_LB_DIR(void) itemCount, itemCount_allDirs); ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) returned incorrect index!\n"); - if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ + if (itemCount) { memset(pathBuffer, 0, MAX_PATH); SendMessageA(hList, LB_GETTEXT, 0, (LPARAM)pathBuffer); - ok( !strcmp(pathBuffer, "[..]"), "First element is not [..]\n"); + ok( !strcmp(pathBuffer, "[..]"), "First element is %s, not [..]\n", pathBuffer); } /* This tests behavior when no files match the wildcard */ @@ -1172,6 +1183,9 @@ static void test_listbox_LB_DIR(void) DestroyWindow(hList); DeleteFileA( "wtest1.tmp.c" ); + RemoveDirectoryA("lb_dir_test"); + + SetCurrentDirectoryA(curdir); } static HWND g_listBox;

1 0