February 2020 - Wine-Commits

Zebediah Figura : quartz/tests: Add tests for MPEG splitter pin connection.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 2acd63e340238ebff925e971a22597517ec04edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2acd63e340238ebff925e971… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 4 22:43:10 2020 -0600 quartz/tests: Add tests for MPEG splitter pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegsplit.c | 462 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 462 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2acd63e340238ebff925…

1 0

Zebediah Figura : quartz/tests: Add tests for AVI splitter pin connection.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 4f8c54b5e97ad8e996229d47d0d7d8c55b936ab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f8c54b5e97ad8e996229d47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 4 22:43:08 2020 -0600 quartz/tests: Add tests for AVI splitter pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 458 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 458 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f8c54b5e97ad8e99622…

1 0

Zebediah Figura : quartz/tests: Improve tests for AVI splitter filter state.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: d749d50ada16929e4fccd5d648fe52c0cbeb5609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d749d50ada16929e4fccd5d6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 4 22:43:09 2020 -0600 quartz/tests: Improve tests for AVI splitter filter state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 300 ++++++++----------------------------------- 1 file changed, 57 insertions(+), 243 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d749d50ada16929e4fcc…

1 0

Michael Stefaniuc : itss/tests: Get rid of a2w() and strcmp_wa().
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: f4259cf25fd79560568de0a73becaba0b987ce02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4259cf25fd79560568de0a7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 5 01:40:16 2020 +0100 itss/tests: Get rid of a2w() and strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/tests/protocol.c | 79 ++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 49 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index a41916b192..4cafba7b61 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -98,24 +98,6 @@ static const WCHAR cache_file3[] = {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; static const WCHAR *cache_file = cache_file1; -static const WCHAR *a2w(const char *str) -{ - static WCHAR bufs[8][128]; - static int i; - - if(!str) - return NULL; - - i = (i+1) % 8; - MultiByteToWideChar(CP_ACP, 0, str, -1, bufs[i], 128); - return bufs[i]; -} - -static int strcmp_wa(const WCHAR *str1, const char *str2) -{ - return lstrcmpW(str1, a2w(str2)); -} - static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { @@ -456,34 +438,34 @@ static void test_protocol_url(IClassFactory *factory, LPCWSTR url, BOOL expect_m } static const struct { - const char *base_url; - const char *rel_url; + const WCHAR *base_url; + const WCHAR *rel_url; DWORD flags; HRESULT hres; - const char *combined_url; + const WCHAR *combined_url; } combine_tests[] = { - {"its:test.chm::/blank.html", "its:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, - {"mS-iTs:test.chm::/blank.html", "mS-iTs:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, - {"its:test.chm::/blank.html", "test.html", 0, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "test.chm::/test.html", 0, STG_E_INVALIDNAME, NULL}, - {"its:test.chm::/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "te:t.html", 0, STG_E_INVALIDNAME, NULL}, - {"its:test.chm::/blank.html", "/test.html", URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "dir/test.html", 0, S_OK, "its:test.chm::/dir/test.html"}, - {"test.html", "test.chm::/test.html", 0, 0x80041001, NULL}, - {"its:test:.chm::/blank.html", "test.html", 0, S_OK, "its:test:.chm::/test.html"}, - {"its:test.chm::/dir/blank.html", "test.html", 0, S_OK, "its:test.chm::/dir/test.html"}, - {"its:test.chm::blank.html", "test.html", 0, S_OK, "its:test.chm::blank.htmltest.html"}, - {"ms-its:test.chm::/dir/blank.html", "test.html", 0, S_OK, "ms-its:test.chm::/dir/test.html"}, - {"mk:@MSITStore:test.chm::/dir/blank.html", "test.html", 0, S_OK, "mk:@MSITStore:test.chm::/dir/test.html"}, - {"xxx:test.chm::/dir/blank.html", "test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, - {"its:test.chm::/dir/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "#frag", 0, S_OK, "its:test.chm::/blank.html#frag"}, - {"its:test.chm::/blank.html#hash", "#frag", 0, S_OK, "its:test.chm::/blank.html#hash#frag"}, - {"its:test.chm::/blank.html", "test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, - {"its:test.chm::/blank.html", "/test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, - {"its:test.chm::/blank.html", "?query", 0, S_OK, "its:test.chm::/?query"}, - {"its:test.chm::/blank.html#frag/blank", "test.html", 0, S_OK, "its:test.chm::/blank.html#frag/test.html"}, + {L"its:test.chm::/blank.html", L"its:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, + {L"mS-iTs:test.chm::/blank.html", L"mS-iTs:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, + {L"its:test.chm::/blank.html", L"test.html", 0, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"test.chm::/test.html", 0, STG_E_INVALIDNAME, NULL}, + {L"its:test.chm::/blank.html", L"/test.html", 0, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"te:t.html", 0, STG_E_INVALIDNAME, NULL}, + {L"its:test.chm::/blank.html", L"/test.html", URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"dir/test.html", 0, S_OK, L"its:test.chm::/dir/test.html"}, + {L"test.html", L"test.chm::/test.html", 0, 0x80041001, NULL}, + {L"its:test:.chm::/blank.html", L"test.html", 0, S_OK, L"its:test:.chm::/test.html"}, + {L"its:test.chm::/dir/blank.html", L"test.html", 0, S_OK, L"its:test.chm::/dir/test.html"}, + {L"its:test.chm::blank.html", L"test.html", 0, S_OK, L"its:test.chm::blank.htmltest.html"}, + {L"ms-its:test.chm::/dir/blank.html", L"test.html", 0, S_OK, L"ms-its:test.chm::/dir/test.html"}, + {L"mk:@MSITStore:test.chm::/dir/blank.html", L"test.html", 0, S_OK, L"mk:@MSITStore:test.chm::/dir/test.html"}, + {L"xxx:test.chm::/dir/blank.html", L"test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, + {L"its:test.chm::/dir/blank.html", L"/test.html", 0, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"#frag", 0, S_OK, L"its:test.chm::/blank.html#frag"}, + {L"its:test.chm::/blank.html#hash", L"#frag", 0, S_OK, L"its:test.chm::/blank.html#hash#frag"}, + {L"its:test.chm::/blank.html", L"test.html#frag", 0, S_OK, L"its:test.chm::/test.html#frag"}, + {L"its:test.chm::/blank.html", L"/test.html#frag", 0, S_OK, L"its:test.chm::/test.html#frag"}, + {L"its:test.chm::/blank.html", L"?query", 0, S_OK, L"its:test.chm::/?query"}, + {L"its:test.chm::/blank.html#frag/blank", L"test.html", 0, S_OK, L"its:test.chm::/blank.html#frag/test.html"}, }; static void test_its_protocol_info(IInternetProtocol *protocol) @@ -510,22 +492,21 @@ static void test_its_protocol_info(IInternetProtocol *protocol) for(i=0; i < ARRAY_SIZE(combine_tests); i++) { size = 0xdeadbeef; memset(buf, 0xfe, sizeof(buf)); - hres = IInternetProtocolInfo_CombineUrl(info, a2w(combine_tests[i].base_url), - a2w(combine_tests[i].rel_url), combine_tests[i].flags, buf, - ARRAY_SIZE(buf), &size, 0); + hres = IInternetProtocolInfo_CombineUrl(info, combine_tests[i].base_url, + combine_tests[i].rel_url, combine_tests[i].flags, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == combine_tests[i].hres, "[%d] CombineUrl returned %08x, expected %08x\n", i, hres, combine_tests[i].hres); - ok(size == (combine_tests[i].combined_url ? strlen(combine_tests[i].combined_url)+1 + ok(size == (combine_tests[i].combined_url ? lstrlenW(combine_tests[i].combined_url)+1 : 0xdeadbeef), "[%d] unexpected size=%d\n", i, size); if(combine_tests[i].combined_url) - ok(!strcmp_wa(buf, combine_tests[i].combined_url), "[%d] unexpected result: %s\n", i, wine_dbgstr_w(buf)); + ok(!lstrcmpW(buf, combine_tests[i].combined_url), "[%d] unexpected result: %s\n", i, wine_dbgstr_w(buf)); else ok(buf[0] == 0xfefe, "buf changed\n"); } size = 0xdeadbeef; memset(buf, 0xfe, sizeof(buf)); - hres = IInternetProtocolInfo_CombineUrl(info, a2w("its:test.chm::/blank.html"), a2w("test.html"), 0, buf, + hres = IInternetProtocolInfo_CombineUrl(info, L"its:test.chm::/blank.html", L"test.html", 0, buf, 1, &size, 0); ok(hres == E_OUTOFMEMORY, "CombineUrl failed: %08x\n", hres); ok(size == 25, "size=%d\n", size);

1 0

Francois Gouget : testbot/UpdateTaskLogs: Also remove the .err file for the step reference report.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: tools Branch: master Commit: 1d7490a8e4c12b5237d7971e69e89a702bead071 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1d7490a8e4c12b5237d7971… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 5 02:01:08 2020 +0100 testbot/UpdateTaskLogs: Also remove the .err file for the step reference report. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 4ba383f..4fe6ff3 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -341,6 +341,7 @@ sub ProcessTaskLogs($$$) $StepReportPath = $Step->GetFullFileName($StepReportName); } $Rc += Delete($StepReportPath, "unneeded"); + $Rc += Delete("$StepReportPath.err", "unneeded"); } my %LogMap = (

1 0

Francois Gouget : testbot/LogUtils: Reorder the functions to get a more logical grouping.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: tools Branch: master Commit: 08e407ef42f578d66e89fda1ed3125c73a6175a1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=08e407ef42f578d66e89fda… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 5 02:01:30 2020 +0100 testbot/LogUtils: Reorder the functions to get a more logical grouping. Add headers to each section. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 185 ++++++++++++++++++------------------ 1 file changed, 92 insertions(+), 93 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0a98a5a..66359a9 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -63,6 +63,78 @@ sub _IsPerlError($) $Str =~ /^Possible precedence issue /; } +=pod +=over 12 + +=item C<GetLogLineCategory()> + +Identifies the category of the given log line: an error message, a Wine +diagnostic line, a TestBot error, etc. + +The category can then be used to decide whether to hide the line or, on +the contrary, highlight it. + +=back +=cut + +sub GetLogLineCategory($) +{ + my ($Line) = @_; + + if (# Build messages + $Line =~ /^\+ \S/ or + $Line =~ /^LANG=/ or + $Line =~ /^Running (?:the tests|WineTest) / or + $Line =~ /^Task: (?:ok|tests|Updated)/) + { + return "info"; + } + if (# Git errors + $Line =~ /^CONFLICT / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^error: corrupt patch / or + # Build errors + $Line =~ /: error: / or + $Line =~ /: undefined reference to `/ or + $Line =~ /^make: [*]{3} No rule to make target / or + $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^Task: / or + # Typical perl errors + _IsPerlError($Line)) + { + return "error"; + } + if ($Line =~ /:winediag:/) + { + if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree + # calls it as a test. + $Line =~ /CorIsLatestSvc If this function is called,/ or + # VMs and most test machines don't have a midi port. + $Line =~ /No software synthesizer midi port found,/ or + # Most VMs have limited OpenGL support. + $Line =~ /None of the requested D3D feature levels is supported / or + # The tests are not run as root. + $Line =~ /this requires special permissions/) + { + return "diag"; + } + return "error"; + } + if (# TestBot script error messages + $Line =~ /^[a-zA-Z.]+:error: / or + # TestBot error + $Line =~ /^BotError:/ or + $Line =~ /^Error:/ or + # X errors + $Line =~ /^X Error of failed request: / or + $Line =~ / opcode of failed request: /) + { + return "boterror"; + } + + return "none"; +} + =pod =over 12 @@ -138,13 +210,17 @@ sub ParseTaskLog($) } +# +# WineTest report parser +# + =pod =over 12 -=item C<GetLogLineCategory()> +=item C<GetReportLineCategory()> -Identifies the category of the given log line: an error message, a Wine -diagnostic line, a TestBot error, etc. +Identifies the category of the given test report line: an error message, +a todo, just an informational message or none of these. The category can then be used to decide whether to hide the line or, on the contrary, highlight it. @@ -152,69 +228,36 @@ the contrary, highlight it. =back =cut -sub GetLogLineCategory($) +sub GetReportLineCategory($) { my ($Line) = @_; - if (# Build messages - $Line =~ /^\+ \S/ or - $Line =~ /^LANG=/ or - $Line =~ /^Running (?:the tests|WineTest) / or - $Line =~ /^Task: (?:ok|tests|Updated)/) + if ($Line =~ /: Test marked todo: /) { - return "info"; + return "todo"; } - if (# Git errors - $Line =~ /^CONFLICT / or - $Line =~ /^error: patch failed:/ or - $Line =~ /^error: corrupt patch / or - # Build errors - $Line =~ /: error: / or - $Line =~ /: undefined reference to `/ or - $Line =~ /^make: [*]{3} No rule to make target / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or - $Line =~ /^Task: / or - # Typical perl errors - _IsPerlError($Line)) + if ($Line =~ /: Tests skipped: / or + $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped /) { - return "error"; + return "skip"; } - if ($Line =~ /:winediag:/) + if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or + $Line =~ /Fatal: test .* does not exist/ or + $Line =~ / done $258$/ or + $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or + $Line =~ /^Unhandled exception: /) { - if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree - # calls it as a test. - $Line =~ /CorIsLatestSvc If this function is called,/ or - # VMs and most test machines don't have a midi port. - $Line =~ /No software synthesizer midi port found,/ or - # Most VMs have limited OpenGL support. - $Line =~ /None of the requested D3D feature levels is supported / or - # The tests are not run as root. - $Line =~ /this requires special permissions/) - { - return "diag"; - } return "error"; } - if (# TestBot script error messages - $Line =~ /^[a-zA-Z.]+:error: / or - # TestBot error - $Line =~ /^BotError:/ or - $Line =~ /^Error:/ or - # X errors - $Line =~ /^X Error of failed request: / or - $Line =~ / opcode of failed request: /) + if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) { - return "boterror"; + return "info"; } return "none"; } -# -# WineTest report parser -# - sub _NewCurrentUnit($$) { my ($Dll, $Unit) = @_; @@ -553,50 +596,6 @@ sub ParseWineTestReport($$$) } -=pod -=over 12 - -=item C<GetReportLineCategory()> - -Identifies the category of the given test report line: an error message, -a todo, just an informational message or none of these. - -The category can then be used to decide whether to hide the line or, on -the contrary, highlight it. - -=back -=cut - -sub GetReportLineCategory($) -{ - my ($Line) = @_; - - if ($Line =~ /: Test marked todo: /) - { - return "todo"; - } - if ($Line =~ /: Tests skipped: / or - $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped /) - { - return "skip"; - } - if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or - $Line =~ /Fatal: test .* does not exist/ or - $Line =~ / done $258$/ or - $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or - $Line =~ /^Unhandled exception: /) - { - return "error"; - } - if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) - { - return "info"; - } - - return "none"; -} - - # # Log querying and formatting #

1 0

Francois Gouget : testbot/web: Fix the log / report name validation in GetTaskFile.pl.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: tools Branch: master Commit: a3e19536e17e95a1e9c09963120c480126fd02d8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a3e19536e17e95a1e9c0996… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 5 13:56:47 2020 +0100 testbot/web: Fix the log / report name validation in GetTaskFile.pl. Allow downloading task.log, testbot.log and their old versions. Also, dashes are not allowed in report names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/GetTaskFile.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 6353219..4111119 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -37,7 +37,7 @@ sub SendTaskFile($$$$$) $StepNo = $1; return undef if ($TaskNo !~ m/^(\d+)$/); $TaskNo = $1; - return undef if ($File !~ m/^(log|[a-zA-Z0-9_-]+\.report)$/); + return undef if ($File !~ m/^((?:old_)?(?:task|testbot)\.log|[a-zA-Z0-9_]+\.report)$/); $File = $1; my $FileName = "$DataDir/jobs/$JobId/$StepNo/$TaskNo/$File";

1 0

Francois Gouget : testbot/doc: There is no direct dependency on DBD.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: tools Branch: master Commit: d4b5d4f0d6a33049a888adb585f1368840443fa2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d4b5d4f0d6a33049a888adb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 5 02:01:22 2020 +0100 testbot/doc: There is no direct dependency on DBD. Standardize the way the DBI::mysql dependency is documented. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4d430d9..7ac155d 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -4,9 +4,9 @@ Dependencies: - Apache2 with mod_perl - MySQL -- Perl DBD and DBI::mysql modules - Sendmail and Procmail - Bytes::Random::Secure (libbytes-random-secure-perl) +- DBI::mysql (libdbd-mysql-perl) - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl)

1 0

Francois Gouget : testbot: Increase the Windows executable build timeout.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: tools Branch: master Commit: 78438766b145a044e3015c4abda0628867e3faf6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=78438766b145a044e3015c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 5 13:57:26 2020 +0100 testbot: Increase the Windows executable build timeout. configure now takes 45 to 60 seconds and make 3.5 minutes for a full build. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index d59233f..ea08aa0 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -110,8 +110,8 @@ $MaxTaskTries = 3; # Exe build timeouts (in seconds) # - For a full build -$ExeBuildNativeTimeout = 60; -$ExeBuildTestTimeout = 4 * 60; +$ExeBuildNativeTimeout = 2 * 60; +$ExeBuildTestTimeout = 7 * 60; # - For a single module $ExeModuleTimeout = 30;

1 0

Michael Stefaniuc : bcrypt/tests: Get rid of strcmp_wa().
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 7485362fa13354361fd185a115fa7b866398e70c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7485362fa13354361fd185a1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 4 21:44:10 2020 +0100 bcrypt/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d26150f469..0dc2085111 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -155,13 +155,6 @@ static void format_hash(const UCHAR *bytes, ULONG size, char *buf) return; } -static int strcmp_wa(const WCHAR *strw, const char *stra) -{ - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - #define test_object_length(a) _test_object_length(__LINE__,a) static void _test_object_length(unsigned line, void *handle) { @@ -211,7 +204,7 @@ static void _test_hash_length(unsigned line, void *handle, ULONG exlen) } #define test_alg_name(a,b) _test_alg_name(__LINE__,a,b) -static void _test_alg_name(unsigned line, void *handle, const char *exname) +static void _test_alg_name(unsigned line, void *handle, const WCHAR *exname) { ULONG size = 0xdeadbeef; UCHAR buf[256]; @@ -220,13 +213,14 @@ static void _test_alg_name(unsigned line, void *handle, const char *exname) status = pBCryptGetProperty(handle, BCRYPT_ALGORITHM_NAME, buf, sizeof(buf), &size, 0); ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); - ok_(__FILE__,line)(size == (strlen(exname)+1)*sizeof(WCHAR), "got %u\n", size); - ok_(__FILE__,line)(!strcmp_wa(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), exname); + ok_(__FILE__,line)(size == (lstrlenW(exname)+1)*sizeof(WCHAR), "got %u\n", size); + ok_(__FILE__,line)(!lstrcmpW(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), + wine_dbgstr_w(exname)); } struct hash_test { - const char *alg; + const WCHAR *alg; unsigned hash_size; const char *hash; const char *hash2; @@ -239,15 +233,12 @@ static void test_hash(const struct hash_test *test) BCRYPT_ALG_HANDLE alg; BCRYPT_HASH_HANDLE hash; UCHAR buf[512], buf_hmac[1024], hash_buf[128], hmac_hash[128]; - WCHAR alg_name[64]; char str[512]; NTSTATUS ret; ULONG len; - MultiByteToWideChar(CP_ACP, 0, test->alg, -1, alg_name, ARRAY_SIZE(alg_name)); - alg = NULL; - ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, test->alg, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); @@ -312,7 +303,7 @@ static void test_hash(const struct hash_test *test) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); alg = NULL; - ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ret = pBCryptOpenAlgorithmProvider(&alg, test->alg, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); @@ -380,19 +371,19 @@ static void test_hashes(void) { static const struct hash_test tests[] = { - { "SHA1", 20, + { L"SHA1", 20, "961fa64958818f767707072755d7018dcd278e94", "9314f62ff64197143c91fc86de37e9ae776a3fb8", "2472cf65d0e090618d769d3e46f0d9446cf212da", "b2d2ba8cfd714d474cf0d9622cc5d15e1f53d53f", }, - { "SHA256", 32, + { L"SHA256", 32, "ceb73749c899693706ede1e30c9929b3fd5dd926163831c2fb8bd41e6efb1126", "ea0938c118a7b15954f41b85195f2b42aec3a9429c63f593cfa65c137ffaa986", "34c1aa473a4468a91d06e7cdbc75bc4f93b830ccfc2a47ffd74e8e6ed29e4c72", "55feb7052060bd99e33f36eb0982c7f4856eb6a84fbefe19a1afd9faafc3af6f", }, - { "SHA384", 48, + { L"SHA384", 48, "62b21e90c9022b101671ba1f808f8631a8149f0f12904055839a35c1ca78ae53" "63eed1e743a692d70e0504b0cfd12ef9", "724db7c0bbc51ef1ac3fc793083fc54c0e5c423faec9b11378c01c236b19aaaf" @@ -402,7 +393,7 @@ static void test_hashes(void) "03e1818e5c165a0e54619e513acb06c393e1a6cb0ddbb4036b5f29617b334642" "e6e0be8b214d8508595b17a8c4b4e7db", }, - { "SHA512", 64, + { L"SHA512", 64, "d55ced17163bf5386f2cd9ff21d6fd7fe576a915065c24744d09cfae4ec84ee1" "ef6ef11bfbc5acce3639bab725b50a1fe2c204f8c820d6d7db0df0ecbc49c5ca", "7752d707b54d2b00e7d1c09120d189475b0fd2e31ebb988cf0a01fc8492ddc0b" @@ -412,19 +403,19 @@ static void test_hashes(void) "1487bcecba46ae677622fa499e4cb2f0fdf92f6f3427cba76382d537a06e49c3" "3e70a2fc1fc730092bf21128c3704cc6387f6dfbf7e2f9f315bbb894505a1205", }, - { "MD2", 16, + { L"MD2", 16, "1bb33606ba908912a84221109d29cd7e", "b9a6ad9323b17e2d0cd389dddd6ef78a", "7f05b0638d77f4a27f3a9c4d353cd648", "05980873e6bfdd05dd7b30078de7e42a", }, - { "MD4", 16, + { L"MD4", 16, "74b5db93c0b41e36ca7074338fc0b637", "a14a9ff2059a8c28f47b01e6bc48a1bf", "bc2e8ac4d8248ed21b8d26227a30ea3a", "b609db0eb4b8669db74f2c20099701e4", }, - { "MD5", 16, + { L"MD5", 16, "e2a3e68d23ce348b8f68b3079de3d4c9", "bcdd7ca574342aa9db0e212348eacb16", "7bda029b93fa8d817fcc9e13d6bdf092", @@ -460,7 +451,7 @@ static void test_BcryptHash(void) ok(alg != NULL, "alg not set\n"); test_hash_length(alg, 16); - test_alg_name(alg, "MD5"); + test_alg_name(alg, L"MD5"); memset(md5, 0, sizeof(md5)); ret = pBCryptHash(alg, NULL, 0, (UCHAR *)"test", sizeof("test"), md5, sizeof(md5)); @@ -541,7 +532,7 @@ static void test_BcryptDeriveKeyPBKDF2(void) ok(alg != NULL, "alg not set\n"); test_hash_length(alg, 20); - test_alg_name(alg, "SHA1"); + test_alg_name(alg, L"SHA1"); ret = pBCryptDeriveKeyPBKDF2(alg, rfc6070[0].pwd, rfc6070[0].pwd_len, rfc6070[0].salt, rfc6070[0].salt_len, 0, buf, rfc6070[0].dk_len, 0); @@ -581,7 +572,7 @@ static void test_rng(void) ret = pBCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); - test_alg_name(alg, "RNG"); + test_alg_name(alg, L"RNG"); memset(buf, 0, 16); ret = pBCryptGenRandom(alg, buf, 8, 0); @@ -654,7 +645,7 @@ static void test_aes(void) ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); ok(size == 64, "got %u\n", size); - test_alg_name(alg, "AES"); + test_alg_name(alg, L"AES"); ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

1 0