wine-devel

wine-devel@winehq.org

6 participants
84404 discussions

[PATCH 1/7] crypt32/tests: Add tests for short return string buffer.
by Paul Gofman 14 Apr '22

14 Apr '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/crypt32/tests/str.c | 332 +++++++++++++++------------------------ 1 file changed, 127 insertions(+), 205 deletions(-) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index a94381591c0..c91a27a0995 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -429,23 +429,30 @@ static void test_CertNameToStrA(void) test_NameToStrConversionA(&blob, CERT_SIMPLE_NAME_STR, "\"a\nb\"", FALSE); } -static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, - LPCWSTR expected, BOOL todo) +#define test_NameToStrConversionW(a, b, c) test_NameToStrConversionW_(__LINE__, a, b, c) +static void test_NameToStrConversionW_(unsigned int line, PCERT_NAME_BLOB pName, DWORD dwStrType, LPCWSTR expected) { - WCHAR buffer[2000] = { 0 }; - DWORD i; - - i = CertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, NULL, 0); - todo_wine_if (todo) - ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %ld\n", - lstrlenW(expected) + 1, i); - i = CertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, buffer, ARRAY_SIZE(buffer)); - todo_wine_if (todo) - ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %ld\n", - lstrlenW(expected) + 1, i); - todo_wine_if (todo) - ok(!lstrcmpW(buffer, expected), "Expected %s, got %s\n", - wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); + WCHAR buffer[2000]; + DWORD len, retlen; + + memset(buffer, 0xcc, sizeof(buffer)); + len = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, NULL, 0); + ok(len == wcslen(expected) + 1, "line %u: expected %u chars, got %lu\n", line, wcslen(expected) + 1, len); + retlen = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, buffer, ARRAY_SIZE(buffer)); + ok(retlen == len, "line %u: expected %lu chars, got %lu.\n", line, len, retlen); + ok(!wcscmp(buffer, expected), "Expected %s, got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + retlen = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, buffer, len - 1); + todo_wine ok(retlen == len - 1, "line %u: expected %lu chars, got %lu\n", line, len - 1, retlen); + ok(!wcsncmp(buffer, expected, retlen - 1), "line %u: expected %s, got %s\n", + line, wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); + ok(!buffer[retlen - 1], "line %u: string is not zero terminated.\n", line); + + memset(buffer, 0xcc, sizeof(buffer)); + retlen = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, buffer, 0); + todo_wine ok(retlen == len, "line %u: expected %lu chars, got %lu\n", line, len - 1, retlen); + ok(buffer[0] == 0xcccc, "line %u: got %s\n", line, wine_dbgstr_w(buffer)); } static void test_CertNameToStrW(void) @@ -479,95 +486,79 @@ static void test_CertNameToStrW(void) test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, - L"US, Minnesota, Minneapolis, CodeWeavers, Wine Development, localhost, aric(a)codeweavers.com", FALSE); + L"US, Minnesota, Minneapolis, CodeWeavers, Wine Development, localhost, aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, - L"US; Minnesota; Minneapolis; CodeWeavers; Wine Development; localhost; aric(a)codeweavers.com", FALSE); + L"US; Minnesota; Minneapolis; CodeWeavers; Wine Development; localhost; aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_CRLF_FLAG, - L"US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\nWine Development\r\nlocalhost\r\naric(a)codeweavers.com", - FALSE); + L"US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\nWine Development\r\nlocalhost\r\naric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR, L"2.5.4.6=US, 2.5.4.8=Minnesota, 2.5.4.7=Minneapolis, 2.5.4.10=CodeWeavers, 2.5.4.11=Wine Development," - " 2.5.4.3=localhost, 1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); + " 2.5.4.3=localhost, 1.2.840.113549.1.9.1=aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, L"2.5.4.6=US; 2.5.4.8=Minnesota; 2.5.4.7=Minneapolis; 2.5.4.10=CodeWeavers; 2.5.4.11=Wine Development;" - " 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); + " 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_CRLF_FLAG, L"2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine " - "Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); + "Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_X500_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG | CERT_NAME_STR_REVERSE_FLAG, L"E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; " - "C=US", FALSE); + "C=US"); CertFreeCertificateContext(context); } blob.pbData = encodedSimpleCN; blob.cbData = sizeof(encodedSimpleCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=1", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=1"); blob.pbData = encodedSingleQuotedCN; blob.cbData = sizeof(encodedSingleQuotedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN='1'", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - L"'1'", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN='1'"); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"'1'"); blob.pbData = encodedSpacedCN; blob.cbData = sizeof(encodedSpacedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\" 1 \"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\" 1 \"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\" 1 \""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\" 1 \""); blob.pbData = encodedQuotedCN; blob.cbData = sizeof(encodedQuotedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"\"\"1\"\"\"", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"\"\"1\"\"\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"\"\"1\"\"\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"\"\"1\"\"\""); blob.pbData = encodedMultipleAttrCN; blob.cbData = sizeof(encodedMultipleAttrCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"1+2\"", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - L"\"1+2\"", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"1+2\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"1+2\""); blob.pbData = encodedCommaCN; blob.cbData = sizeof(encodedCommaCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a,b\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a,b\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a,b\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a,b\""); blob.pbData = encodedEqualCN; blob.cbData = sizeof(encodedEqualCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a=b\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a=b\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a=b\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a=b\""); blob.pbData = encodedLessThanCN; blob.cbData = sizeof(encodedLessThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"<\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"<\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"<\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"<\""); blob.pbData = encodedGreaterThanCN; blob.cbData = sizeof(encodedGreaterThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\">\"", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - L"\">\"", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\">\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\">\""); blob.pbData = encodedHashCN; blob.cbData = sizeof(encodedHashCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"#\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"#\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"#\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"#\""); blob.pbData = encodedSemiCN; blob.cbData = sizeof(encodedSemiCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\";\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\";\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\";\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\";\""); blob.pbData = encodedNewlineCN; blob.cbData = sizeof(encodedNewlineCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a\nb\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a\nb\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a\nb\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a\nb\""); } struct StrToNameA @@ -747,153 +738,84 @@ static void test_CertStrToNameW(void) } } -static void test_CertGetNameStringA(void) +#define test_CertGetNameString_value(a, b, c, d) test_CertGetNameString_value_(__LINE__, a, b, c, d) +static void test_CertGetNameString_value_(unsigned int line, PCCERT_CONTEXT context, DWORD type, void *type_para, + const char *expected) +{ + WCHAR expectedW[512]; + DWORD len, retlen; + WCHAR strW[512]; + unsigned int i; + char str[512]; + + for (i = 0; expected[i]; ++i) + expectedW[i] = expected[i]; + expectedW[i] = 0; + + len = CertGetNameStringA(context, type, 0, type_para, NULL, 0); + ok(len == strlen(expected) + 1, "line %u: unexpected length %ld.\n", line, len); + retlen = CertGetNameStringA(context, type, 0, type_para, str, len); + ok(retlen == len, "line %u: unexpected len %lu, expected %lu.\n", line, retlen, len); + ok(!strcmp(str, expected), "line %u: unexpected value %s.\n", line, str); + str[0] = str[1] = 0xcc; + retlen = CertGetNameStringA(context, type, 0, type_para, str, len - 1); + todo_wine ok(retlen == 1, "line %u: Unexpected len %lu, expected 1.\n", line, retlen); + todo_wine ok(!str[0], "line %u: unexpected str[0] %#x.\n", line, str[0]); + ok(str[1] == expected[1], "line %u: unexpected str[1] %#x.\n", line, str[1]); + retlen = CertGetNameStringW(context, type, 0, type_para, strW, len); + ok(retlen == len, "line %u: unexpected len %lu, expected 1.\n", line, retlen); + ok(!wcscmp(strW, expectedW), "line %u: unexpected value %s.\n", line, debugstr_w(strW)); + strW[0] = strW[1] = 0xcccc; + retlen = CertGetNameStringW(context, type, 0, type_para, strW, len - 1); + todo_wine ok(retlen == len - 1, "line %u: unexpected len %lu, expected %lu.\n", line, retlen, len - 1); + ok(!wcsncmp(strW, expectedW, retlen - 1), "line %u: string data mismatch.\n", line); + ok(!strW[retlen - 1], "line %u: string is not zero terminated.\n", line); + retlen = CertGetNameStringA(context, type, 0, type_para, NULL, len - 1); + ok(retlen == len, "line %u: unexpected len %lu, expected %lu\n", line, retlen, len); + retlen = CertGetNameStringW(context, type, 0, type_para, NULL, len - 1); + ok(retlen == len, "line %u: unexpected len %lu, expected %lu\n", line, retlen, len); +} + +static void test_CertGetNameString(void) { + static const char aric[] = "aric(a)codeweavers.com"; + static const char localhost[] = "localhost"; PCCERT_CONTEXT context; + DWORD len, type; context = CertCreateCertificateContext(X509_ASN_ENCODING, cert, sizeof(cert)); - ok(context != NULL, "CertCreateCertificateContext failed: %08lx\n", - GetLastError()); - if (context) - { - static const char aric[] = "aric(a)codeweavers.com"; - static const char localhost[] = "localhost"; - DWORD len, type; - LPSTR str; - - /* Bad string types/types missing from the cert */ - len = CertGetNameStringA(NULL, 0, 0, NULL, NULL, 0); - ok(len == 1, "expected 1, got %ld\n", len); - len = CertGetNameStringA(context, 0, 0, NULL, NULL, 0); - ok(len == 1, "expected 1, got %ld\n", len); - len = CertGetNameStringA(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, - 0); - ok(len == 1, "expected 1, got %ld\n", len); - - len = CertGetNameStringA(context, CERT_NAME_EMAIL_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_EMAIL_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, aric), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(issuerStr) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, issuerStr), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - type = 0; - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, NULL, - 0); - ok(len == strlen(issuerStr) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, - str, len); - ok(!strcmp(str, issuerStr), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - type = CERT_OID_NAME_STR; - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, NULL, - 0); - ok(len == strlen(subjectStr) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, - str, len); - ok(!strcmp(str, subjectStr), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, aric), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_RSA_emailAddr, NULL, 0); - ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_RSA_emailAddr, str, len); - ok(!strcmp(str, aric), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_COMMON_NAME, NULL, 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_COMMON_NAME, str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, - NULL, NULL, 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, - 0, NULL, str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, - NULL, NULL, 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, - 0, NULL, str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_DNS_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - if (len > 1) - { - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_DNS_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - } - - CertFreeCertificateContext(context); - } + ok(!!context, "CertCreateCertificateContext failed, err %lu\n", GetLastError()); + + /* Bad string types/types missing from the cert */ + len = CertGetNameStringA(NULL, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringA(context, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringA(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + + len = CertGetNameStringW(NULL, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringW(context, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringW(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + + test_CertGetNameString_value(context, CERT_NAME_EMAIL_TYPE, NULL, aric); + test_CertGetNameString_value(context, CERT_NAME_RDN_TYPE, NULL, issuerStr); + type = 0; + test_CertGetNameString_value(context, CERT_NAME_RDN_TYPE, &type, issuerStr); + type = CERT_OID_NAME_STR; + test_CertGetNameString_value(context, CERT_NAME_RDN_TYPE, &type, subjectStr); + test_CertGetNameString_value(context, CERT_NAME_ATTR_TYPE, NULL, aric); + test_CertGetNameString_value(context, CERT_NAME_ATTR_TYPE, (void *)szOID_RSA_emailAddr, aric); + test_CertGetNameString_value(context, CERT_NAME_ATTR_TYPE, (void *)szOID_COMMON_NAME, localhost); + test_CertGetNameString_value(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, NULL, localhost); + test_CertGetNameString_value(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, NULL, localhost); + test_CertGetNameString_value(context, CERT_NAME_DNS_TYPE, NULL, localhost); + + CertFreeCertificateContext(context); } START_TEST(str) @@ -904,5 +826,5 @@ START_TEST(str) test_CertNameToStrW(); test_CertStrToNameA(); test_CertStrToNameW(); - test_CertGetNameStringA(); + test_CertGetNameString(); } -- 2.35.1

