February 2021 - Wine-Commits

Rémi Bernon : include: Define DECLSPEC_SELECTANY on MinGW.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 9138508a9430c42be040b01855359283276b3f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9138508a9430c42be040b018… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 29 09:50:07 2021 +0100 include: Define DECLSPEC_SELECTANY on MinGW. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 5b3efe61385..bb045fa2745 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -110,6 +110,8 @@ extern "C" { #ifndef DECLSPEC_SELECTANY #if defined(_MSC_VER) && (_MSC_VER >= 1100) #define DECLSPEC_SELECTANY __declspec(selectany) +#elif defined(__MINGW32__) +#define DECLSPEC_SELECTANY __attribute__((selectany)) #else #define DECLSPEC_SELECTANY #endif

1 0

Rémi Bernon : widl: Support WinRT eventadd/eventremove attributes.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 8233b3d537eed2aa69d739df67a99a095dd7764b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8233b3d537eed2aa69d739df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 29 09:50:06 2021 +0100 widl: Support WinRT eventadd/eventremove attributes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 4 ++++ tools/widl/parser.l | 2 ++ tools/widl/parser.y | 7 +++++++ tools/widl/widltypes.h | 2 ++ 4 files changed, 15 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index ad205df0d05..63389440c94 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -185,6 +185,10 @@ const char *get_name(const var_t *v) { static char *buffer; free( buffer ); + if (is_attr( v->attrs, ATTR_EVENTADD )) + return buffer = strmake( "add_%s", v->name ); + if (is_attr( v->attrs, ATTR_EVENTREMOVE )) + return buffer = strmake( "remove_%s", v->name ); if (is_attr( v->attrs, ATTR_PROPGET )) return buffer = strmake( "get_%s", v->name ); if (is_attr( v->attrs, ATTR_PROPPUT )) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 450d92f5926..7e20d30e7f0 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -359,6 +359,8 @@ static const struct keyword attr_keywords[] = {"encode", tENCODE, 0}, {"endpoint", tENDPOINT, 0}, {"entry", tENTRY, 0}, + {"eventadd", tEVENTADD, 1}, + {"eventremove", tEVENTREMOVE, 1}, {"exclusiveto", tEXCLUSIVETO, 1}, {"explicit_handle", tEXPLICITHANDLE, 0}, {"fault_status", tFAULTSTATUS, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ef54bf13ded..480552e3723 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -197,6 +197,7 @@ static typelib_t *current_typelib; %token tDLLNAME tDONTFREE tDOUBLE tDUAL %token tENABLEALLOCATE tENCODE tENDPOINT %token tENTRY tENUM tERRORSTATUST +%token tEVENTADD tEVENTREMOVE %token tEXCLUSIVETO %token tEXPLICITHANDLE tEXTERN %token tFALSE @@ -572,6 +573,8 @@ attribute: { $$ = NULL; } | tENCODE { $$ = make_attr(ATTR_ENCODE); } | tENDPOINT '(' str_list ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } | tENTRY '(' expr_const ')' { $$ = make_attrp(ATTR_ENTRY, $3); } + | tEVENTADD { $$ = make_attr(ATTR_EVENTADD); } + | tEVENTREMOVE { $$ = make_attr(ATTR_EVENTREMOVE); } | tEXCLUSIVETO '(' decl_spec ')' { if ($3->type->type_type != TYPE_RUNTIMECLASS) error_loc("type %s is not a runtimeclass\n", $3->type->name); $$ = make_attrp(ATTR_EXCLUSIVETO, $3->type); } @@ -2258,6 +2261,8 @@ struct allowed_attr allowed_attr[] = /* ATTR_ENCODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "encode" }, /* ATTR_ENDPOINT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "endpoint" }, /* ATTR_ENTRY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "entry" }, + /* ATTR_EVENTADD */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "eventadd" }, + /* ATTR_EVENTREMOVE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "eventremove" }, /* ATTR_EXCLUSIVETO */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "exclusive_to" }, /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, @@ -2932,6 +2937,8 @@ static void check_functions(const type_t *iface, int is_inside_library) { if (func == func_iter) break; if (strcmp(func->name, func_iter->name)) continue; + if (is_attr(func->attrs, ATTR_EVENTADD) != is_attr(func_iter->attrs, ATTR_EVENTADD)) continue; + if (is_attr(func->attrs, ATTR_EVENTREMOVE) != is_attr(func_iter->attrs, ATTR_EVENTREMOVE)) continue; if (is_attr(func->attrs, ATTR_PROPGET) != is_attr(func_iter->attrs, ATTR_PROPGET)) continue; if (is_attr(func->attrs, ATTR_PROPPUT) != is_attr(func_iter->attrs, ATTR_PROPPUT)) continue; if (is_attr(func->attrs, ATTR_PROPPUTREF) != is_attr(func_iter->attrs, ATTR_PROPPUTREF)) continue; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7b634c82242..0fba33d6a09 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -103,6 +103,8 @@ enum attr_type ATTR_ENCODE, ATTR_ENDPOINT, ATTR_ENTRY, + ATTR_EVENTADD, + ATTR_EVENTREMOVE, ATTR_EXCLUSIVETO, ATTR_EXPLICIT_HANDLE, ATTR_FAULTSTATUS,

1 0

Francois Gouget : winetest/dissect: Don't issue multiple errors in check_unit().
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: tools Branch: master Commit: e202221249991184a8bbf974bde85acaee33d56f URL: https://source.winehq.org/git/tools.git/?a=commit;h=e202221249991184a8bbf97… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 1 12:58:55 2021 +0100 winetest/dissect: Don't issue multiple errors in check_unit(). Don't complain about misplaced lines after the first one has been reported (or if the test has already been tagged as broken for some other reason, e.g. missing start line). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 27bcf17..12a939d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -483,7 +483,7 @@ sub add_test_line($$) sub check_unit($$) { my ($l_unit, $l_type) = @_; - if (!$units{$l_unit}) + if (!$units{$l_unit} and !$broken) { add_test_line("end", "Misplaced $l_type message\n"); $extra_failures++;

1 0

Francois Gouget : testbot/TestWTBS: Allow mission-specific directives, e.g. for test=module.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: tools Branch: master Commit: 6c4b3a308721c8c21806781de0ec4af03288fb7f URL: https://source.winehq.org/git/tools.git/?a=commit;h=6c4b3a308721c8c21806781… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 1 12:02:45 2021 +0100 testbot/TestWTBS: Allow mission-specific directives, e.g. for test=module. A different set of tests are run depending on whether a VM's mission is test=test (the default) or test=module. Being unable to distinguish these two cases prevents checking that the right set of test units is being run in many cases. So add support for the wine:build, wine:test, wine:module categories to allow providing specific checks for the test=build/test/module cases respectively. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 184 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 131 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=6c4b3a308721c8c2180…

1 0

Francois Gouget : testbot/LogUtils: Always set IsWineTest in _CheckUnit().
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: tools Branch: master Commit: c9aa4dbf830563f13b53a1c7561b89569cc92412 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c9aa4dbf830563f13b53a1c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 1 12:58:32 2021 +0100 testbot/LogUtils: Always set IsWineTest in _CheckUnit(). _CheckUnit() is only called on Wine test lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 15ec31a..2f30493 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -384,13 +384,11 @@ sub _CheckUnit($$$$) { my ($LogInfo, $Cur, $Unit, $Type) = @_; - if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") - { - $LogInfo->{IsWineTest} = 1; - } - # To avoid issuing many duplicate errors, - # only report the first misplaced message. - elsif ($LogInfo->{IsWineTest} and !$Cur->{IsBroken}) + # _CheckUnit() is only called for Wine test lines. + $LogInfo->{IsWineTest} = 1; + + # Only report the first misplaced message to avoid duplicate errors. + if (!$Cur->{Units}->{$Unit} and $Cur->{Unit} ne "" and !$Cur->{IsBroken}) { _AddExtra($LogInfo, "contains a misplaced $Type message for $Unit", $Cur); $Cur->{IsBroken} = 1;

1 0