February 2021 - Wine-commits

Rémi Bernon : configure: Silence a linker warning about no-PIC .text relocations.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: ac14ce8c79ebb8a2a882a5b483fa59476392b036 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac14ce8c79ebb8a2a882a5b4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 11:19:48 2021 +0100 configure: Silence a linker warning about no-PIC .text relocations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 28 +++++++++++++++++++++++++++- configure.ac | 4 +++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3f17db20fd6..8d782ad0353 100755 --- a/configure +++ b/configure @@ -9274,7 +9274,33 @@ fi case $host_cpu in *i[3456789]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" - LDDLLFLAGS="-fno-PIC" ;; + LDDLLFLAGS="-fno-PIC" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-PIC -Wl,-z,notext" >&5 +$as_echo_n "checking whether the compiler supports -fno-PIC -Wl,-z,notext... " >&6; } +if ${ac_cv_cflags__fno_PIC__Wl__z_notext+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-PIC -Wl,-z,notext" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fno_PIC__Wl__z_notext=yes +else + ac_cv_cflags__fno_PIC__Wl__z_notext=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_PIC__Wl__z_notext" >&5 +$as_echo "$ac_cv_cflags__fno_PIC__Wl__z_notext" >&6; } +if test "x$ac_cv_cflags__fno_PIC__Wl__z_notext" = xyes; then : + LDDLLFLAGS="$LDDLLFLAGS -Wl,-z,notext" +fi + ;; *) DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" ;; diff --git a/configure.ac b/configure.ac index 19db4f60b28..9d8f831e0fc 100644 --- a/configure.ac +++ b/configure.ac @@ -912,7 +912,9 @@ case $host_os in case $host_cpu in *i[[3456789]]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" - LDDLLFLAGS="-fno-PIC" ;; + LDDLLFLAGS="-fno-PIC" + WINE_TRY_CFLAGS([-fno-PIC -Wl,-z,notext],[LDDLLFLAGS="$LDDLLFLAGS -Wl,-z,notext"]) + ;; *) DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" ;;

1 0

Rémi Bernon : ntdll: Print a warning for thread rename exceptions.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 6edf3d3b09efe8b8350bddf068b895dd8fbf07c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6edf3d3b09efe8b8350bddf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:21:28 2021 +0100 ntdll: Print a warning for thread rename exceptions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 4 ++++ dlls/ntdll/signal_arm64.c | 4 ++++ dlls/ntdll/signal_i386.c | 4 ++++ dlls/ntdll/signal_x86_64.c | 4 ++++ include/wine/exception.h | 6 ++++++ programs/winedbg/debugger.h | 6 ------ programs/winedbg/gdbproxy.c | 5 +++-- programs/winedbg/tgt_active.c | 2 +- 8 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index b1544ba15fe..f4da2e5c71d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -160,6 +160,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE( " r0=%08x r1=%08x r2=%08x r3=%08x r4=%08x r5=%08x\n", diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 9db8a8b17b4..88e31d88f7b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -501,6 +501,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 93e03ae5b8b..a570be10024 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -192,6 +192,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n", diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7e39991ad1a..7a3fd4be204 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -538,6 +538,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", diff --git a/include/wine/exception.h b/include/wine/exception.h index a2b0bb08dc3..3d28ff6b110 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -302,6 +302,12 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) #define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ #define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ +/* Wine extension; Windows doesn't have a name for this code. This is an + undocumented exception understood by MS VC debugger, allowing the program + to name a particular thread. Search google.com or deja.com for "0x406d1388" + for more info. */ +#define EXCEPTION_WINE_NAME_THREAD 0x406D1388 + #ifdef __cplusplus } #endif diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ddac129bab5..05bf0c047ba 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -155,12 +155,6 @@ struct dbg_breakpoint #define CXX_EXCEPTION 0xe06d7363 #define CXX_FRAME_MAGIC 0x19930520 -/* Wine extension; Windows doesn't have a name for this code. This is an - undocumented exception understood by MS VC debugger, allowing the program - to name a particular thread. Search google.com or deja.com for "0x406d1388" - for more info. */ -#define EXCEPTION_NAME_THREAD 0x406D1388 - /* Helper structure */ typedef struct tagTHREADNAME_INFO { diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c51fd342496..3c1b3e85df8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -63,6 +63,7 @@ #include "windef.h" #include "winbase.h" #include "tlhelp32.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winedbg); @@ -349,7 +350,7 @@ static unsigned char signal_from_debug_event(DEBUG_EVENT* de) return SIGALRM; /* should not be here */ case EXCEPTION_INVALID_HANDLE: - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: return SIGTRAP; default: ERR("Unknown exception code 0x%08x\n", ec); @@ -363,7 +364,7 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e switch (rec->ExceptionCode) { - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: { const THREADNAME_INFO *threadname = (const THREADNAME_INFO *)rec->ExceptionInformation; struct dbg_thread *thread; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index d4e2d7d6347..e71f4615735 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -246,7 +246,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance case EXCEPTION_SINGLE_STEP: is_debug = TRUE; break; - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: pThreadName = (const THREADNAME_INFO*)(rec->ExceptionInformation); if (pThreadName->dwThreadID == -1) pThread = dbg_curr_thread;