2 7

[PATCH vkd3d] vkd3d: Add a function to mark unreachable code.
by Giovanni Mascellani 14 Apr '22

14 Apr '22

This allows to specify an error message (though, given that the code is supposed to be unreachable, I didn't bother with a full printf-style facility) and, given that it is marked as "noreturn", it should silence warnings about some branches not returning without requiring some additional "return 0" statement or similar. With this patch, no warnings are generated in my environment ("gcc (Debian 11.2.0-19) 11.2.0"). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- include/private/vkd3d_common.h | 8 ++++++ libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl.y | 9 +++---- libs/vkd3d-shader/hlsl_codegen.c | 3 +-- libs/vkd3d-shader/hlsl_constant_ops.c | 13 +++------ libs/vkd3d-shader/hlsl_sm1.c | 9 +++---- libs/vkd3d-shader/hlsl_sm4.c | 38 ++++++++++----------------- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 9 files changed, 38 insertions(+), 49 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 11acc643..56382a8b 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -27,6 +27,7 @@ #include <limits.h> #include <stdbool.h> #include <stdint.h> +#include <stdio.h> #ifdef _MSC_VER #include <intrin.h> @@ -61,6 +62,13 @@ static inline size_t align(size_t addr, size_t alignment) # define VKD3D_UNUSED #endif /* __GNUC__ */ +#define vkd3d_unreachable(msg) vkd3d_unreachable_(__FILE__, __LINE__, msg) +VKD3D_NORETURN static inline void vkd3d_unreachable_(const char *filename, unsigned int line, const char *msg) +{ + fprintf(stderr, "%s:%u: Aborting, unreachable code reached%s%s.\n", filename, line, msg ? ": " : "", msg ? msg : ""); + abort(); +} + static inline unsigned int vkd3d_popcount(unsigned int v) { #ifdef _MSC_VER diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index eabe189f..1ebd97c1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1188,7 +1188,7 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl break; default: - assert(0); + vkd3d_unreachable("Unknown type"); } } if (type->dimx != 1) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 802adf87..2ccc3640 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -692,8 +692,7 @@ static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) case HLSL_SAMPLER_DIM_CUBEARRAY: return 4; default: - assert(0); - return 0; + vkd3d_unreachable("Unknown sampler type"); } } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1eb7d2ee..437f26c0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -869,8 +869,7 @@ static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) case HLSL_TYPE_BOOL: return !!value->u; default: - assert(0); - return 0; + vkd3d_unreachable("Unknown type"); } } @@ -887,10 +886,10 @@ static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) case HLSL_IR_STORE: WARN("Invalid node type %s.\n", hlsl_node_type_to_string(node->type)); return 0; - } - assert(0); - return 0; + default: + vkd3d_unreachable("Unknown node type"); + } } static bool expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 72c00430..1a2193b9 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1257,8 +1257,7 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct hlsl_b return; default: - assert(0); - return; + vkd3d_unreachable("Unknown type"); } defs->values[constant->reg.id + y].f[x] = f; } diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 5cac4bde..84599563 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -77,8 +77,7 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct break; default: - assert(0); - return false; + vkd3d_unreachable("Unknown type"); } switch (dst->node.data_type->base_type) @@ -101,13 +100,10 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct break; case HLSL_TYPE_BOOL: - /* Casts to bool should have already been lowered. */ - assert(0); - break; + vkd3d_unreachable("Casts to bool should have already been lowered"); default: - assert(0); - return false; + vkd3d_unreachable("Unknown type"); } } return true; @@ -246,8 +242,7 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, break; default: - assert(0); - return false; + vkd3d_unreachable("Unknown type"); } dst->value[k].u *= ~0u; diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 0cdd3917..67a4345f 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -159,8 +159,7 @@ static D3DXPARAMETER_CLASS sm1_class(const struct hlsl_type *type) return D3DXPC_VECTOR; default: ERR("Invalid class %#x.\n", type->type); - assert(0); - return 0; + vkd3d_unreachable("Unknown class"); } } @@ -193,6 +192,7 @@ static D3DXPARAMETER_TYPE sm1_base_type(const struct hlsl_type *type) return D3DXPT_SAMPLER; default: ERR("Invalid dimension %#x.\n", type->sampler_dim); + vkd3d_unreachable("Unknown dimension"); } break; case HLSL_TYPE_STRING: @@ -212,6 +212,7 @@ static D3DXPARAMETER_TYPE sm1_base_type(const struct hlsl_type *type) return D3DXPT_TEXTURE; default: ERR("Invalid dimension %#x.\n", type->sampler_dim); + vkd3d_unreachable("Unknown dimension"); } break; case HLSL_TYPE_VERTEXSHADER: @@ -219,10 +220,8 @@ static D3DXPARAMETER_TYPE sm1_base_type(const struct hlsl_type *type) case HLSL_TYPE_VOID: return D3DXPT_VOID; default: - assert(0); + vkd3d_unreachable("Unknown type"); } - assert(0); - return 0; } static const struct hlsl_type *get_array_type(const struct hlsl_type *type) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 76f08339..41110a99 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -279,8 +279,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) return D3D_SVC_VECTOR; default: ERR("Invalid class %#x.\n", type->type); - assert(0); - return 0; + vkd3d_unreachable("Unknown class"); } } @@ -313,7 +312,7 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) case HLSL_SAMPLER_DIM_GENERIC: return D3D_SVT_SAMPLER; default: - assert(0); + vkd3d_unreachable("Unknown dimension"); } break; case HLSL_TYPE_STRING: @@ -332,7 +331,7 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) case HLSL_SAMPLER_DIM_GENERIC: return D3D_SVT_TEXTURE; default: - assert(0); + vkd3d_unreachable("Unknown dimension"); } break; case HLSL_TYPE_UINT: @@ -342,10 +341,8 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) case HLSL_TYPE_VOID: return D3D_SVT_VOID; default: - assert(0); + vkd3d_unreachable("Unknown type"); } - assert(0); - return 0; } static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, struct hlsl_type *type) @@ -409,8 +406,7 @@ static D3D_SHADER_INPUT_TYPE sm4_resource_type(const struct hlsl_type *type) case HLSL_TYPE_TEXTURE: return D3D_SIT_TEXTURE; default: - assert(0); - return 0; + vkd3d_unreachable("Unknown type"); } } @@ -434,8 +430,7 @@ static D3D_RESOURCE_RETURN_TYPE sm4_resource_format(const struct hlsl_type *type return D3D_RETURN_TYPE_UINT; default: - assert(0); - return 0; + vkd3d_unreachable("Unknown type"); } } @@ -462,8 +457,7 @@ static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *typ case HLSL_SAMPLER_DIM_CUBEARRAY: return D3D_SRV_DIMENSION_TEXTURECUBEARRAY; default: - assert(0); - return D3D_SRV_DIMENSION_UNKNOWN; + vkd3d_unreachable("Unknown dimension"); } } @@ -759,8 +753,7 @@ static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_typ case HLSL_SAMPLER_DIM_CUBEARRAY: return VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY; default: - assert(0); - return 0; + vkd3d_unreachable("Unknown dimension"); } } @@ -795,8 +788,7 @@ static uint32_t sm4_encode_instruction_modifier(const struct sm4_instruction_mod break; default: - assert(0); - break; + vkd3d_unreachable("Unknown modifier"); } return word; @@ -1477,7 +1469,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; default: - assert(0); + vkd3d_unreachable("Unknown type"); } break; @@ -1503,7 +1495,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; default: - assert(0); + vkd3d_unreachable("Unknown type"); } break; @@ -1529,7 +1521,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; default: - assert(0); + vkd3d_unreachable("Unknown type"); } break; @@ -1542,12 +1534,10 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - /* Casts to bool should have already been lowered. */ - assert(0); - break; + vkd3d_unreachable("Casts to bool should have already been lowered"); default: - assert(0); + vkd3d_unreachable("Unknown type"); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 62baf17f..17e9ea98 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1282,7 +1282,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, break; default: - assert(0); + vkd3d_unreachable("Unknown source type"); } vkd3d_shader_message_context_trace_messages(&message_context); -- 2.35.1

4 6

[PATCH] wow64cpu: Use different JMP instruction to work around Rosetta bug.
by Brendan Shanks 14 Apr '22

14 Apr '22

Rosetta 2 on macOS 11 and 12 (before 12.4) does not support the 0xEA JMP instruction, use the indirect form instead. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/wow64cpu/cpu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index a029b251be0..34c3f3ad493 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -33,7 +33,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); #include "pshpack1.h" struct thunk_32to64 { - BYTE ljmp; /* ljmp %cs:1f */ + BYTE ljmp; /* jump far, absolute indirect */ + BYTE modrm; /* address=disp32, opcode=5 */ + DWORD op; DWORD addr; WORD cs; }; @@ -195,7 +197,9 @@ NTSTATUS WINAPI BTCpuProcessInit(void) ds64_sel = context.SegDs; fs32_sel = context.SegFs; - thunk->ljmp = 0xea; + thunk->ljmp = 0xff; + thunk->modrm = 0x2d; + thunk->op = PtrToUlong( &thunk->addr ); thunk->addr = PtrToUlong( syscall_32to64 ); thunk->cs = cs64_sel; NtProtectVirtualMemory( GetCurrentProcess(), (void **)&thunk, &size, PAGE_EXECUTE_READ, &old_prot ); -- 2.32.0 (Apple Git-132)

