February 2020 - Wine-commits

Zebediah Figura : quartz/tests: Add tests for AVI splitter pin connection.
by Alexandre Julliard 05 Feb '20

05 Feb '20

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

Michael Stefaniuc : itss/tests: Get rid of a2w() and strcmp_wa().
by Alexandre Julliard 05 Feb '20

05 Feb '20

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

Zebediah Figura : quartz/tests: Improve tests for AVI splitter filter state.
by Alexandre Julliard 05 Feb '20

05 Feb '20

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

Zebediah Figura : quartz/tests: Add tests for MPEG splitter pin connection.
by Alexandre Julliard 05 Feb '20

05 Feb '20

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

Francois Gouget : testbot: Increase the Windows executable build timeout.
by Alexandre Julliard 05 Feb '20

05 Feb '20

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

Francois Gouget : testbot/UpdateTaskLogs: Also remove the .err file for the step reference report.
by Alexandre Julliard 05 Feb '20

05 Feb '20

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/doc: There is no direct dependency on DBD.
by Alexandre Julliard 05 Feb '20

05 Feb '20

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/LogUtils: Reorder the functions to get a more logical grouping.
by Alexandre Julliard 05 Feb '20

05 Feb '20

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 05 Feb '20

05 Feb '20

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

Alistair Leslie-Hughes : oledb32: Add page for ODBC connections to datalink dialog.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 9d98733baa68a194ba6ea35c48047b1fa3cd7e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d98733baa68a194ba6ea35c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 3 04:30:13 2020 +0000 oledb32: Add page for ODBC connections to datalink dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 113 +++++++++++++++++++++++++++++++++++++++++++---- dlls/oledb32/resource.h | 19 ++++++++ dlls/oledb32/version.rc | 26 +++++++++++ po/ar.po | 76 ++++++++++++++++++++++++++++++- po/ast.po | 70 ++++++++++++++++++++++++++++- po/bg.po | 69 ++++++++++++++++++++++++++++- po/ca.po | 76 ++++++++++++++++++++++++++++++- po/cs.po | 76 ++++++++++++++++++++++++++++++- po/da.po | 76 ++++++++++++++++++++++++++++++- po/de.po | 76 ++++++++++++++++++++++++++++++- po/el.po | 62 +++++++++++++++++++++++++- po/en.po | 56 ++++++++++++++++++++++- po/en_US.po | 56 ++++++++++++++++++++++- po/eo.po | 72 +++++++++++++++++++++++++++++- po/es.po | 76 ++++++++++++++++++++++++++++++- po/fa.po | 61 ++++++++++++++++++++++++- po/fi.po | 76 ++++++++++++++++++++++++++++++- po/fr.po | 76 ++++++++++++++++++++++++++++++- po/he.po | 73 +++++++++++++++++++++++++++++- po/hi.po | 56 ++++++++++++++++++++++- po/hr.po | 76 ++++++++++++++++++++++++++++++- po/hu.po | 76 ++++++++++++++++++++++++++++++- po/it.po | 76 ++++++++++++++++++++++++++++++- po/ja.po | 76 ++++++++++++++++++++++++++++++- po/ko.po | 76 ++++++++++++++++++++++++++++++- po/lt.po | 76 ++++++++++++++++++++++++++++++- po/ml.po | 56 ++++++++++++++++++++++- po/nb_NO.po | 76 ++++++++++++++++++++++++++++++- po/nl.po | 76 ++++++++++++++++++++++++++++++- po/or.po | 56 ++++++++++++++++++++++- po/pa.po | 56 ++++++++++++++++++++++- po/pl.po | 76 ++++++++++++++++++++++++++++++- po/pt_BR.po | 76 ++++++++++++++++++++++++++++++- po/pt_PT.po | 76 ++++++++++++++++++++++++++++++- po/rm.po | 59 ++++++++++++++++++++++++- po/ro.po | 76 ++++++++++++++++++++++++++++++- po/ru.po | 76 ++++++++++++++++++++++++++++++- po/si.po | 76 ++++++++++++++++++++++++++++++- po/sk.po | 74 ++++++++++++++++++++++++++++++- po/sl.po | 76 ++++++++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 68 +++++++++++++++++++++++++++- po/sr_RS(a)latin.po | 70 ++++++++++++++++++++++++++++- po/sv.po | 76 ++++++++++++++++++++++++++++++- po/ta.po | 56 ++++++++++++++++++++++- po/te.po | 56 ++++++++++++++++++++++- po/th.po | 61 ++++++++++++++++++++++++- po/tr.po | 76 ++++++++++++++++++++++++++++++- po/uk.po | 76 ++++++++++++++++++++++++++++++- po/wa.po | 65 ++++++++++++++++++++++++++- po/wine.pot | 56 ++++++++++++++++++++++- po/zh_CN.po | 76 ++++++++++++++++++++++++++++++- po/zh_TW.po | 76 ++++++++++++++++++++++++++++++- 52 files changed, 3488 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d98733baa68a194ba6e…

1 0