wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Zebediah Figura : widl: Create exactly one type_t object per named enum type.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 0aa6049c8d46dd6d4e92c30f7b0380d1e5f46af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aa6049c8d46dd6d4e92c30f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 21:17:39 2019 -0500 widl: Create exactly one type_t object per named enum type. Based on a patch by Richard Pospesel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47035 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index a7fd561..faa5820 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -265,25 +265,27 @@ type_t *type_new_void(void) type_t *type_new_enum(const char *name, struct namespace *namespace, int defined, var_list_t *enums) { - type_t *tag_type = name ? find_type(name, namespace, tsENUM) : NULL; - type_t *t = make_type(TYPE_ENUM); - t->name = name; - t->namespace = namespace; - - if (tag_type && tag_type->details.enumeration) - t->details.enumeration = tag_type->details.enumeration; - else if (defined) + type_t *t = NULL; + + if (name) + t = find_type(name, namespace,tsENUM); + + if (!t) + { + t = make_type(TYPE_ENUM); + t->name = name; + t->namespace = namespace; + if (name) + reg_type(t, name, namespace, tsENUM); + } + + if (!t->defined && defined) { t->details.enumeration = xmalloc(sizeof(*t->details.enumeration)); t->details.enumeration->enums = enums; t->defined = TRUE; } - if (name) - { - if (defined) - reg_type(t, name, namespace, tsENUM); - } return t; }

1 0

Zebediah Figura : widl: Create exactly one type_t object per named union type.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 833639bd09a9df278a56553ced4b080699dc5313 URL: https://source.winehq.org/git/wine.git/?a=commit;h=833639bd09a9df278a56553c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 21:17:38 2019 -0500 widl: Create exactly one type_t object per named union type. Based on a patch by Richard Pospesel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 38 ------------------------------ tools/widl/typetree.c | 63 ++++++++++++++++++++++++++++++++------------------ tools/widl/widltypes.h | 1 - 3 files changed, 41 insertions(+), 61 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9db8ebd..a52afc7 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -50,10 +50,6 @@ struct _import_t int import_performed; }; -typelist_t incomplete_types = LIST_INIT(incomplete_types); - -static void fix_incomplete_types(type_t *complete_type); - static str_list_t *append_str(str_list_t *list, char *str); static attr_list_t *append_attr(attr_list_t *list, attr_t *attr); static attr_list_t *append_attr_list(attr_list_t *new_list, attr_list_t *old_list); @@ -1880,41 +1876,9 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in nt->t = t; nt->next = namespace->type_hash[hash]; namespace->type_hash[hash] = nt; - if ((t == tsUNION)) - fix_incomplete_types(type); return type; } -static int is_incomplete(const type_t *t) -{ - return !t->defined && - (type_get_type_detect_alias(t) == TYPE_STRUCT || - type_get_type_detect_alias(t) == TYPE_UNION || - type_get_type_detect_alias(t) == TYPE_ENCAPSULATED_UNION); -} - -void add_incomplete(type_t *t) -{ - struct typenode *tn = xmalloc(sizeof *tn); - tn->type = t; - list_add_tail(&incomplete_types, &tn->entry); -} - -static void fix_incomplete_types(type_t *complete_type) -{ - struct typenode *tn, *next; - - LIST_FOR_EACH_ENTRY_SAFE(tn, next, &incomplete_types, struct typenode, entry) - { - if (type_is_equal(complete_type, tn->type)) - { - tn->type->details.structure = complete_type->details.structure; - list_remove(&tn->entry); - free(tn); - } - } -} - static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, attr_list_t *attrs) { declarator_t *decl; @@ -1966,8 +1930,6 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at cur = type_new_alias(&name->declspec, name->name); cur->attrs = attrs; - if (is_incomplete(cur)) - add_incomplete(cur); reg_type(cur, cur->name, current_namespace, 0); } } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 05e9684..a7fd561 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -283,8 +283,6 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined { if (defined) reg_type(t, name, namespace, tsENUM); - else - add_incomplete(t); } return t; } @@ -317,36 +315,57 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields) { - type_t *tag_type = name ? find_type(name, NULL, tsUNION) : NULL; - type_t *t = make_type(TYPE_UNION); - t->name = name; - if (tag_type && tag_type->details.structure) - t->details.structure = tag_type->details.structure; - else if (defined) + type_t *t = NULL; + + if (name) + t = find_type(name, NULL, tsUNION); + + if (!t) + { + t = make_type(TYPE_UNION); + t->name = name; + if (name) + reg_type(t, name, NULL, tsUNION); + } + + if (!t->defined && defined) { t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = fields; t->defined = TRUE; } - if (name) - { - if (defined) - reg_type(t, name, NULL, tsUNION); - else - add_incomplete(t); - } + return t; } type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases) { - type_t *t = get_type(TYPE_ENCAPSULATED_UNION, name, NULL, tsUNION); - if (!union_field) union_field = make_var( xstrdup("tagged_union") ); - union_field->declspec.type = type_new_nonencapsulated_union(NULL, TRUE, cases); - t->details.structure = xmalloc(sizeof(*t->details.structure)); - t->details.structure->fields = append_var( NULL, switch_field ); - t->details.structure->fields = append_var( t->details.structure->fields, union_field ); - t->defined = TRUE; + type_t *t = NULL; + + if (name) + t = find_type(name, NULL, tsUNION); + + if (!t) + { + t = make_type(TYPE_ENCAPSULATED_UNION); + t->name = name; + if (name) + reg_type(t, name, NULL, tsUNION); + } + t->type_type = TYPE_ENCAPSULATED_UNION; + + if (!t->defined) + { + if (!union_field) + union_field = make_var(xstrdup("tagged_union")); + union_field->declspec.type = type_new_nonencapsulated_union(NULL, TRUE, cases); + + t->details.structure = xmalloc(sizeof(*t->details.structure)); + t->details.structure->fields = append_var(NULL, switch_field); + t->details.structure->fields = append_var(t->details.structure->fields, union_field); + t->defined = TRUE; + } + return t; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7a7bd89..5e28329 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -596,7 +596,6 @@ type_t *find_type(const char *name, struct namespace *namespace, int t); type_t *make_type(enum type_type type); type_t *get_type(enum type_type type, char *name, struct namespace *namespace, int t); type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, int t); -void add_incomplete(type_t *t); var_t *make_var(char *name); var_list_t *append_var(var_list_t *list, var_t *var);