1 0

Wiki Account Creation Disabled
by Jeremy Newman 14 Apr '22

14 Apr '22

I've disabled account creation on the wiki. We already only allow trusted accounts to edit the wiki. I'm tired of the bots just adding accounts for no reason. From now on, if someone wants an account for editing, they can contact me, and I'll get them setup, as I've already been doing edit privs anyway. -N

1 0

[tools] winetest/cron: Refresh the pattern page regularly.
by Francois Gouget 14 Apr '22

14 Apr '22

This ensures the links to the WineHQ bugs contain a mostly up-to-date status and bug description even after the day's WineTest jobs have completed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Feel free to adjust pattern_interval to taste. I figure 10 minutes would be a minimum and 4 hours would be really long. So I picked one hour to be sure to put a negligible load on Bugzilla, but that may be too conservative. --- winetest/winetest.cron | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 40a1bb741..2cfb08994 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -18,6 +18,7 @@ # */5 * * * * winetest.cron WORKDIR # Leave empty to disable the corresponding task +pattern_interval=60 # pattern page refresh interval (for WineHQ bug links) build_compress=120 # days before compressing old-data builds build_expire= # days before deleting old-data builds winetest_expire=120 # days before deleting winetest binaries @@ -49,6 +50,7 @@ then trap cleanup EXIT cd "$workdir" + refresh_patterns="" refresh_index="" refresh_errors="" while true @@ -70,7 +72,8 @@ then refresh_index=1 refresh_errors=1 fi - [ -n "$refresh_index" ] && "$tools/build-patterns" + [ -n "$refresh_index" ] || refresh_patterns=`find "data/patterns.html" -mmin +$pattern_interval` + [ -n "$refresh_index$refresh_patterns" ] && "$tools/build-patterns" [ -n "$refresh_index" ] && "$tools/build-index" [ -n "$refresh_errors" ] && "$tools/build-errors" -- 2.30.2

