wine-commits June 2018

wine-commits@winehq.org

1 participants
629 discussions

Michael Müller : crypt32: Implement decoding of X509_ECC_SIGNATURE.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 718e9dce9cf49f4234fe968946136eb6f8d05d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718e9dce9cf49f4234fe9689… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 20 10:37:57 2018 +0300 crypt32: Implement decoding of X509_ECC_SIGNATURE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 4f11d0d..080feec 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6013,6 +6013,35 @@ static BOOL WINAPI CRYPT_AsnDecodeObjectIdentifier(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnDecodeEccSignature(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + CRYPT_DECODE_PARA *pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(CERT_ECC_SIGNATURE, r), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_UINT_BLOB), FALSE, + TRUE, offsetof(CERT_ECC_SIGNATURE, r.pbData), 0 }, + { ASN_INTEGER, offsetof(CERT_ECC_SIGNATURE, s), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_UINT_BLOB), FALSE, + TRUE, offsetof(CERT_ECC_SIGNATURE, s.pbData), 0 }, + }; + + __TRY + { + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, NULL, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, LPCSTR lpszStructType) { @@ -6155,6 +6184,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(X509_OBJECT_IDENTIFIER): decodeFunc = CRYPT_AsnDecodeObjectIdentifier; break; + case LOWORD(X509_ECC_SIGNATURE): + decodeFunc = CRYPT_AsnDecodeEccSignature; + break; } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS))

1 0

Michael Müller : crypt32: Implement decoding of X509_OBJECT_IDENTIFIER.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: d791d36a9ba2cc78c943660707141dfab770c288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d791d36a9ba2cc78c9436607… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 20 10:37:56 2018 +0300 crypt32: Implement decoding of X509_OBJECT_IDENTIFIER. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 15 +++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a613160..4f11d0d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5973,6 +5973,46 @@ BOOL CRYPT_AsnDecodePKCSEnvelopedData(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } +static BOOL WINAPI CRYPT_AsnDecodeObjectIdentifier(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + CRYPT_DECODE_PARA *pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + DWORD bytesNeeded = 0; + BOOL ret; + + __TRY + { + ret = CRYPT_AsnDecodeOidInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + NULL, &bytesNeeded, NULL); + if (ret) + { + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, bytesNeeded))) + { + LPSTR *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + + info = pvStructInfo; + *info = (void *)((BYTE *)info + sizeof(*info)); + ret = CRYPT_AsnDecodeOidInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, info); + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, LPCSTR lpszStructType) { @@ -6112,6 +6152,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(CMS_SIGNER_INFO): decodeFunc = CRYPT_AsnDecodeCMSSignerInfo; break; + case LOWORD(X509_OBJECT_IDENTIFIER): + decodeFunc = CRYPT_AsnDecodeObjectIdentifier; + break; } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -6166,6 +6209,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodePolicyQualifierUserNotice; else if (!strcmp(lpszStructType, szOID_CTL)) decodeFunc = CRYPT_AsnDecodeCTL; + else if (!strcmp(lpszStructType, szOID_ECC_PUBLIC_KEY)) + decodeFunc = CRYPT_AsnDecodeObjectIdentifier; return decodeFunc; } diff --git a/include/wincrypt.h b/include/wincrypt.h index 6e71fb9..a7c24e7 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -288,6 +288,11 @@ typedef struct _CERT_KEY_ATTRIBUTES_INFO { PCERT_PRIVATE_KEY_VALIDITY pPrivateKeyUsagePeriod; } CERT_KEY_ATTRIBUTES_INFO, *PCERT_KEY_ATTRIBUTES_INFO; +typedef struct _CERT_ECC_SIGNATURE { + CRYPT_UINT_BLOB r; + CRYPT_UINT_BLOB s; +} CERT_ECC_SIGNATURE, *PCERT_ECC_SIGNATURE; + /* byte 0 */ #define CERT_DIGITAL_SIGNATURE_KEY_USAGE 0x80 #define CERT_NON_REPUDIATION_KEY_USAGE 0x40 @@ -2878,6 +2883,12 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_X957 "1.2.840.10040" #define szOID_X957_DSA "1.2.840.10040.4.1" #define szOID_X957_SHA1DSA "1.2.840.10040.4.3" +#define szOID_ECC_PUBLIC_KEY "1.2.840.10045.2.1" +#define szOID_ECC_CURVE_P256 "1.2.840.10045.3.1.7" +#define szOID_ECDSA_SPECIFIED "1.2.840.10045.4.3" +#define szOID_ECDSA_SHA256 "1.2.840.10045.4.3.2" +#define szOID_ECDSA_SHA384 "1.2.840.10045.4.3.3" +#define szOID_ECDSA_SHA512 "1.2.840.10045.4.3.4" #define szOID_DS "2.5" #define szOID_DSALG "2.5.8" #define szOID_DSALG_CRPT "2.5.8.1" @@ -2919,6 +2930,8 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_OIWDIR_SIGN "1.3.14.7.2.3" #define szOID_OIWDIR_md2 "1.3.14.7.2.2.1" #define szOID_OIWDIR_md2RSA "1.3.14.7.2.3.1" +#define szOID_ECC_CURVE_P384 "1.3.132.0.34" +#define szOID_ECC_CURVE_P521 "1.3.132.0.35" #define szOID_INFOSEC "2.16.840.1.101.2.1" #define szOID_INFOSEC_sdnsSignature "2.16.840.1.101.2.1.1.1" #define szOID_INFOSEC_mosaicSignature "2.16.840.1.101.2.1.1.2" @@ -3223,6 +3236,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define X509_PKIX_POLICY_QUALIFIER_USERNOTICE ((LPCSTR)46) #define X509_DH_PUBLICKEY X509_MULTI_BYTE_UINT #define X509_DH_PARAMETERS ((LPCSTR)47) +#define X509_ECC_SIGNATURE ((LPCSTR)47) #define PKCS_ATTRIBUTES ((LPCSTR)48) #define PKCS_SORTED_CTL ((LPCSTR)49) #define X942_DH_PARAMETERS ((LPCSTR)50) @@ -3240,6 +3254,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CMC_ADD_EXTENSIONS ((LPCSTR)62) #define CMC_ADD_ATTRIBUTES ((LPCSTR)63) #define X509_CERTIFICATE_TEMPLATE ((LPCSTR)64) +#define X509_OBJECT_IDENTIFIER ((LPCSTR)73) #define PKCS7_SIGNER_INFO ((LPCSTR)500) #define CMS_SIGNER_INFO ((LPCSTR)501)