1 0

Zebediah Figura : widl: Create exactly one type_t object per named structure type.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 42321d7a11065d812c3ceaddc4a1d3c821e07c53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42321d7a11065d812c3ceadd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 21:17:37 2019 -0500 widl: Create exactly one type_t object per named structure type. Regardless of whether we are writing a typelib. Based on a patch by Richard Pospesel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- tools/widl/typetree.c | 30 +++++++++++++----------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bdbd440..9db8ebd 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1880,7 +1880,7 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in nt->t = t; nt->next = namespace->type_hash[hash]; namespace->type_hash[hash] = nt; - if ((t == tsSTRUCT || t == tsUNION)) + if ((t == tsUNION)) fix_incomplete_types(type); return type; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index a066125..05e9684 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -291,31 +291,27 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields) { - type_t *tag_type = name ? find_type(name, namespace, tsSTRUCT) : NULL; - type_t *t; + type_t *t = NULL; - /* avoid creating duplicate typelib type entries */ - if (tag_type && do_typelib) return tag_type; + if (name) + t = find_type(name, namespace, tsSTRUCT); - t = make_type(TYPE_STRUCT); - t->name = name; - t->namespace = namespace; + if (!t) + { + t = make_type(TYPE_STRUCT); + t->name = name; + t->namespace = namespace; + if (name) + reg_type(t, name, namespace, tsSTRUCT); + } - if (tag_type && tag_type->details.structure) - t->details.structure = tag_type->details.structure; - else if (defined) + if (!t->defined && defined) { t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = fields; t->defined = TRUE; } - if (name) - { - if (defined) - reg_type(t, name, namespace, tsSTRUCT); - else - add_incomplete(t); - } + return t; }

1 0