1 0

[tools] testbot/cgi: Only refresh pages when the top is visible.
by Francois Gouget 14 Apr '22

14 Apr '22

This stops pages from refreshing and losing the scroll position while one is inspecting a log file, looking at old job results, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 33 ++++++++++++++++++------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 55e015d58..477a2ff15 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -416,11 +416,6 @@ sub GenerateHttpHeaders($) # HTTP/1.0 $Request->headers_out->add("Pragma", "no-cache"); - if ($self->{Refresh}) - { - $self->{Request}->headers_out->add("Refresh", $self->{Refresh}); - } - # Force char set $Request->content_type("text/html; charset=UTF-8"); @@ -462,12 +457,32 @@ EOF } print ">\n"; - print <<EOF; + print "<div id='logo_blurb'>${ProjectName} Test Bot</div>\n"; + if ($self->{Refresh}) + { + print <<EOF; +<script type='text/javascript'> + +</script> +EOF + } + print <<EOF; <div id='tabs'> <ul> <li><a href='//www.winehq.org/'>WineHQ</a></li> -- 2.30.2

1 0

[PATCH 5/8] win32u: Move NtUserClientToScreen implementation from user32.
by Jacek Caban 14 Apr '22

14 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 130 +------------------------------------------ dlls/win32u/window.c | 22 ++++++++ include/ntuser.h | 6 ++ 3 files changed, 30 insertions(+), 128 deletions(-)