1 0

Floris Renaud : Add Dutch translation.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: website Branch: master Commit: 5305e44227a52d437a3f80e25d771503fcbba9cb URL: https://source.winehq.org/git/website.git/?a=commit;h=5305e44227a52d437a3f8… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Feb 6 17:48:39 2021 +0100 Add Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/en/global/xml/trans/lang.xml | 2 + templates/nl/about.template | 68 ++++++++++++ templates/nl/announce.template | 7 ++ templates/nl/documentation.template | 30 ++++++ templates/nl/donate.template | 62 +++++++++++ templates/nl/forums.template | 109 ++++++++++++++++++++ templates/nl/getinvolved.template | 82 +++++++++++++++ templates/nl/global/404.template | 17 +++ templates/nl/global/xml/trans/global.xml | 18 ++++ templates/nl/help.template | 91 ++++++++++++++++ templates/nl/home.template | 171 +++++++++++++++++++++++++++++++ templates/nl/irc.template | 131 +++++++++++++++++++++++ templates/nl/lang.template | 12 +++ templates/nl/news.template | 7 ++ templates/nl/search.template | 17 +++ 15 files changed, 824 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=5305e44227a52d437…

1 0

Francois Gouget : testbot/TestWTBS: Update the description in the usage message.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: tools Branch: master Commit: 7456be821eda0684e170a93aefc9ae04d56a5415 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7456be821eda0684e170a93… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 8 15:21:03 2021 +0100 testbot/TestWTBS: Update the description in the usage message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 1cbec2e..4a4aba9 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -165,7 +165,12 @@ if (defined $Usage) } print "Usage: $name0 [--jobs RANGES] [--mbox FILE] [--help]\n"; print "\n"; - print "Tests the Patches subject parser.\n"; + print "Automate checking the Wine TestBot test Suite results.\n"; + print "\n"; + print "The expectations are described in the form of directives that specify\n"; + print "expected job, task, patch or webpatch property values; and errors or strings in\n"; + print "logs and reports.\n"; + print "For more details, see the documentation in the $name0 source.\n"; print "\n"; print "Where:\n"; print " --jobs RANGES Only check the jobs in one of the specified comma-separated\n";

1 0