Zebediah Figura : widl: Track whether the type has been defined yet in the statement_t and var_t structures.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 55234f65a8c5dbd5b3cb08775d9267e8724e63b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55234f65a8c5dbd5b3cb0877… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 21:17:36 2019 -0500 widl: Track whether the type has been defined yet in the statement_t and var_t structures. Based on a patch by Richard Pospesel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47149 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 37 +++++++++++++++++++------------------ tools/widl/parser.y | 10 +++++++--- tools/widl/widltypes.h | 3 +++ 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index c20fe69..61fadcf 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -43,7 +43,7 @@ user_type_list_t user_type_list = LIST_INIT(user_type_list); context_handle_list_t context_handle_list = LIST_INIT(context_handle_list); generic_handle_list_t generic_handle_list = LIST_INIT(generic_handle_list); -static void write_type_def_or_decl(FILE *f, const decl_spec_t *t, int field, const char *name); +static void write_type_v(FILE *f, const decl_spec_t *t, int is_field, int declonly, const char *name); static void indent(FILE *h, int delta) { @@ -252,7 +252,7 @@ static void write_fields(FILE *h, var_list_t *fields) default: ; } - write_type_def_or_decl(h, &v->declspec, TRUE, name); + write_type_v(h, &v->declspec, TRUE, v->declonly, name); fprintf(h, ";\n"); } } @@ -328,7 +328,8 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i else { switch (type_get_type_detect_alias(t)) { case TYPE_ENUM: - if (!declonly && t->defined && !t->written) { + if (!declonly && !t->written) { + assert(t->defined); if (name) fprintf(h, "enum %s {\n", name); else fprintf(h, "enum {\n"); t->written = TRUE; @@ -341,7 +342,8 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i break; case TYPE_STRUCT: case TYPE_ENCAPSULATED_UNION: - if (!declonly && t->defined && !t->written) { + if (!declonly && !t->written) { + assert(t->defined); if (name) fprintf(h, "struct %s {\n", name); else fprintf(h, "struct {\n"); t->written = TRUE; @@ -356,7 +358,8 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i else fprintf(h, "struct %s", name ? name : ""); break; case TYPE_UNION: - if (!declonly && t->defined && !t->written) { + if (!declonly && !t->written) { + assert(t->defined); if (t->name) fprintf(h, "union %s {\n", t->name); else fprintf(h, "union {\n"); t->written = TRUE; @@ -547,12 +550,7 @@ static void write_type_v(FILE *h, const decl_spec_t *ds, int is_field, int declo write_type_right(h, t, is_field); } -static void write_type_def_or_decl(FILE *f, const decl_spec_t *t, int field, const char *name) -{ - write_type_v(f, t, field, FALSE, name); -} - -static void write_type_definition(FILE *f, type_t *t) +static void write_type_definition(FILE *f, type_t *t, int declonly) { int in_namespace = t->namespace && !is_global_namespace(t->namespace); int save_written = t->written; @@ -564,14 +562,14 @@ static void write_type_definition(FILE *f, type_t *t) write_namespace_start(f, t->namespace); } indent(f, 0); - write_type_left(f, &ds, NAME_DEFAULT, FALSE, TRUE); + write_type_left(f, &ds, NAME_DEFAULT, declonly, TRUE); fprintf(f, ";\n"); if(in_namespace) { t->written = save_written; write_namespace_end(f, t->namespace); fprintf(f, "extern \"C\" {\n"); fprintf(f, "#else\n"); - write_type_left(f, &ds, NAME_C, FALSE, TRUE); + write_type_left(f, &ds, NAME_C, declonly, TRUE); fprintf(f, ";\n"); fprintf(f, "#endif\n\n"); } @@ -805,10 +803,10 @@ static void write_generic_handle_routines(FILE *header) } } -static void write_typedef(FILE *header, type_t *type) +static void write_typedef(FILE *header, type_t *type, int declonly) { fprintf(header, "typedef "); - write_type_def_or_decl(header, type_alias_get_aliasee(type), FALSE, type->name); + write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name); fprintf(header, ";\n"); } @@ -852,7 +850,7 @@ static void write_declaration(FILE *header, const var_t *v) fprintf(header, "extern "); break; } - write_type_def_or_decl(header, &v->declspec, FALSE, v->name); + write_type_v(header, &v->declspec, FALSE, v->declonly, v->name); fprintf(header, ";\n\n"); } } @@ -1092,6 +1090,9 @@ void write_args(FILE *h, const var_list_t *args, const char *name, int method, i } else fprintf(h, ","); } + /* In theory we should be writing the definition using write_type_v(..., arg->declonly), + * but that causes redefinition in e.g. proxy files. In fact MIDL disallows + * defining UDTs inside of an argument list. */ write_type_decl(h, &arg->declspec, arg->name); if (method == 2) { const expr_t *expr = get_attrp(arg->attrs, ATTR_DEFAULTVALUE); @@ -1733,7 +1734,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons write_coclass(header, stmt->u.type); else { - write_type_definition(header, stmt->u.type); + write_type_definition(header, stmt->u.type, stmt->declonly); } break; case STMT_TYPEREF: @@ -1754,7 +1755,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons { const type_list_t *type_entry = stmt->u.type_list; for (; type_entry; type_entry = type_entry->next) - write_typedef(header, type_entry->type); + write_typedef(header, type_entry->type, stmt->declonly); break; } case STMT_LIBRARY: diff --git a/tools/widl/parser.y b/tools/widl/parser.y index afbe2b1..bdbd440 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -116,7 +116,7 @@ static statement_t *make_statement_pragma(const char *str); static statement_t *make_statement_cppquote(const char *str); static statement_t *make_statement_importlib(const char *str); static statement_t *make_statement_module(type_t *type); -static statement_t *make_statement_typedef(var_list_t *names); +static statement_t *make_statement_typedef(var_list_t *names, int declonly); static statement_t *make_statement_import(const char *str); static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt); static statement_list_t *append_statements(statement_list_t *, statement_list_t *); @@ -1115,7 +1115,7 @@ type: tVOID { $$ = type_new_void(); } typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list { $1 = append_attribs($1, $3); reg_typedefs($4, $5, check_typedef_attrs($1)); - $$ = make_statement_typedef($5); + $$ = make_statement_typedef($5, !$4->type->defined); } ; @@ -1546,6 +1546,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator v->declspec.type = decl->type; v->declspec.qualifier = decl->qualifier; v->attrs = attrs; + v->declonly = !type->defined; if (is_attr(type->attrs, ATTR_CALLCONV) && !is_func(type)) error_loc("calling convention applied to non-function type\n"); @@ -1750,6 +1751,7 @@ var_t *make_var(char *name) v->attrs = NULL; v->eval = NULL; init_loc_info(&v->loc_info); + v->declonly = FALSE; return v; } @@ -2912,6 +2914,7 @@ static statement_t *make_statement_type_decl(type_t *type) { statement_t *stmt = make_statement(STMT_TYPE); stmt->u.type = type; + stmt->declonly = !type->defined; return stmt; } @@ -2982,7 +2985,7 @@ static statement_t *make_statement_module(type_t *type) return stmt; } -static statement_t *make_statement_typedef(declarator_list_t *decls) +static statement_t *make_statement_typedef(declarator_list_t *decls, int declonly) { declarator_t *decl, *next; statement_t *stmt; @@ -2993,6 +2996,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) stmt = make_statement(STMT_TYPEDEF); stmt->u.type_list = NULL; type_list = &stmt->u.type_list; + stmt->declonly = declonly; LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 3886360..7a7bd89 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -478,6 +478,8 @@ struct _var_t { struct _loc_info_t loc_info; + unsigned int declonly : 1; + /* parser-internal */ struct list entry; }; @@ -560,6 +562,7 @@ struct _statement_t { typelib_t *lib; type_list_t *type_list; } u; + unsigned int declonly : 1; /* for STMT_TYPE and STMT_TYPEDEF */ }; struct _warning_t {

1 0

Francois Gouget : testbot: Remove support for TestAgent's old "skipped" lines.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: tools Branch: master Commit: 3e38ebfe6bfeb32dd1db0f73dfb7964ff4ac4ae5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3e38ebfe6bfeb32dd1db0f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 20 12:08:48 2019 +0200 testbot: Remove support for TestAgent's old "skipped" lines. TestAgent was fixed a couple of years ago so the TestBot should not have to deal with such lines anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index b75607a..3dca2e4 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -351,16 +351,14 @@ sub ParseWineTestReport($$$) _CheckUnit($Parser, $Cur, $1, "todo"); $Cur->{LineTodos}++; } - # TestLauncher's skip message is quite broken - elsif ($Line =~ /^([_a-z0-9]+)(?:\.c)?:\d+:? Tests? skipped: / or + elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})(?:\.c)?:\d+:? Tests? skipped: /)) + $Line =~ /($Cur->{Unit})\.c:\d+: Tests skipped: /)) { my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they - # are misreported (see _CloseTestUnit). Also TestLauncher uses the wrong - # name in its skip message when skipping tests. - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "" or $Unit eq $Cur->{Dll}) + # are misreported (see _CloseTestUnit). + if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") { $Cur->{LineSkips}++; } @@ -396,9 +394,8 @@ sub ParseWineTestReport($$$) my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); # Dlls that have only one test unit will run it even if there is - # no argument. Also TestLauncher uses the wrong name in its test - # summary line when skipping tests. - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "" or $Unit eq $Cur->{Dll}) + # no argument. + if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") { # There may be more than one summary line due to child processes $Cur->{Pids}->{$Pid || 0} = 1;