3 2

[tools] testbot/LibvirtTool: Allow using preconfigured non-live snapshots as a base.
by Francois Gouget 14 Apr '22

14 Apr '22

Don't use 'test-live' as a base because we cannot assume that rebooting it will not break its configuration. But do use snapshots such as 'test-adm' as a base. This allows automating the creation of live snapshots for Windows versions where a given option is not supported. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Such as the adm option on Windows 7. --- testbot/bin/LibvirtTool.pl | 41 ++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index df7859dea..a9622de7d 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -613,27 +613,34 @@ sub PrepareVM($) } } -sub GetSnapshotConfig($) +sub GetSnapshotConfig($$) { - my ($Config) = @_; - - # Don't stack snapshots. For instance assume the snapshot name is - # 'test-live-fr-FR-tsign' and that 'test-live-fr-FR' already exists - # (typically because it is used by another VM): - # - It's probably better if snapshots are independent from each other. - # - Applying the 'tsign' flag on top of the existing snapshot requires a - # Windows reboot. But format locale changes may not stick across reboots. - # - Stopping the snapshot name parsing when finding an existing snapshot name - # would lose the 'live' flag resulting in an error (or the wrong type of - # snapshot. Avoiding this issue would result in more complexity. - # - Finally snapshot stacking does not seem that useful. - # - A consequence is that the base snapshot should be called 'test' and not - # 'test-live'. + my ($Domain, $Config) = @_; + + # Notes: + # - Don't use a live snapshot as a base snapshot: + # - It's probably better if snapshots are independent from each other. + # - Applying extra options on top of a live snapshot may require a reboot. + # But some locales changes may not survive that. So using, for instance, + # test-fr-FR-live as a base may break the locale. + # - However some options are not supported on all Windows versions. For + # instance 'adm' snapshots cannot be created on Windows 7 so in that case + # it is useful to be able to use a preconfigured test-adm as a base + # snapshot for test-adm-live. + # - Finally, although base snapshots, such as 'test', are presumably powered + # off, 'off' snapshots still create a new snapshot. The difference is that + # the 'test-off' snapshot will have an up-to-date TestAgentd server, the + # right desktop background, etc. while (1) { + if ($Config->{base} !~ /-live\b/ and + $Domain->HasSnapshot($Config->{base})) + { + last; + } if ($Config->{base} =~ s/-([a-z]{2}-[A-Z]{2})$//) { - $Config->{locale} ||= $1; # take only the last match + $Config->{locale} ||= $1; # use the last locale in the snapshot name } elsif ($Config->{base} =~ s/-(adm|live|off|tsign|u8)$//) { @@ -837,7 +844,7 @@ sub Revert() if (!$Domain->HasSnapshot($Config->{base})) { $Config->{create} = 1; - GetSnapshotConfig($Config); + GetSnapshotConfig($Domain, $Config); Debug(join(" ", Elapsed($Start), "Config:", map { "$_=$Config->{$_}" } sort keys %$Config), "\n"); if ($Config->{locale} and $VM->Type !~ /^win(?:32|64)$/) { -- 2.30.2

1 0

[tools] testbot/LibvirtTool: Add a proper usage message.
by Francois Gouget 14 Apr '22

14 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 33760d365..df7859dea 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -141,6 +141,31 @@ if (!defined $Usage) if (defined $Usage) { print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|checkoff|monitor|poweroff|revert) VMName\n"; + print "\n"; + print "Prepare the VM for use by the TestBot.\n"; + print "\n"; + print "Where:\n"; + print " VMName Is the name of the TestBot VM to work on.\n"; + print " checkidle Checks that the virtual machine is running the appropriate\n"; + print " snapshot for the VM and sets the VM status to either idle (if it\n"; + print " does), off (if it is powered off) or offline (in case of Libvirt\n"; + print " error).\n"; + print " checkoff Checks that the virtual machine is powered off and sets the VM's\n"; + print " status to either off (if it is) or offline (in case of Libvirt\n"; + print " error).\n"; + print " monitor Tries accessing the virtual machine through Libvirt until success\n"; + print " at which time the virtual machine is powered off and the VM\n"; + print " status is set to off.\n"; + print " poweroff Powers off the virtual machine and sets the VM status to off.\n"; + print " revert Reverts and powers on the virtual machine to the snapshot\n"; + print " specified by the VM. If the snapshot does not exist it may be\n"; + print " created from an existing base snapshot by applying configuration\n"; + print " options such as powering on the virtual machine, setting the\n"; + print " locales, enabling test signing, etc.\n"; + print " --debug More verbose messages for debugging.\n"; + print " --log-only Only send error messages to the log instead of also printing them\n"; + print " on stderr.\n"; + print " --help Shows this usage message.\n"; exit $Usage; } -- 2.30.2

1 0

[tools] testbot/cgi: Clean up CollectionBlock's property handling.
by Francois Gouget 14 Apr '22

14 Apr '22