Francois Gouget : testbot/TestWTBS: Allow side-loading of the TestWTBS directives.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: tools Branch: master Commit: fbd3cc15bb6ffd253b307e3ab443c5dffd602dc9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fbd3cc15bb6ffd253b307e3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 8 15:20:43 2021 +0100 testbot/TestWTBS: Allow side-loading of the TestWTBS directives. This allows checking the results of non-patch jobs, such as reporttest.exe runs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 4a4aba9..4837664 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -108,6 +108,7 @@ sub check_opt_val($$) } my $OptJobs; +my %OptJobInfoPath; my $OptMbox; while (@ARGV) { @@ -120,6 +121,15 @@ while (@ARGV) { $OptMbox = check_opt_val($Arg, $OptMbox); } + elsif ($Arg eq "--job-wtbs") + { + my $JobId = check_opt_val($Arg, undef); + if ($JobId) + { + my $Path = check_opt_val("$Arg $JobId", $OptJobInfoPath{$JobId}); + $OptJobInfoPath{$JobId} = $Path if ($Path); + } + } elsif ($Arg eq "--help") { $Usage = 0; @@ -163,7 +173,7 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [--jobs RANGES] [--mbox FILE] [--help]\n"; + print "Usage: $name0 [--jobs RANGES] [--job-wtbs ID PATH] [--mbox FILE] [--help]\n"; print "\n"; print "Automate checking the Wine TestBot test Suite results.\n"; print "\n"; @@ -179,6 +189,8 @@ if (defined $Usage) print " or of the form 'FIRST..LAST' where FIRST and LAST are either the\n"; print " empty string or a job id.\n"; print " --mbox FILE Check the TestBot's emails in this mbox-format file.\n"; + print " --job-wtbs ID PATH Use the specified file to load the directives for job ID.\n"; + print " This option can be specified multiple times.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -1057,6 +1069,11 @@ sub CheckJobTree($;$) return if ($CheckedJobs{$JobId}); $CheckedJobs{$JobId} = 1; + if (!$TestInfo and $OptJobInfoPath{$JobId}) + { + $TestInfo = LoadTestInfo($OptJobInfoPath{$JobId}); + } + my ($HasTask, $HasNewFailures); my $TestUnits = {}; my $Email = $Emails{$JobId};

1 0

Francois Gouget : testbot/reporttest: Remove tests for legacy TestLauncher and Wine versions.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: tools Branch: master Commit: 5985ad320c525d44998564e88d6989cba9f5a925 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5985ad320c525d44998564e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 8 15:21:53 2021 +0100 testbot/reporttest: Remove tests for legacy TestLauncher and Wine versions. Remove tests for line formats that neither the TestBot nor the WineTest website support anymore. This is the case of lines missing pids, run times or using signed exit codes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 64 +++++++--------------------------- 1 file changed, 12 insertions(+), 52 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index b541e41..c08b4d4 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -313,29 +313,10 @@ advpack:install start dlls/advpack/tests/install.c - 07b0:install: unhandled exception c0000005 at 0040167C advpack:install:07b0 done (-1073741819) in 0s -amstream:amstream start dlls/amstream/tests/amstream.c - ------ No pid at all ------ Expected assessement: Success -amstream: 152 tests executed (0 marked as todo, 0 failures), 0 skipped. -amstream:amstream done (0) in 0s - -apphelp:apphelp start dlls/apphelp/tests/apphelp.c - ------ A test unit with no execution time ------ Expected assessement: Success -0860:apphelp: 15 tests executed (0 marked as todo, 0 failures), 0 skipped. -apphelp:apphelp:0860 done (0) - -atl:atl_ax start dlls/atl/tests/atl_ax.c - ------ Pid on the test summary line, but no pid on the done one ------ Expected assessement: Success -0938:atl_ax: 12 tests executed (0 marked as todo, 0 failures), 0 skipped. -atl:atl_ax done (0) in 0s - -atl:module start dlls/atl/tests/module.c - ------ Pid on the done line, but no pid on the test summary line ------ Expected assessement: Success -module: 544 tests executed (0 marked as todo, 0 failures), 0 skipped. -atl:module:0920 done (0) in 0s +stub amstream:amstream +stub apphelp:apphelp +stub atl:atl_ax +stub atl:module atl:registrar start dlls/atl/tests/registrar.c - ----- A test unit with a foreign test summary line @@ -481,10 +462,7 @@ comctl32:progress start dlls/comctl32/tests/progress.c - 0148:progress: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:progress:0148 done (0) in 9s -comctl32:propsheet start dlls/comctl32/tests/propsheet.c - ------ A test unit with no main process test summary line and no pid anywhere ------ Expected assessement: "Missing test summary" error -comctl32:propsheet done (0) in 9s +stub comctl32:propsheet comctl32:rebar start dlls/comctl32/tests/rebar.c - ----- A test unit with an unreported crash in a subprocess @@ -499,22 +477,16 @@ subprocess crashes either. This is why the error is "Zero exit code" and not 07b0:rebar: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:rebar:07b0 done (0) in 0s -comctl32:status start dlls/comctl32/tests/status.c - ------ A test unit with a subprocess crash but no pid ------ Expected assessement: "Zero exit code" error -See the comctl32:rebar comment. -status: unhandled exception c0000005 at 0040167C -status: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. -comctl32:status:07b0 done (0) in 0s +stub comctl32:status comctl32:subclass start dlls/comctl32/tests/subclass.c - ------ A test unit with a subprocess crash, no pid and a non-zero exit code +----- A test unit with a subprocess crash, and a non-zero exit code ----- Expected assessement: 1 failure See the comctl32:rebar comment. Then note that here the main process does not claim success. Also note that the exit code does not correspond to that of a crashed process which makes sense since it did not crash. -subclass: unhandled exception c0000005 at 0040167C -subclass: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. +1234:subclass: unhandled exception c0000005 at 0040167C +07b0:subclass: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:subclass:07b0 done (1) in 0s comctl32:syslink start dlls/comctl32/tests/syslink.c - @@ -534,28 +506,16 @@ Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 s me off comctl32:syslink:07b0 done (2) in 0s -comctl32:tab start dlls/comctl32/tests/tab.c - ------ A test unit crash with no pid ------ Expected assessement: crashed -tab: unhandled exception c0000005 at 0040167C -comctl32:tab done (-1073741819) in 0s +stub comctl32:tab -comctl32:taskdialog start dlls/comctl32/tests/taskdialog.c - ------ A test unit crash with unsigned exit code (TestLauncher) ------ Expected assessement: crashed -taskdialog: unhandled exception c0000005 at 0040167C -comctl32:taskdialog done (3221225477) in 0s +stub comctl32:taskdialog comctl32:toolbar start dlls/comctl32/tests/toolbar.c - ----- A test unit crash with no unhandled exception line ----- Expected assessement: crashed comctl32:toolbar done (-1073741819) in 0s -comctl32:tooltips start dlls/comctl32/tests/toolbar.c - ------ A test unit crash with no unhandled exception line ------ and an unsigned exit code. ------ Expected assessement: crashed -comctl32:tooltips done (3221225477) in 0s +stub comctl32:tooltips comctl32:trackbar start dlls/comctl32/tests/trackbar.c - ----- A test unit with a subtest

1 0

Francois Gouget : testbot/reporttest: Match the tests to the wtbsuite.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: tools Branch: master Commit: a26e789fad7cc0486b6e967ad97b4113082aa24c URL: https://source.winehq.org/git/tools.git/?a=commit;h=a26e789fad7cc0486b6e967… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 8 15:21:56 2021 +0100 testbot/reporttest: Match the tests to the wtbsuite. Where a test mirrors a wtbsuite test, add the latter's commit message as a comment to make it simpler to compare the two. Also tweak some comments to better describe the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index c08b4d4..8da3d82 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -209,8 +209,11 @@ Dll info: xmllite=1.0.1018.0 Test output: stub advapi32:cred +----- WTBS Simple test patch +----- Expected assessement: Success advapi32:crypt start dlls/advapi32/tests/crypt.c - +----- WTBS Simple test failure ----- A test unit with one failed test ----- Expected assessement: 1 failure This also has a valid source file name which one can link to. @@ -219,10 +222,11 @@ crypt.c:1: Test failed: Something wrong advapi32:crypt:031c done (1) in 0s advapi32:crypt_lmhash start dlls/advapi32/tests/crypt_lmhash.c - +----- WTBS Simple diacritic failure ----- A test unit with two failed tests ------ Expected assessement: 2 failures +----- Expected assessement: 2 failures despite exit code crypt_lmhash.c:10: Test failed: Something wrong -crypt_lmhash.c:20: Test failed: Second failure here +crypt_lmhash.c:20: Test failed: Second failure with added diacritics: ?????????? 07c0:crypt_lmhash: 95 tests executed (0 marked as todo, 2 failures), 0 skipped. advapi32:crypt_lmhash:07c0 done (1) in 0s @@ -246,7 +250,8 @@ Note that this also applies to the todo and skip counts. advapi32:crypt_md5:087c done (3) in 0s advapi32:crypt_sha start dlls/advapi32/tests/crypt_sha.c - ------ A test unit with a failed subprocess test ignored by the parent +----- A test unit with a failed subprocess test ignored by the parent test +----- summary but accounted for in the exit code. ----- Expected assessement: 1 failure crypt_sha.c:20: Test failed: A failure here, presumably in the subprocess 0456:crypt_sha: 1 tests executed (0 marked as todo, 1 failure), 0 skipped. @@ -256,6 +261,7 @@ subprocess. advapi32:crypt_sha:08f8 done (3) in 0s advapi32:eventlog start dlls/advapi32/tests/eventlog.c - +----- WTBS Unreported test failures ----- A test unit with an unreported failed test ----- Expected assessement: 1 failure, "Unreported failure" error eventlog.c:20: Test failed: Something wrong @@ -263,6 +269,7 @@ eventlog.c:20: Test failed: Something wrong advapi32:eventlog:088c done (3) in 4s advapi32:lsa start dlls/advapi32/tests/lsa.c - +----- WTBS Missing test summary line ----- A test unit with no test summary line ----- Expected assessement: "Missing test summary" error advapi32:lsa:083c done (0) in 0s @@ -308,6 +315,7 @@ files.c:20: Test failed: A failure in the main process advpack:files:0880 done (3) in 0s advpack:install start dlls/advpack/tests/install.c - +----- WTBS Simple test crash ----- A test unit with a crash ----- Expected assessement: Crash 07b0:install: unhandled exception c0000005 at 0040167C @@ -371,6 +379,8 @@ comcat:comcat start dlls/comcat/tests/comcat.c - comcat:comcat:0948 done (0) in 0s comctl32:animate start dlls/comctl32/tests/animate.c - +----- WTBS Timeout in a test +----- WTBS Timeout in a test - barely ----- A test unit with a timeout ----- Expected assessement: Timeout comctl32:animate:0b14 done (258) in 42s @@ -380,7 +390,10 @@ comctl32:button skipped dlls/comctl32/tests/button.c - ----- Expected assessement: Skipped by user comctl32:comboex start dlls/comctl32/tests/comboex.c - ------ A test unit with failed, todo and skipped tests in the main process +----- WTBS Simple success in a todo test +----- WTBS Simple trace, ok, todo, skip sampler +----- A test unit with a subprocess and failed, todo and skipped tests in the +----- main process. ----- Expected assessement: 2 failures, 1 todo, 1 skip comboex.c:40: Test failed: A failure in the main process comboex.c:41: Test succeeded inside todo block: Success in the main process @@ -394,6 +407,7 @@ comctl32:comboex:0c9c done (2) in 0s comctl32:datetime start dlls/comctl32/tests/datetime.c - ----- A test unit reporting a failure but with no test failed line ----- Expected assessement: "Missing test failed line" error +----- + TestFailures=2 (1 for the exit code + 1 for the missing failure line) 0998:datetime: 651 tests executed (0 marked as todo, 1 failures), 0 skipped. comctl32:datetime:0998 done (1) in 0s @@ -425,8 +439,10 @@ comctl32:ipaddress start dlls/comctl32/tests/ipaddress.c - Issued upon seeing the next start line. 0998:ipaddress: 16 tests executed (0 marked as todo, 0 failure), 0 skipped. +----- Keep this stub in case the previous test is mishandled stub comctl32:listview +----- WTBS A test unit with no start line ----- A test unit with a missing start line ----- Expected assessement: "Missing start line" error 0998:misc: 16 tests executed (0 marked as todo, 0 failure), 0 skipped. @@ -490,6 +506,7 @@ crashed process which makes sense since it did not crash. comctl32:subclass:07b0 done (1) in 0s comctl32:syslink start dlls/comctl32/tests/syslink.c - +----- WTBS Garbled trace, ok, todo, skip sampler ----- A test unit with garbled test lines ----- Expected assessement: 2 failures, 1 todo, 1 skip Multi-threaded and multi-process tests should really try to avoid races in @@ -518,13 +535,14 @@ comctl32:toolbar done (-1073741819) in 0s stub comctl32:tooltips comctl32:trackbar start dlls/comctl32/tests/trackbar.c - +----- WTBS Test failures, todos and skips in a subtest ----- A test unit with a subtest +----- Expected assessement: 2 failures, 1 todo, 1 skip trackbar.c:496: Subtest driver driver.c:40: Test failed: Something wrong driver.c:41: Test succeeded inside todo block: Something right! driver.c:42: Test marked todo: Hello Wine! driver.c:43: Tests skipped: Another time ------ Expected assessement: 2 failures, 1 todo, 1 skip 07b1:trackbar: 3 tests executed (1 marked as todo, 2 failures), 1 skipped. comctl32:trackbar:07b1 done (2) in 0s @@ -1011,7 +1029,7 @@ stub xcopy.exe:xcopy stub xmllite:reader xmllite:writer start dlls/xmllite/tests/writer.c - ------ A test unit with a misplaced test failed line +----- A test unit with a misplaced (late) test failed line ----- Expected assessement: "Misplaced test failed line" error See the similar scenario before but note the lack of the extra test summary line here. Also beware of the end-of-file.

1 0

Rémi Bernon : widl: Factor and cleanup interface type declaration and definition.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: f8684cf953c5aae31e0b2858ab839e702b7cff20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8684cf953c5aae31e0b2858… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:11:00 2021 +0100 widl: Factor and cleanup interface type declaration and definition. 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/parser.y | 34 ++++++++++------------------------ tools/widl/typetree.c | 19 ++++++++++++++++++- tools/widl/typetree.h | 4 +++- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1505e3e88a0..44716deb5b6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -87,7 +87,6 @@ static void push_lookup_namespace(const char *name); static void check_arg_attrs(const var_t *arg); static void check_statements(const statement_list_t *stmts, int is_inside_library); static void check_all_user_types(const statement_list_t *stmts); -static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_function_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_typedef_attrs(attr_list_t *attrs); static attr_list_t *check_enum_attrs(attr_list_t *attrs); @@ -281,7 +280,6 @@ static typelib_t *current_typelib; %type <expr> m_expr expr expr_const expr_int_const array m_bitfield %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const %type <expr> contract_req -%type <type> interfacehdr %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list %type <function_specifier> function_specifier @@ -971,31 +969,20 @@ inherit: { $$ = NULL; } | ':' qualified_type { $$ = $2; } ; -interface: tINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } - | tINTERFACE aKNOWNTYPE { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } +interface: + tINTERFACE aIDENTIFIER { $$ = type_interface_declare($2, current_namespace); } + | tINTERFACE aKNOWNTYPE { $$ = type_interface_declare($2, current_namespace); } ; -interfacehdr: attributes interface { $$ = $2; - check_def($2); - $2->attrs = check_iface_attrs($2->name, $1); - $2->defined = TRUE; - } - ; - -interfacedef: interfacehdr inherit - '{' int_statements '}' semicolon_opt { $$ = $1; - if($$ == $2) - error_loc("Interface can't inherit from itself\n"); - type_interface_define($$, $2, $4); +interfacedef: attributes interface inherit + '{' int_statements '}' semicolon_opt { $$ = type_interface_define($2, $1, $3, $5); check_async_uuid($$); } /* MIDL is able to import the definition of a base class from inside the * definition of a derived class, I'll try to support it with this rule */ - | interfacehdr ':' aIDENTIFIER + | attributes interface ':' aIDENTIFIER '{' import int_statements '}' - semicolon_opt { $$ = $1; - type_interface_define($$, find_type_or_error($3), $6); - } + semicolon_opt { $$ = type_interface_define($2, $1, find_type_or_error($4), $7); } | dispinterfacedef semicolon_opt { $$ = $1; } ; @@ -2340,7 +2327,7 @@ const char *get_attr_display_name(enum attr_type type) return allowed_attr[type].display_name; } -static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs) +attr_list_t *check_interface_attrs(const char *name, attr_list_t *attrs) { const attr_t *attr; if (!attrs) return attrs; @@ -2978,8 +2965,7 @@ static void check_async_uuid(type_t *iface) if (!inherit) error_loc("async_uuid applied to an interface with incompatible parent\n"); - async_iface = get_type(TYPE_INTERFACE, strmake("Async%s", iface->name), iface->namespace, 0); - async_iface->attrs = map_attrs(iface->attrs, async_iface_attrs); + async_iface = type_interface_declare(strmake("Async%s", iface->name), iface->namespace); STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) { @@ -3010,7 +2996,7 @@ static void check_async_uuid(type_t *iface) stmts = append_statement(stmts, make_statement_declaration(finish_func)); } - type_interface_define(async_iface, inherit, stmts); + type_interface_define(async_iface, map_attrs(iface->attrs, async_iface_attrs), inherit, stmts); iface->details.iface->async_iface = async_iface->details.iface->async_iface = async_iface; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 825348ddef4..84be75fa3b7 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -442,8 +442,24 @@ static unsigned int compute_method_indexes(type_t *iface) return idx; } -void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stmts) +type_t *type_interface_declare(char *name, struct namespace *namespace) { + type_t *type = get_type(TYPE_INTERFACE, name, namespace, 0); + if (type_get_type_detect_alias(type) != TYPE_INTERFACE) + error_loc("interface %s previously not declared an interface at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + return type; +} + +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts) +{ + if (iface->defined) + error_loc("interface %s already defined at %s:%d\n", + iface->name, iface->loc_info.input_name, iface->loc_info.line_number); + if (iface == inherit) + error_loc("interface %s can't inherit from itself\n", + iface->name); + iface->attrs = check_interface_attrs(iface->name, attrs); iface->details.iface = xmalloc(sizeof(*iface->details.iface)); iface->details.iface->disp_props = NULL; iface->details.iface->disp_methods = NULL; @@ -453,6 +469,7 @@ void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stm iface->details.iface->async_iface = NULL; iface->defined = TRUE; compute_method_indexes(iface); + return iface; } void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 8a8e1c529ac..7b67f3b996a 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -30,6 +30,7 @@ enum name_type { }; attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); +attr_list_t *check_interface_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs); type_t *type_new_function(var_list_t *args); @@ -48,7 +49,8 @@ type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); type_t *type_runtimeclass_declare(char *name, struct namespace *namespace); -void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stmts); +type_t *type_interface_declare(char *name, struct namespace *namespace); +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts); void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods); void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); void type_module_define(type_t *module, statement_list_t *stmts);

1 0

Rémi Bernon : widl: Factor and cleanup dispinterface type declaration and definition.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: ce148774363988b08f9648eacec941ec6c47e91a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce148774363988b08f9648ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:11:01 2021 +0100 widl: Factor and cleanup dispinterface type declaration and definition. 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/parser.y | 36 +++++++++++++----------------------- tools/widl/typetree.c | 23 +++++++++++++++++++++-- tools/widl/typetree.h | 6 ++++-- 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 44716deb5b6..349e4730d96 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -95,7 +95,6 @@ static attr_list_t *check_struct_attrs(attr_list_t *attrs); static attr_list_t *check_union_attrs(attr_list_t *attrs); static attr_list_t *check_field_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_library_attrs(const char *name, attr_list_t *attrs); -static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); @@ -276,6 +275,7 @@ static typelib_t *current_typelib; %type <attr> attribute acf_attribute %type <attr_list> m_attributes attributes attrib_list %type <attr_list> acf_attributes acf_attribute_list +%type <attr_list> dispattributes %type <str_list> str_list %type <expr> m_expr expr expr_const expr_int_const array m_bitfield %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const @@ -286,7 +286,7 @@ static typelib_t *current_typelib; %type <declspec> decl_spec decl_spec_no_type m_decl_spec_no_type %type <type> inherit interface interfacedef %type <type> interfaceref -%type <type> dispinterface dispinterfacehdr dispinterfacedef +%type <type> dispinterface dispinterfacedef %type <type> module modulehdr moduledef %type <str> namespacedef %type <type> base_type int_std @@ -932,17 +932,12 @@ class_interface: m_attributes interfaceref ';' { $$ = make_ifref($2); $$->attrs = $1; } ; -dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } - | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } +dispinterface: + tDISPINTERFACE aIDENTIFIER { $$ = type_dispinterface_declare($2); } + | tDISPINTERFACE aKNOWNTYPE { $$ = type_dispinterface_declare($2); } ; -dispinterfacehdr: attributes dispinterface { attr_t *attrs; - $$ = $2; - check_def($$); - attrs = make_attr(ATTR_DISPINTERFACE); - $$->attrs = append_attr( check_dispiface_attrs($2->name, $1), attrs ); - $$->defined = TRUE; - } +dispattributes: attributes { $$ = append_attr($1, make_attr(ATTR_DISPINTERFACE)); } ; dispint_props: tPROPERTIES ':' { $$ = NULL; } @@ -953,16 +948,11 @@ dispint_meths: tMETHODS ':' { $$ = NULL; } | dispint_meths funcdef ';' { $$ = append_var( $1, $2 ); } ; -dispinterfacedef: dispinterfacehdr '{' - dispint_props - dispint_meths - '}' { $$ = $1; - type_dispinterface_define($$, $3, $4); - } - | dispinterfacehdr - '{' interface ';' '}' { $$ = $1; - type_dispinterface_define_from_iface($$, $3); - } +dispinterfacedef: + dispattributes dispinterface '{' dispint_props dispint_meths '}' + { $$ = type_dispinterface_define($2, $1, $4, $5); } + | dispattributes dispinterface '{' interface ';' '}' + { $$ = type_dispinterface_define_from_iface($2, $1, $4); } ; inherit: { $$ = NULL; } @@ -2214,7 +2204,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "defaultvtable" }, /* ATTR_DISABLECONSISTENCYCHECK */{ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "disable_consistency_check" }, - /* ATTR_DISPINTERFACE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, + /* ATTR_DISPINTERFACE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, NULL }, /* ATTR_DISPLAYBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "displaybind" }, /* ATTR_DLLNAME */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "dllname" }, /* ATTR_DUAL */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "dual" }, @@ -2471,7 +2461,7 @@ static attr_list_t *check_library_attrs(const char *name, attr_list_t *attrs) return attrs; } -static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs) +attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs) { const attr_t *attr; if (!attrs) return attrs; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 84be75fa3b7..81eaba5556b 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -472,8 +472,21 @@ type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit return iface; } -void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods) +type_t *type_dispinterface_declare(char *name) { + type_t *type = get_type(TYPE_INTERFACE, name, NULL, 0); + if (type_get_type_detect_alias(type) != TYPE_INTERFACE) + error_loc("dispinterface %s previously not declared a dispinterface at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + return type; +} + +type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t *props, var_list_t *methods) +{ + if (iface->defined) + error_loc("dispinterface %s already defined at %s:%d\n", + iface->name, iface->loc_info.input_name, iface->loc_info.line_number); + iface->attrs = check_dispiface_attrs(iface->name, attrs); iface->details.iface = xmalloc(sizeof(*iface->details.iface)); iface->details.iface->disp_props = props; iface->details.iface->disp_methods = methods; @@ -484,10 +497,15 @@ void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *met iface->details.iface->async_iface = NULL; iface->defined = TRUE; compute_method_indexes(iface); + return iface; } -void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface) +type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *attrs, type_t *iface) { + if (dispiface->defined) + error_loc("dispinterface %s already defined at %s:%d\n", + dispiface->name, dispiface->loc_info.input_name, dispiface->loc_info.line_number); + dispiface->attrs = check_dispiface_attrs(dispiface->name, attrs); dispiface->details.iface = xmalloc(sizeof(*dispiface->details.iface)); dispiface->details.iface->disp_props = NULL; dispiface->details.iface->disp_methods = NULL; @@ -498,6 +516,7 @@ void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface) dispiface->details.iface->async_iface = NULL; dispiface->defined = TRUE; compute_method_indexes(dispiface); + return dispiface; } void type_module_define(type_t *module, statement_list_t *stmts) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 7b67f3b996a..280d2e722cf 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -30,6 +30,7 @@ enum name_type { }; attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); +attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_interface_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs); @@ -51,8 +52,9 @@ type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); type_t *type_runtimeclass_declare(char *name, struct namespace *namespace); type_t *type_interface_declare(char *name, struct namespace *namespace); type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts); -void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods); -void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); +type_t *type_dispinterface_declare(char *name); +type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t *props, var_list_t *methods); +type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *attrs, type_t *iface); void type_module_define(type_t *module, statement_list_t *stmts); type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces); type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces);

1 0

Rémi Bernon : widl: Factor and cleanup apicontract type declaration and definition.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 62c58eb8a055243563e2861147491df91cba5d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=62c58eb8a055243563e28611… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:11:02 2021 +0100 widl: Factor and cleanup apicontract type declaration and definition. And remove unused check_def helper. 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/parser.y | 35 +++++++++++++++-------------------- tools/widl/typetree.c | 19 +++++++++++++++++++ tools/widl/typetree.h | 3 +++ 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 349e4730d96..8c805e481f8 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -96,10 +96,8 @@ static attr_list_t *check_union_attrs(attr_list_t *attrs); static attr_list_t *check_field_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_library_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); -static attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs); 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); @@ -305,7 +303,7 @@ static typelib_t *current_typelib; %type <declarator_list> declarator_list struct_declarator_list %type <type> coclass coclassdef %type <type> runtimeclass runtimeclass_def -%type <type> apicontract +%type <type> apicontract apicontract_def %type <num> contract_ver %type <num> pointer_type threading_type marshaling_behavior version %type <str> libraryhdr callconv cppquote importlib import t_ident @@ -364,8 +362,9 @@ gbl_statements: { $$ = NULL; } | gbl_statements coclassdef { $$ = append_statement($1, make_statement_type_decl($2)); reg_type($2, $2->name, current_namespace, 0); } - | gbl_statements apicontract ';' { $$ = append_statement($1, make_statement_type_decl($2)); - reg_type($2, $2->name, current_namespace, 0); } + | gbl_statements apicontract ';' { $$ = $1; reg_type($2, $2->name, current_namespace, 0); } + | gbl_statements apicontract_def { $$ = append_statement($1, make_statement_type_decl($2)); + reg_type($2, $2->name, current_namespace, 0); } | gbl_statements runtimeclass ';' { $$ = $1; reg_type($2, $2->name, current_namespace, 0); } | gbl_statements runtimeclass_def { $$ = append_statement($1, make_statement_type_decl($2)); reg_type($2, $2->name, current_namespace, 0); } @@ -384,8 +383,9 @@ imp_statements: { $$ = NULL; } | imp_statements coclassdef { $$ = append_statement($1, make_statement_type_decl($2)); reg_type($2, $2->name, current_namespace, 0); } - | imp_statements apicontract ';' { $$ = append_statement($1, make_statement_type_decl($2)); - reg_type($2, $2->name, current_namespace, 0); } + | imp_statements apicontract ';' { $$ = $1; reg_type($2, $2->name, current_namespace, 0); } + | imp_statements apicontract_def { $$ = append_statement($1, make_statement_type_decl($2)); + reg_type($2, $2->name, current_namespace, 0); } | imp_statements runtimeclass ';' { $$ = $1; reg_type($2, $2->name, current_namespace, 0); } | imp_statements runtimeclass_def { $$ = append_statement($1, make_statement_type_decl($2)); reg_type($2, $2->name, current_namespace, 0); } @@ -913,11 +913,13 @@ runtimeclass_def: attributes runtimeclass '{' class_interfaces '}' semicolon_opt { $$ = type_runtimeclass_define($2, $1, $4); } ; -apicontract: attributes tAPICONTRACT aIDENTIFIER '{' '}' - { $$ = get_type(TYPE_APICONTRACT, $3, current_namespace, 0); - check_def($$); - $$->attrs = check_apicontract_attrs($$->name, $1); - } +apicontract: + tAPICONTRACT aIDENTIFIER { $$ = type_apicontract_declare($2, current_namespace); } + | tAPICONTRACT aKNOWNTYPE { $$ = type_apicontract_declare($2, current_namespace); } + ; + +apicontract_def: attributes apicontract '{' '}' semicolon_opt + { $$ = type_apicontract_define($2, $1); } ; namespacedef: tNAMESPACE aIDENTIFIER { $$ = $2; } @@ -2511,7 +2513,7 @@ attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs) return attrs; } -static attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs) +attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs) { const attr_t *attr; if (!attrs) return attrs; @@ -3205,10 +3207,3 @@ void init_loc_info(loc_info_t *i) i->line_number = line_number; i->near_text = parser_text; } - -static void check_def(const type_t *t) -{ - if (t->defined) - error_loc("%s: redefinition error; original definition was at %s:%d\n", - t->name, t->loc_info.input_name, t->loc_info.line_number); -} diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 81eaba5556b..004f7fc7b0d 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -569,6 +569,25 @@ type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref return runtimeclass; } +type_t *type_apicontract_declare(char *name, struct namespace *namespace) +{ + type_t *type = get_type(TYPE_APICONTRACT, name, namespace, 0); + if (type_get_type_detect_alias(type) != TYPE_APICONTRACT) + error_loc("apicontract %s previously not declared a apicontract at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + return type; +} + +type_t *type_apicontract_define(type_t *apicontract, attr_list_t *attrs) +{ + if (apicontract->defined) + error_loc("apicontract %s already defined at %s:%d\n", + apicontract->name, apicontract->loc_info.input_name, apicontract->loc_info.line_number); + apicontract->attrs = check_apicontract_attrs(apicontract->name, attrs); + apicontract->defined = TRUE; + return apicontract; +} + int type_is_equal(const type_t *type1, const type_t *type2) { if (type_get_type_detect_alias(type1) != type_get_type_detect_alias(type2)) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 280d2e722cf..7c19da8e045 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -29,6 +29,7 @@ enum name_type { NAME_C }; +attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_interface_attrs(const char *name, attr_list_t *attrs); @@ -58,6 +59,8 @@ type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *att void type_module_define(type_t *module, statement_list_t *stmts); type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces); type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces); +type_t *type_apicontract_declare(char *name, struct namespace *namespace); +type_t *type_apicontract_define(type_t *apicontract, attr_list_t *attrs); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type); char *gen_name(void);

1 0