1 0

Francois Gouget : winetest: Tweak dissect to better match the TestBot WineTest log parser.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: tools Branch: master Commit: fe8341c87adc6bb18172e0341fc733cccec579a9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fe8341c87adc6bb18172e03… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 20 12:08:59 2019 +0200 winetest: Tweak dissect to better match the TestBot WineTest log parser. This puts exception handling in the same relative spot, making it easier to compare the two codebases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2bd95eb..e5b2815 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -609,21 +609,6 @@ while ($line = <IN>) { $rc = 0; } } - elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or - ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) - { - my ($l_pid, $l_unit) = ($1, $2); - if ($l_unit eq $unit) - { - # This also replaces a test summary line. - $pids{$l_pid || 0} = 1; - $s_failures++; - } - add_test_line("failed", escapeHTML($line)); - check_unit($l_unit, "unhandled exception"); - $failures++; - } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/ or ($unit ne "" and $line =~ /^(.*?)($unit)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) @@ -664,6 +649,21 @@ while ($line = <IN>) { get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); } + elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or + ($unit ne "" and + $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) + { + my ($l_pid, $l_unit) = ($1, $2); + if ($l_unit eq $unit) + { + # This also replaces a test summary line. + $pids{$l_pid || 0} = 1; + $s_failures++; + } + add_test_line("failed", escapeHTML($line)); + check_unit($l_unit, "unhandled exception"); + $failures++; + } elsif ($line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($unit ne "" and $line =~ /(?:([0-9a-f]+):)?($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./))

1 0

Francois Gouget : winetest: Add test instructions in the dissect and gather scripts.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: tools Branch: master Commit: 01ac22970306e3593a36c2a8b688bb9ab663d2d7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=01ac22970306e3593a36c2a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 20 12:08:22 2019 +0200 winetest: Add test instructions in the dissect and gather scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 6 ++++++ winetest/gather | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index a468812..2bd95eb 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -26,6 +26,12 @@ # where DIGIT is for resolving name clashes and data/BUILD/outdated is # created to signal the change in the given build. # +# To test this script: +# - Make sure $workdir is not set in winetest.conf +# - Put a test report in queue/rep1/report +# - Run ./dissect +# - Examine the result in data/ +# # Exit: 0 - successfully processed a report, call again # 1 - failed to process a report, call again # 2 - there was nothing to do diff --git a/winetest/gather b/winetest/gather index a894377..31ba8fa 100755 --- a/winetest/gather +++ b/winetest/gather @@ -25,6 +25,11 @@ # script. Races and concurrency problems must be dealt with on that higher # level. # +# To test this script: +# - Make sure $workdir is not set in winetest.conf +# - After running dissect, run ./gather +# - Examine the result in data/ +# # Exit: 0 - successfully processed a build, call again # 1 - should not happen # 2 - there was nothing to do

1 0

Andrey Gusev : twain_32: Add missing debugstr_a.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 5ea3a044b83c4cd55a3c647f5e80511a85b9f536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea3a044b83c4cd55a3c647f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Aug 19 20:36:18 2019 +0300 twain_32: Add missing debugstr_a. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/dsm_ctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 3f7ead4..45f227e 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -57,12 +57,12 @@ twain_add_onedriver(const char *dsname) { hmod = LoadLibraryA(dsname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", dsname); + ERR("Failed to load TWAIN Source %s\n", debugstr_a(dsname)); return; } dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry"); if (!dsEntry) { - ERR("Failed to find DS_Entry() in TWAIN DS %s\n", dsname); + ERR("Failed to find DS_Entry() in TWAIN DS %s\n", debugstr_a(dsname)); return; } /* Loop to do multiple detects, mostly for sane.ds and gphoto2.ds */ @@ -317,7 +317,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) } hmod = LoadLibraryA(devices[i].modname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", modname); + ERR("Failed to load TWAIN Source %s\n", debugstr_a(modname)); DSM_twCC = TWCC_OPERATIONERROR; HeapFree(GetProcessHeap(), 0, newSource); return TWRC_FAILURE;

1 0

Zebediah Figura : httpapi: Stub HttpRemoveUrl().
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 904c0dc050c89ae2729ad68b1fe74f19db302c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=904c0dc050c89ae2729ad68b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 7 21:10:15 2019 -0500 httpapi: Stub HttpRemoveUrl(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 2 +- dlls/httpapi/httpapi_main.c | 9 +++++++++ include/http.h | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index 98ed291..88bc324 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -36,7 +36,7 @@ @ stub HttpReceiveHttpResponse @ stub HttpReceiveRequestEntityBody @ stub HttpRemoveAllUrlsFromConfigGroup -@ stub HttpRemoveUrl +@ stdcall HttpRemoveUrl(ptr wstr) @ stub HttpRemoveUrlFromConfigGroup @ stub HttpSendHttpRequest @ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index e5c5808..429ae1a 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -183,6 +183,15 @@ ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved ) } /*********************************************************************** + * HttpRemoveUrl (HTTPAPI.@) + */ +ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) +{ + FIXME("queue %p, url %s, stub!\n", queue, debugstr_w(url)); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * HttpReceiveHttpRequest (HTTPAPI.@) */ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, diff --git a/include/http.h b/include/http.h index a57013f..84d3445 100644 --- a/include/http.h +++ b/include/http.h @@ -54,6 +54,8 @@ typedef struct _HTTPAPI_VERSION #define HTTP_SEND_RESPONSE_FLAG_PROCESS_RANGES 0x00000020 #define HTTP_SEND_RESPONSE_FLAG_OPAQUE 0x00000040 +#define HTTP_URL_FLAG_REMOVE_ALL 0x0000001 + typedef enum _HTTP_SERVICE_CONFIG_ID { HttpServiceConfigIPListenList, @@ -404,6 +406,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);

1 0

Zebediah Figura : httpapi: Stub HttpSendHttpResponse().
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 43a3185eabd04835d2c338e751b0df75be88d978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a3185eabd04835d2c338e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 7 21:10:14 2019 -0500 httpapi: Stub HttpSendHttpResponse(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 2 +- dlls/httpapi/httpapi_main.c | 13 +++++++ include/http.h | 85 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index fd5dec9..98ed291 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -39,7 +39,7 @@ @ stub HttpRemoveUrl @ stub HttpRemoveUrlFromConfigGroup @ stub HttpSendHttpRequest -@ stub HttpSendHttpResponse +@ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) @ stub HttpSendRequestEntityBody @ stub HttpSendResponseEntityBody @ stub HttpSetAppPoolInformation diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 3739bbd..e5c5808 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -194,6 +194,19 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag } /*********************************************************************** + * HttpSendHttpResponse (HTTPAPI.@) + */ +ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, + HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, + void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data) +{ + FIXME("queue %p, id %s, flags %#x, response %p, cache_policy %p, " + "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p, stub!\n", + queue, wine_dbgstr_longlong(id), flags, response, cache_policy, ret_size, reserved1, reserved2, ovl, log_data); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * HttpCreateServerSession (HTTPAPI.@) */ ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG reserved ) diff --git a/include/http.h b/include/http.h index 85c82c5..a57013f 100644 --- a/include/http.h +++ b/include/http.h @@ -47,6 +47,13 @@ typedef struct _HTTPAPI_VERSION #define HTTP_REQUEST_FLAG_IP_ROUTED 0x00000002 #define HTTP_REQUEST_FLAG_HTTP2 0x00000004 +#define HTTP_SEND_RESPONSE_FLAG_DISCONNECT 0x00000001 +#define HTTP_SEND_RESPONSE_FLAG_MORE_DATA 0x00000002 +#define HTTP_SEND_RESPONSE_FLAG_BUFFER_DATA 0x00000004 +#define HTTP_SEND_RESPONSE_FLAG_ENABLE_NAGLING 0x00000008 +#define HTTP_SEND_RESPONSE_FLAG_PROCESS_RANGES 0x00000020 +#define HTTP_SEND_RESPONSE_FLAG_OPAQUE 0x00000040 + typedef enum _HTTP_SERVICE_CONFIG_ID { HttpServiceConfigIPListenList, @@ -311,6 +318,83 @@ typedef struct _HTTP_REQUEST_V2 typedef HTTP_REQUEST_V2 HTTP_REQUEST, *PHTTP_REQUEST; +typedef struct _HTTP_RESPONSE_HEADERS +{ + USHORT UnknownHeaderCount; + HTTP_UNKNOWN_HEADER *pUnknownHeaders; + USHORT TrailerCount; + HTTP_UNKNOWN_HEADER *pTrailers; + HTTP_KNOWN_HEADER KnownHeaders[HttpHeaderResponseMaximum]; +} HTTP_RESPONSE_HEADERS,*PHTTP_RESPONSE_HEADERS; + +typedef struct _HTTP_RESPONSE_V1 +{ + ULONG Flags; + HTTP_VERSION Version; + USHORT StatusCode; + USHORT ReasonLength; + const char *pReason; + HTTP_RESPONSE_HEADERS Headers; + USHORT EntityChunkCount; + HTTP_DATA_CHUNK *pEntityChunks; +} HTTP_RESPONSE_V1, *PHTTP_RESPONSE_V1; + +typedef enum _HTTP_RESPONSE_INFO_TYPE +{ + HttpResponseInfoTypeMultipleKnownHeaders = 0, + HttpResponseInfoTypeAuthenticationProperty, + HttpResponseInfoTypeQosProperty, + HttpResponseInfoTypeChannelBind, +} HTTP_RESPONSE_INFO_TYPE, *PHTTP_RESPONSE_INFO_TYPE; + +typedef struct _HTTP_RESPONSE_INFO +{ + HTTP_RESPONSE_INFO_TYPE Type; + ULONG Length; + void *pInfo; +} HTTP_RESPONSE_INFO, *PHTTP_RESPONSE_INFO; + +#ifdef __cplusplus +typedef struct _HTTP_RESPONSE_V2 : HTTP_RESPONSE_V1 +{ + USHORT ResponseInfoCount; + HTTP_RESPONSE_INFO *pResponseInfo; +} HTTP_RESPONSE_V2, *PHTTP_RESPONSE_V2; +#else +typedef struct _HTTP_RESPONSE_V2 +{ + HTTP_RESPONSE_V1 s; + USHORT ResponseInfoCount; + HTTP_RESPONSE_INFO *pResponseInfo; +} HTTP_RESPONSE_V2, *PHTTP_RESPONSE_V2; +#endif + +typedef HTTP_RESPONSE_V2 HTTP_RESPONSE, *PHTTP_RESPONSE; + +typedef enum _HTTP_CACHE_POLICY_TYPE +{ + HttpCachePolicyNocache, + HttpCachePolicyUserInvalidates, + HttpCachePolicyTimeToLive, + HttpCachePolicyMaximum, +} HTTP_CACHE_POLICY_TYPE, *PHTTP_CACHE_POLICY_TYPE; + +typedef struct _HTTP_CACHE_POLICY +{ + HTTP_CACHE_POLICY_TYPE Policy; + ULONG SecondsToLive; +} HTTP_CACHE_POLICY, *PHTTP_CACHE_POLICY; + +typedef enum _HTTP_LOG_DATA_TYPE +{ + HttpLogDataTypeFields = 0, +} HTTP_LOG_DATA_TYPE, *PHTTP_LOG_DATA_TYPE; + +typedef struct _HTTP_LOG_DATA +{ + HTTP_LOG_DATA_TYPE Type; +} HTTP_LOG_DATA, *PHTTP_LOG_DATA; + ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); @@ -320,6 +404,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); #ifdef __cplusplus

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
71
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 August 2019