Delegate generating the inside of a cell to GenerateDataView() such that GenerateDataCell() only deals with the cell itself. Remove GetDisplayValue() and GetEscapedDisplayValue(): CollectionBlocks don't deal with editing so there is no need for access to the 'raw' data. Thus they are both replaced by GenerateDataView(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 251 +++++++++++------- testbot/web/JobDetails.pl | 36 +-- testbot/web/PatchesList.pl | 14 +- testbot/web/WineTestBot.css | 4 +- testbot/web/admin/UsersList.pl | 14 +- testbot/web/index.pl | 58 ++-- 6 files changed, 210 insertions(+), 167 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index f124e646b..435c44e7f 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -183,116 +183,134 @@ sub GetSortedItems($$) return $self->{Collection}->GetSortedItems($Items); } -sub GetDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; +=pod +=over 12 - my $PropertyName = $PropertyDescriptor->GetName(); - my $Value = $Item->$PropertyName; +=item C<GetDetailsLink()> - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - if (defined($Value)) - { - # Note: This only supports single-key Itemrefs - foreach $PropertyDescriptor (@{$Value->GetPropertyDescriptors()}) - { - if ($PropertyDescriptor->GetIsKey()) - { - $PropertyName = $PropertyDescriptor->GetName(); - $Value = $Value->$PropertyName; - last; - } - } - } - } +Returns the URL of the details page for the current row's object. + +See GenerateDataView() for details about the Row parameter. - if ($PropertyDescriptor->GetClass() eq "Basic") +=back +=cut + +sub GetDetailsLink($$) +{ + my ($self, $Row) = @_; + + if (!$Row->{DetailsLink}) { - if ($PropertyDescriptor->GetType() eq "B") - { - $Value = ($Value ? "Yes" : "No"); - } - elsif ($PropertyDescriptor->GetType() eq "DT") + $Row->{DetailsLink} = "$Row->{DetailsPage}?Key=". uri_escape($Row->{Item}->GetKey()); + my ($MasterColNames, $MasterColValues) = $Row->{Item}->GetMasterCols(); + if (defined $MasterColNames) { - if (defined($Value)) + foreach my $ColIndex (0 .. @$MasterColNames - 1) { - $Value = - "<noscript><div>" . - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . -"<script type='text/javascript'></script>\n"; + $Row->{DetailsLink} .= "&". $MasterColNames->[$ColIndex] ."=". + uri_escape($MasterColValues->[$ColIndex]); } } } - - return $Value; + return $Row->{DetailsLink}; } -sub GetEscapedDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; +=pod +=over 12 - my $PropertyName = $PropertyDescriptor->GetName(); - my $Value = $Item->$PropertyName; +=item C<GenerateHeaderView()> - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "DT") - { - if (defined($Value)) - { - $Value = "<script type='text/javascript'></script><noscript><div>" . - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . - "</div></noscript>\n"; - } - } - else - { - $Value = $self->escapeHTML($self->GetDisplayValue($Item, $PropertyDescriptor)); - } +Generates an HTML snippet for the column title. - return $Value; -} +The Row parameter contains the following information: +=over 12 +=item PropertyDescriptors +The list of item properties, including those that DisplayProperty() says +should be hidden. -# -# Item cell generation -# +=item DetailsPage +The base link to the item details page if any. See GetDetailsPage(). + +=item ItemActions +The list of per-item actions. + +=cut + +=back +=cut -sub GenerateHeaderCell($$) +sub GenerateHeaderView($$$) { - my ($self, $PropertyDescriptor) = @_; - print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), - "</th>\n"; + my ($self, $_Row, $PropertyDescriptor) = @_; + + print $self->escapeHTML($PropertyDescriptor->GetDisplayName()); } -sub GenerateDataCell($$$$) +=pod +=over 12 + +=item C<GenerateDataView()> + +Generates an HTML snippet representing the property value in a user-readable +form. + +The Row parameter contains the same information as for GenerateHeaderView() +plus: +=over 12 + +=item Row +The row number starting at 1. + +=item Item +The object for the current row. + +=back + +Furthermore one can get the link to the current object's details page by +passing the row to GetDetailsLink(). + +=back +=cut + +sub GenerateDataView($$$) { - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $Row, $PropertyDescriptor) = @_; - print "<td>"; - my $NeedLink; - if ($PropertyDescriptor->GetIsKey() && $DetailsPage) + my $PropertyName = $PropertyDescriptor->GetName(); + my $Value = $Row->{Item}->$PropertyName; + + if ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { - $NeedLink = 1; - my $Query = "$DetailsPage?Key=" . uri_escape($Item->GetKey()); - my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); - if (defined($MasterColNames)) + # Note: This only supports single-key Itemrefs + foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) + if ($ValuePD->GetIsKey()) { - $Query .= "&" . $MasterColNames->[$ColIndex] . "=" . - uri_escape($MasterColValues->[$ColIndex]); + $PropertyName = $ValuePD->GetName(); + print $self->escapeHTML($Value->$PropertyName); + return; } } - print "<a href='", $self->escapeHTML($Query), "'>"; } - print $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); - print "</a>" if ($NeedLink); - print "</td>\n"; + elsif ($PropertyDescriptor->GetClass() eq "Basic") + { + if ($PropertyDescriptor->GetType() eq "B") + { + print $Value ? "Yes" : "No"; + return; + } + if ($PropertyDescriptor->GetType() eq "DT" and defined $Value) + { + print "<script type='text/javascript'></script><noscript><div>", + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)), + "</div></noscript>\n"; + return; + } + } + print defined $Value ? $self->escapeHTML($Value) : " "; } @@ -317,23 +335,31 @@ sub GenerateFormStart($) } } +sub GenerateHeaderCell($$$) +{ + my ($self, $Row, $PropertyDescriptor) = @_; + + print "<th>"; + $self->GenerateHeaderView($Row, $PropertyDescriptor); + print "</th>\n"; +} + sub GenerateHeaderRow($$$) { - my ($self, $PropertyDescriptors, $ItemActions) = @_; + my ($self, $Row) = @_; print "<tr>\n"; - if (@$ItemActions != 0) + if (@{$Row->{ItemActions}}) { print "<th> </th>\n"; } - foreach my $PropertyDescriptor (@$PropertyDescriptors) + foreach my $PropertyDescriptor (@{$Row->{PropertyDescriptors}}) { if ($self->DisplayProperty($PropertyDescriptor)) { - $self->GenerateHeaderCell($PropertyDescriptor); + $self->GenerateHeaderCell($Row, $PropertyDescriptor); } } - print "</tr>\n"; } @@ -345,21 +371,37 @@ sub SelName($$) return "sel_" . $Key; } -sub GenerateDataRow($$$$$$) +sub GenerateDataCell($$$) +{ + my ($self, $Row, $PropertyDescriptor) = @_; + + print "<td>"; + my $CloseLink; + if ($Row->{DetailsPage} and $PropertyDescriptor->GetIsKey()) + { + print "<a href='", $self->escapeHTML($self->GetDetailsLink($Row)), "'>"; + $CloseLink = "</a>"; + } + $self->GenerateDataView($Row, $PropertyDescriptor); + print "$CloseLink</td>\n"; +} + +sub GenerateDataRow($$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; + my ($self, $Row) = @_; + my $Class = ($Row->{Row} % 2) == 0 ? "even" : "odd"; print "<tr class='$Class'>\n"; - if (@$ItemActions != 0) + if (@{$Row->{ItemActions}}) { - print "<td><input name='", $self->SelName($Item->GetKey()), + print "<td><input name='", $self->SelName($Row->{Item}->GetKey()), "' type='checkbox' /></td>\n"; } - foreach my $PropertyDescriptor (@$PropertyDescriptors) + foreach my $PropertyDescriptor (@{$Row->{PropertyDescriptors}}) { if ($self->DisplayProperty($PropertyDescriptor)) { - $self->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + $self->GenerateDataCell($Row, $PropertyDescriptor); } } print "</tr>\n"; @@ -421,20 +463,23 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n"; - my $ItemActions = $self->{RW} ? $self->GetItemActions() : []; - $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); + my $Row = { + PropertyDescriptors => $PropertyDescriptors, + DetailsPage => $self->GetDetailsPage(), + ItemActions => $self->{RW} ? $self->GetItemActions() : [], + Row => 0, # 0 for the header ---> 1 for the first line + }; + $self->GenerateHeaderRow($Row); print "</thead>\n"; print "<tbody>\n"; - my $DetailsPage = $self->GetDetailsPage(); - my $Row = 0; my $Items = $self->{Collection}->GetSortedItems(); foreach my $Item (@$Items) { - my $Class = ($Row % 2) == 0 ? "even" : "odd"; - $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, - $Class, $ItemActions); - $Row++; + $Row->{Row}++; + $Row->{Item} = $Item; + $Row->{DetailsLink} = undef; + $self->GenerateDataRow($Row); } if (@$Items == 0) { @@ -444,7 +489,7 @@ EOF print "</tbody>\n"; print "</table>\n"; - if (@$ItemActions != 0 && @$Items != 0) + if (@{$Row->{ItemActions}} and @$Items) { print <<EOF; <div class='CollectionBlockActions'> @@ -465,7 +510,7 @@ document.write("<a href='javascript:void(0)' onClick='ToggleAll();'>Toggle All<\ </script> EOF print "For selected ", $self->{Collection}->GetCollectionName() . ":"; - foreach my $Action (@$ItemActions) + foreach my $Action (@{$Row->{ItemActions}}) { print " <input type='submit' name='Action' value='" . $self->escapeHTML($Action) . "' />"; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index da4ad7e96..2c7901a75 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -61,35 +61,36 @@ sub DisplayProperty($$) # Item cell generation # -sub GenerateHeaderCell($$) +sub GenerateHeaderView($$$) { - my ($self, $PropertyDescriptor) = @_; + my ($self, $Row, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "CmdLineArg") { - print "<th>Arguments / <span class='MissionHeader'>Missions</span></th>\n"; + print "Arguments / <span class='MissionHeader'>Missions</span>"; } elsif ($PropertyName eq "Ended") { - print "<th><a class='title' title='Execution ended'>Time</a></th>\n"; + print "<a class='title' title='Execution ended'>Time</a>"; } else { - return $self->SUPER::GenerateHeaderCell($PropertyDescriptor); + $self->SUPER::GenerateHeaderView($Row, $PropertyDescriptor); } } -sub GenerateDataCell($$$$) +sub GenerateDataView($$$) { - my ($self, $StepTask, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $Row, $PropertyDescriptor) = @_; + my $StepTask = $Row->{Item}; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "VM") { - print "<td><a href='#k", $self->escapeHTML($StepTask->GetKey()), "'>"; + print "<a href='#k", $self->escapeHTML($Row->{Item}->GetKey()), "'>"; print $self->escapeHTML($StepTask->VM->Name); - print "</a></td>\n"; + print "</a>"; } elsif ($PropertyName eq "FileName") { @@ -99,13 +100,13 @@ sub GenerateDataCell($$$$) my $JobId = $self->{EnclosingPage}->GetJob()->Id; my $URI = "/GetFile.pl?JobKey=" . uri_escape($JobId) . "&StepKey=" . uri_escape($StepTask->StepNo); - print "<td><a href='" . $self->escapeHTML($URI) . "'>"; + print "<a href='" . $self->escapeHTML($URI) . "'>"; print $self->escapeHTML($StepTask->FileName); - print "</a></td>\n"; + print "</a>"; } else { - $self->SUPER::GenerateDataCell($StepTask, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); } } elsif ($PropertyName eq "CmdLineArg") @@ -124,7 +125,7 @@ sub GenerateDataCell($$$$) $Args .= "<span class='Mission'>". $self->escapeHTML(GetTaskMissionDescription($Missions->[0], $StepTask->Type)) ."</span>"; } } - print "<td>$Args</td>\n"; + print $Args; } elsif ($PropertyName eq "Ended") { @@ -132,22 +133,21 @@ sub GenerateDataCell($$$$) { my $Duration = $StepTask->Ended - $StepTask->Started; my $TagId = "E". $StepTask->Id; - print "<td><a id='$TagId' class='title' title='", + print "<a id='$TagId' class='title' title='", strftime("%Y-%m-%d %H:%M:%S", localtime($StepTask->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'></script>\n"; - print "</td>\n"; + print "--></script>"; } else { - print "<td> </td>\n"; + print " "; } } else { - $self->SUPER::GenerateDataCell($StepTask, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); } } diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 854c2768a..943b9c5bb 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -46,21 +46,21 @@ sub DisplayProperty($$) $PropertyName eq "FromName" || $PropertyName eq "Subject"; } -sub GenerateDataCell($$$$$) +sub GenerateDataView($$$) { - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $Row, $PropertyDescriptor) = @_; - my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Disposition" and $Item->Disposition =~ /job ([0-9]+)$/) + if ($PropertyDescriptor->GetName() eq "Disposition" and + $Row->{Item}->Disposition =~ /job ([0-9]+)$/) { my $JobId = $1; my $URI = "/JobDetails.pl?Key=" . uri_escape($JobId); - print "<td><a href='" . $self->escapeHTML($URI) . "'>" . - "Job " . $self->escapeHTML($JobId) . "</a></td>\n"; + print "<a href='" . $self->escapeHTML($URI) . "'>" . + "Job " . $self->escapeHTML($JobId) . "</a>"; } else { - $self->SUPER::GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); } } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 53c939efd..a50125f8e 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -241,13 +241,13 @@ h2 border: 1px solid white; } -.CollectionBlock tr.even +.CollectionBlock tr.odd { background-color: #fff8f8; color: black; } -.CollectionBlock tr.odd +.CollectionBlock tr.even { background-color: #f8e8e8; color: black; diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index f54def261..bc5ced8a7 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -46,13 +46,13 @@ sub DisplayProperty($$) $PropertyName eq "Status" || $PropertyName eq "RealName"; } -sub GenerateDataCell($$$$) +sub GenerateDataCell($$$) { - my ($self, $User, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $Row, $PropertyDescriptor) = @_; - my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Status") + if ($PropertyDescriptor->GetName() eq "Status") { + my $User = $Row->{Item}; my $Status = $User->Status; my ($Class, $Label); if ($Status eq "disabled") @@ -83,12 +83,12 @@ sub GenerateDataCell($$$$) { ($Class, $Label) = ('usernone', 'none'); } - print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($User->GetKey()), - "'><span class='$Class'>$Label</span></a></td>"; + my $DetailsLink = $self->GetDetailsLink($Row); + print "<td><a href='$DetailsLink'><span class='$Class'>$Label</span></a></td>"; } else { - $self->SUPER::GenerateDataCell($User, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($Row, $PropertyDescriptor); } } diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 478cb61c1..a18920533 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -50,49 +50,48 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } -sub GenerateHeaderCell($$$) +sub GenerateHeaderView($$$) { - my ($self, $PropertyDescriptor) = @_; + my ($self, $Row, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Priority") { - print "<th><a class='title' title='Higher values indicate a lower priority'>Nice</a></th>\n"; + print "<a class='title' title='Higher values indicate a lower priority'>Nice</a>"; } elsif ($PropertyName eq "Ended") { - print "<th><a class='title' title='Ended'>Time</a></th>\n"; + print "<a class='title' title='Ended'>Time</a>"; } else { - return $self->SUPER::GenerateHeaderCell($PropertyDescriptor); + $self->SUPER::GenerateHeaderView($Row, $PropertyDescriptor); } } -sub GetDisplayValue($$$) +sub GenerateDataView($$$) { - my ($self, $Job, $PropertyDescriptor) = @_; + my ($self, $Row, $PropertyDescriptor) = @_; - if ($PropertyDescriptor->GetName() eq "User" && - defined($Job->Patch) && - $Job->User->GetKey() eq GetBatchUser()->GetKey() && - defined($Job->Patch->FromName)) + my $Job = $Row->{Item}; + my $PropertyName = $PropertyDescriptor->GetName(); + if ($PropertyName eq "User") { - return $Job->Patch->FromName; + if (defined $Job->Patch and defined $Job->Patch->FromName and + $Job->User->GetKey() eq GetBatchUser()->GetKey()) + { + print $self->escapeHTML($Job->Patch->FromName); + } + else + { + print $self->escapeHTML($Job->User->Name); + } } - - return $self->SUPER::GetDisplayValue($Job, $PropertyDescriptor); -} - -sub GenerateDataCell($$$$) -{ - my ($self, $Job, $PropertyDescriptor, $DetailsPage) = @_; - - my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Status") + elsif ($PropertyName eq "Status") { - my $EscapedKey = uri_escape($Job->GetKey()); - print "<td id='job$EscapedKey'><a href='/JobDetails.pl?Key=$EscapedKey'>"; + my $EscapedKey = uri_escape($Row->{Item}->GetKey()); + my $DetailsLink = $self->GetDetailsLink($Row); + print "<a id='job$EscapedKey' href='$DetailsLink'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", "running" => "<span class='running'>running</span>", @@ -146,7 +145,7 @@ sub GenerateDataCell($$$$) { print $HTMLStatus; } - print "</a></td>\n"; + print "</a>"; } elsif ($PropertyName eq "Ended") { @@ -154,22 +153,21 @@ sub GenerateDataCell($$$$) { my $Duration = $Job->Ended - $Job->Submitted; my $TagId = "E". $Job->Id; - print "<td><a id='$TagId' class='title' title='", + print "<a id='$TagId' class='title' title='", strftime("%Y-%m-%d %H:%M:%S", localtime($Job->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'></script>\n"; - print "</td>\n"; + print "--></script>"; } else { - print "<td> </td>\n"; + print " "; } } else { - $self->SUPER::GenerateDataCell($Job, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); } } -- 2.30.2

1 0

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-devel