1 0

Nikolay Sivov : crypt32: Use ARRAY_SIZE macro.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 6de2e83e00f90b5be5231073a400e53209e4decc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de2e83e00f90b5be5231073… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 20 10:37:55 2018 +0300 crypt32: Use ARRAY_SIZE macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 3 +- dlls/crypt32/chain.c | 20 +++--- dlls/crypt32/crypt32_private.h | 2 + dlls/crypt32/decode.c | 89 ++++++++++++----------- dlls/crypt32/encode.c | 52 ++++++-------- dlls/crypt32/filestore.c | 3 +- dlls/crypt32/msg.c | 2 +- dlls/crypt32/object.c | 155 ++++++++++++++--------------------------- dlls/crypt32/oid.c | 9 ++- dlls/crypt32/regstore.c | 9 ++- dlls/crypt32/rootstore.c | 6 +- dlls/crypt32/sip.c | 5 +- dlls/crypt32/store.c | 7 +- dlls/crypt32/str.c | 6 +- 14 files changed, 150 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6de2e83e00f90b5be523…

1 0

Francois Gouget : wsdapi: Add a trailing '\n' to a WARN() message.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 9e2415dd0a205552e7f03dc01ef4fce8ee3e5d0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e2415dd0a205552e7f03dc0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 02:59:02 2018 +0200 wsdapi: Add a trailing '\n' to a WARN() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index e124a5d..c8f260c 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -540,7 +540,7 @@ static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, UL { if (impl->num_thread_handles >= MAX_WSD_THREADS) { - WARN("Exceeded maximum number of supported listener threads; too many network interfaces."); + WARN("Exceeded maximum number of supported listener threads; too many network interfaces.\n"); goto cleanup; }

1 0

Francois Gouget : winetest: Don't show dll= skipped messages for skipped tests.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 9b1431459d3085a19bef4dc4d5143043aa1797a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b1431459d3085a19bef4dc4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 20 02:58:49 2018 +0200 winetest: Don't show dll=skipped messages for skipped tests. This spams the report when using WineTest to run a few tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index bfac17b..b3c3c1c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -902,7 +902,6 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP if (test_filtered_out( lpszName, NULL )) { nr_of_skips++; - xprintf (" %s=skipped\n", dllname); return TRUE; } extract_test (&wine_tests[nr_of_files], tempdir, lpszName);

1 0

Zebediah Figura : user32/tests: Skip tests for window messages if we failed to receive foreground status.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 7ae7fbcc9150fc7eef0ab8ce82cf40b06113ef86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ae7fbcc9150fc7eef0ab8ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 17 16:07:16 2018 -0500 user32/tests: Skip tests for window messages if we failed to receive foreground status. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 2185cda..8fa1de2 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -691,14 +691,17 @@ static struct message sent_messages[MAXKEYMESSAGES]; static UINT sent_messages_cnt; /* Verify that only specified key state transitions occur */ -static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, const struct sendinput_test_s *test) +static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, + const struct sendinput_test_s *test, BOOL foreground) { int i, failcount = 0; const struct transition_s *t = test->expected_transitions; UINT actual_cnt = 0; const struct message *expected = test->expected_messages; - while (t->wVk) { + while (t->wVk && foreground) { + /* We won't receive any information from GetKeyboardState() if we're + * not the foreground window. */ BOOL matched = ((ks1[t->wVk]&0x80) == (t->before_state&0x80) && (ks2[t->wVk]&0x80) == (~t->before_state&0x80)); @@ -781,6 +784,13 @@ static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, const struct sendinp expected++; continue; } + else if (!(expected->flags & hook) && !foreground) + { + /* If we weren't able to receive foreground status, we won't get + * any window messages. */ + expected++; + continue; + } /* NT4 doesn't send SYSKEYDOWN/UP to hooks, only KEYDOWN/UP */ else if ((expected->flags & hook) && (expected->message == WM_SYSKEYDOWN || expected->message == WM_SYSKEYUP) && @@ -817,7 +827,7 @@ static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, const struct sendinp expected++; } /* skip all optional trailing messages */ - while (expected->message && (expected->flags & optional)) + while (expected->message && ((expected->flags & optional) || (!(expected->flags & hook) && !foreground))) expected++; @@ -897,6 +907,7 @@ static void test_Input_blackbox(void) int ii; BYTE ks1[256], ks2[256]; LONG_PTR prevWndProc; + BOOL foreground; HWND window; HHOOK hook; @@ -910,7 +921,9 @@ static void test_Input_blackbox(void) NULL, NULL); ok(window != NULL, "error: %d\n", (int) GetLastError()); SetWindowPos( window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); - SetForegroundWindow( window ); + foreground = SetForegroundWindow( window ); + if (!foreground) + skip("Failed to set foreground window; some tests will be skipped.\n"); if (!(hook = SetWindowsHookExA(WH_KEYBOARD_LL, hook_proc, GetModuleHandleA( NULL ), 0))) { @@ -939,15 +952,7 @@ static void test_Input_blackbox(void) pSendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); empty_message_queue(); GetKeyboardState(ks2); - if (!ii && sent_messages_cnt <= 1 && !memcmp( ks1, ks2, sizeof(ks1) )) - { - win_skip( "window doesn't receive the queued input\n" ); - /* release the key */ - i.u.ki.dwFlags |= KEYEVENTF_KEYUP; - pSendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); - break; - } - compare_and_check(ii, ks1, ks2, &sendinput_test[ii]); + compare_and_check(ii, ks1, ks2, &sendinput_test[ii], foreground); } empty_message_queue();

1 0

Zebediah Figura : user32/tests: Ignore all non-keyboard messages in test_Input_blackbox().
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: f312758bf0a89ad4af11990e3864995a10676323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f312758bf0a89ad4af11990e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 17 16:07:15 2018 -0500 user32/tests: Ignore all non-keyboard messages in test_Input_blackbox(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index e52f7d2..2185cda 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -848,16 +848,7 @@ static LRESULT CALLBACK WndProc2(HWND hWnd, UINT Msg, WPARAM wParam, { if (winetest_debug > 1) trace("MSG: %8x W:%8lx L:%8lx\n", Msg, wParam, lParam); - if (Msg != WM_PAINT && - Msg != WM_NCPAINT && - Msg != WM_SYNCPAINT && - Msg != WM_ERASEBKGND && - Msg != WM_NCHITTEST && - Msg != WM_GETTEXT && - Msg != WM_GETICON && - Msg != WM_IME_SELECT && - Msg != WM_DEVICECHANGE && - Msg != WM_TIMECHANGE) + if ((Msg >= WM_KEYFIRST && Msg <= WM_KEYLAST) || Msg == WM_SYSCOMMAND) { ok(sent_messages_cnt < MAXKEYMESSAGES, "Too many messages\n"); if (sent_messages_cnt < MAXKEYMESSAGES)

1 0

Zebediah Figura : winetest: Increase maximum tag length.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 1bb4a8676dc6b5c59a86ec26b45c04aa1a4b588e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb4a8676dc6b5c59a86ec26… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 17 11:28:53 2018 -0500 winetest: Increase maximum tag length. This should hopefully make those failures surrounding newtb-wvistau64-zh-CN go away. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/winetest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index e74f126..0446ad5 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -66,7 +66,7 @@ enum report_type { R_QUIET }; -#define MAXTAGLEN 20 +#define MAXTAGLEN 30 extern char *tag; extern char *email; extern BOOL aborting;

1 0

Francois Gouget : testbot/web: Highlight test failures and build errors on the job page.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: tools Branch: master Commit: 822f323e7b3b66cbb07b3883a2a4ab1fc853f5c7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=822f323e7b3b66cbb07b388… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 20 02:47:08 2018 +0200 testbot/web: Highlight test failures and build errors on the job page. Show build errors in the log summary mode (like we already do for the test failures). Furthermore, when showing the full log, highlight the test failures and build errors so they are easier to spot. This uses the same color scheme as in the test.winehq.org website. Also make the boundaries between the test units more visible by highlighting their start line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 61 ++++++++++++++++++++++++++++++++++++++++----- testbot/web/WineTestBot.css | 5 ++++ 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index f829407..3add52b 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -228,6 +228,58 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } +sub GetHtmlLine($$$) +{ + my ($self, $FullLog, $Line) = @_; + + $Line = $self->escapeHTML($Line); + if ($Line =~ /: Test marked todo: /) + { + return (undef, $Line) if (!$FullLog); + my $Html = $Line; + $Html =~ s~^(.*\S)\s*\r?$~<span class='log-todo'>$1</span>~; + return ($Html, $Line); + } + if ($Line =~ /: Tests skipped: / or + $Line =~ /^\w+:\w+ skipped /) + { + return (undef, $Line) if (!$FullLog); + my $Html = $Line; + $Html =~ s~^(.*\S)\s*\r?$~<span class='log-skip'>$1</span>~; + return ($Html, $Line); + } + 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: / or + # Build errors + $Line =~ /: error: / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or + # Typical perl errors + $Line =~ /^Use of uninitialized value/) + { + return ($Line, $Line) if (!$FullLog); + my $Html = $Line; + $Html =~ s~^(.*\S)\s*\r?$~<span class='log-error'>$1</span>~; + return ($Html, $Line); + } + if ($FullLog && + ($Line =~ /^\+ \S/ or + $Line =~ /^\w+:\w+ start / or + # Build messages + $Line =~ /^(?:Build|Reconfig|Task): ok/)) + { + my $Html = $Line; + $Html =~ s~^(.*\S)\s*\r?$~<span class='log-info'>$1</span>~; + return ($Html, $Line); + } + + return (undef, $Line); +} + my %MILogLabels = ( "log" => "task log", "log.old" => "old logs", @@ -371,11 +423,8 @@ sub GenerateBody($) { $CurrentDll = $1; } - if ($MoreInfo->{Full} || - $Line =~ m/: Test (?:failed|succeeded inside todo block): / || - $Line =~ m/Fatal: test '[^']+' does not exist/ || - $Line =~ m/ done $258$/ || - $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /) + my ($Highlight, $Plain) = $self->GetHtmlLine($MoreInfo->{Full}, $Line); + if ($MoreInfo->{Full} || defined $Highlight) { if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) { @@ -402,7 +451,7 @@ sub GenerateBody($) } else { - print $self->escapeHTML($Line), "\n"; + print(($Highlight || $Plain), "\n"); } } } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index ebc622e..28ac1b1 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -353,6 +353,11 @@ pre .boterror { color: #e55600; } .canceled { color: black; } +.log-info { background-color: #d9ffcc; } +.log-skip { color: blue; } +.log-todo { color: #d08000; } +.log-error { color: red; } + a.title { color:inherit; text-decoration: none; } th.Record { text-align: center; }

1 0

Francois Gouget : testbot/web: Allow showing multiple job screenshots and logs.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: tools Branch: master Commit: b0e2d37d418a7fdb038f4f0f7c6fc0fc168a00a7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b0e2d37d418a7fdb038f4f0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 20 02:46:51 2018 +0200 testbot/web: Allow showing multiple job screenshots and logs. It's now possible to have the job details page show multiple screenshots and multiple logs. Once a screenshot / log is shown, the link can be clicked again to hide it. The code can also more easily be extended to handle more log files. The code inserting the links is simpler too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 2 +- testbot/web/JobDetails.pl | 156 ++++++++++++++++++++++++++++----------------- 2 files changed, 97 insertions(+), 61 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3d8113f..c4ca578 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -448,7 +448,7 @@ elsif ($Step->Type eq "suite") if (defined($WebHostName)) { my $StepTask = 100 * $StepNo + $TaskNo; - $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&scrshot_$StepTask=1#k$StepTask\""; + $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&s$StepTask=1#k$StepTask\""; } my $Info = $VM->Description ? $VM->Description : ""; if ($VM->Details) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 70d8b59..f829407 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -228,12 +228,95 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } +my %MILogLabels = ( + "log" => "task log", + "log.old" => "old logs", +); + +sub InitMoreInfo($) +{ + my ($self) = @_; + + my $More = $self->{More} = {}; + my $Keys = $self->SortKeys(undef, $self->{Collection}->GetKeys()); + foreach my $Key (@$Keys) + { + my $StepTask = $self->{Collection}->GetItem($Key); + $More->{$Key}->{Screenshot} = $self->GetParam("s$Key"); + + my $Value = $self->GetParam("f$Key"); + my $TaskDir = $StepTask->GetTaskDir(); + foreach my $Log ("log", "log.old") + { + if (!-f "$TaskDir/$Log" or -z "$TaskDir/$Log") + { + my $Err = $Log; + next if ($Err !~ s/^log/err/ or !-f "$TaskDir/$Err" or -z "$TaskDir/$Err"); + } + push @{$More->{$Key}->{Logs}}, $Log; + + $More->{$Key}->{Full} = $Log if (uri_escape($Log) eq $Value); + } + $More->{$Key}->{Full} ||= ""; + } +} + +sub GenerateMoreInfoLink($$$;$) +{ + my ($self, $LinkKey, $Label, $Set, $Value) = @_; + + my $Url = $ENV{"SCRIPT_NAME"} ."?Key=". uri_escape($self->{JobId}); + + my $Action = "Show"; + foreach my $Key (sort keys %{$self->{More}}) + { + my $MoreInfo = $self->{More}->{$Key}; + if ($Key eq $LinkKey and $Set eq "Screenshot") + { + if (!$MoreInfo->{Screenshot}) + { + $Url .= "&s$Key=1"; + } + else + { + $Action = "Hide"; + } + } + else + { + $Url .= "&s$Key=1" if ($MoreInfo->{Screenshot}); + } + + if ($Key eq $LinkKey and $Set eq "Full") + { + if ($MoreInfo->{Full} ne $Value) + { + $Url .= "&f$Key=". uri_escape($Value); + } + else + { + $Action = "Hide"; + } + } + else + { + $Url .= "&f$Key=". uri_escape($MoreInfo->{Full}) if ($MoreInfo->{Full}); + } + } + $Url .= "#k" . uri_escape($LinkKey); + + print "<div class='TaskMoreInfoLink'><a href='", + $self->CGI->escapeHTML($Url), "'>$Action $Label</a></div>\n"; +} + sub GenerateBody($) { my ($self) = @_; $self->SUPER::GenerateBody(); + $self->InitMoreInfo(); + print "<div class='Content'>\n"; my $Keys = $self->SortKeys(undef, $self->{Collection}->GetKeys()); foreach my $Key (@$Keys) @@ -249,18 +332,11 @@ sub GenerateBody($) $self->CGI->escapeHTML($VM->Details || "No details!"), "</details>\n"; - my $FullLogParamName = "log_$Key"; - my $FullLog = $self->GetParam($FullLogParamName); - $FullLog = "" if ($FullLog !~ /^[12]$/); - - my $ScreenshotParamName = "scrshot_$Key"; - my $Screenshot = $self->GetParam($ScreenshotParamName); - $Screenshot = "" if ($Screenshot ne "1"); - + my $MoreInfo = $self->{More}->{$Key}; print "<div class='TaskMoreInfoLinks'>\n"; if (-r "$TaskDir/screenshot.png") { - if ($Screenshot) + if ($MoreInfo->{Screenshot}) { my $URI = "/Screenshot.pl?JobKey=" . uri_escape($self->{JobId}) . "&StepKey=" . uri_escape($StepTask->StepNo) . @@ -268,59 +344,19 @@ sub GenerateBody($) print "<div class='Screenshot'><img src='" . $self->CGI->escapeHTML($URI) . "' alt='Screenshot' /></div>\n"; } - else - { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . - "&$ScreenshotParamName=1"; - $URI .= "&$FullLogParamName=$FullLog"; - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show final screenshot</a></div>"; - print "\n"; - } + $self->GenerateMoreInfoLink($Key, "final screenshot", "Screenshot"); } - my $LogName = "$TaskDir/log"; - my $ErrName = "$TaskDir/err"; - if (-r $LogName and $FullLog != "1") - { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . - "&$FullLogParamName=1"; - $URI .= "&$ScreenshotParamName=$Screenshot"; - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show full log</a></div>\n"; - } - if ((-r $LogName or -r $ErrName) and $FullLog == "2") + foreach my $Log (@{$MoreInfo->{Logs}}) { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}); - $URI .= "&$ScreenshotParamName=$Screenshot"; - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show latest log</a></div>\n"; - } - if ((-r "$LogName.old" or -r "$ErrName.old") and $FullLog != "2") - { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . - "&$FullLogParamName=2"; - $URI .= "&$ScreenshotParamName=$Screenshot"; - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show old logs</a></div>\n"; + $self->GenerateMoreInfoLink($Key, $MILogLabels{$Log}, "Full", $Log); } print "</div>\n"; - if ($FullLog eq "2") - { - $LogName .= ".old"; - $ErrName .= ".old"; - } + my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; + my $ErrName = $LogName eq "log.old" ? "err.old" : "err"; - if (open LOGFILE, "<$LogName") + if (open LOGFILE, "<", "$TaskDir/$LogName") { my $HasLogEntries = !1; my $First = 1; @@ -335,13 +371,13 @@ sub GenerateBody($) { $CurrentDll = $1; } - if ($FullLog || + if ($MoreInfo->{Full} || $Line =~ m/: Test (?:failed|succeeded inside todo block): / || $Line =~ m/Fatal: test '[^']+' does not exist/ || $Line =~ m/ done $258$/ || $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /) { - if ($PrintedDll ne $CurrentDll && ! $FullLog) + if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) { if ($First) { @@ -359,7 +395,7 @@ sub GenerateBody($) print "<pre><code>"; $First = !1; } - if (! $FullLog && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + if (!$MoreInfo->{Full} && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) { my $Unit = $1 ne "" ? "$1: " : ""; print "${Unit}Timeout\n"; @@ -372,7 +408,7 @@ sub GenerateBody($) } close LOGFILE; - if (open ERRFILE, "<$ErrName") + if (open ERRFILE, "<", "$TaskDir/$ErrName") { $CurrentDll = "*err*"; while (defined($Line = <ERRFILE>)) @@ -409,7 +445,7 @@ sub GenerateBody($) " failures found" : "Empty log"; } } - elsif (open ERRFILE, "<$ErrName") + elsif (open ERRFILE, "<", "$TaskDir/$ErrName") { my $HasErrEntries = !1; my $Line;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2018