- Wine-Devel - list.winehq.org

[PATCH] jscript: Remove unreachable statement in disp_call_value().
by Gijs Vermeulen April 12, 2021

April 12, 2021

Spotted by Rafał Mikrut. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49277 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/jscript/dispex.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 188de659c4a..67b7cfad005 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2094,8 +2094,6 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W jsdisp = iface_to_jsdisp(disp); if(jsdisp && jsdisp->ctx == ctx) { - if(ctx != jsdisp->ctx) - flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); jsdisp_release(jsdisp); return hres; -- 2.31.1

2 1

[PATCH v3 2/2] crypt32: Add support for importing RSA public keys with BCrypt.
by Dmitry Timoshkov April 12, 2021

April 12, 2021

v3: - Fixed calculation of cbPublicExp and cbModulus. - pass PublicExp and Modulus in BE format to follow MSDN. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50925 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 83 +++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 13 +++++- 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 95e2746a7d5..7d4041f1fb3 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2689,11 +2689,94 @@ done: return !status; } +static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *key) +{ + DWORD size, modulus_len, i; + BLOBHEADER *hdr; + RSAPUBKEY *rsapubkey; + const WCHAR *rsa_algo; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_RSAKEY_BLOB *rsakey; + BYTE *s, *d; + NTSTATUS status; + + if (!info->PublicKey.cbData) + { + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, RSA_CSP_PUBLICKEYBLOB, info->PublicKey.pbData, + info->PublicKey.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &hdr, &size)) + { + WARN("CryptDecodeObjectEx failed\n"); + return FALSE; + } + + if (hdr->aiKeyAlg == CALG_RSA_KEYX) + rsa_algo = BCRYPT_RSA_ALGORITHM; + else if (hdr->aiKeyAlg == CALG_RSA_SIGN) + rsa_algo = BCRYPT_RSA_SIGN_ALGORITHM; + else + { + FIXME("Unsupported RSA algorithm: %#x\n", hdr->aiKeyAlg); + CryptMemFree(hdr); + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + + if ((status = BCryptOpenAlgorithmProvider(&alg, rsa_algo, NULL, 0))) + goto done; + + rsapubkey = (RSAPUBKEY *)(hdr + 1); + + modulus_len = size - sizeof(*hdr) - sizeof(*rsapubkey); + if (modulus_len != rsapubkey->bitlen / 8) + FIXME("RSA pubkey has wrong modulus_len %u\n", modulus_len); + + size = sizeof(*rsakey) + sizeof(ULONG) + modulus_len; + + if (!(rsakey = CryptMemAlloc(size))) + { + status = STATUS_NO_MEMORY; + goto done; + } + + rsakey->Magic = BCRYPT_RSAPUBLIC_MAGIC; + rsakey->BitLength = rsapubkey->bitlen; + rsakey->cbPublicExp = sizeof(ULONG); + rsakey->cbModulus = modulus_len; + rsakey->cbPrime1 = 0; + rsakey->cbPrime2 = 0; + + d = (BYTE *)(rsakey + 1); + /* According to MSDN modulus and pubexp are in LE while + * BCRYPT_RSAKEY_BLOB is supposed to have them in BE format */ + *(ULONG *)d = RtlUlongByteSwap(rsapubkey->pubexp); + d += sizeof(ULONG); + s = (BYTE *)(rsapubkey + 1); + for (i = 0; i < modulus_len; i++) + d[i] = s[modulus_len - i - 1]; + + status = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, key, (BYTE *)rsakey, size, 0); + CryptMemFree(rsakey); + +done: + CryptMemFree(hdr); + if (alg) BCryptCloseAlgorithmProvider(alg, 0); + if (status) SetLastError(RtlNtStatusToDosError(status)); + return !status; +} + BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) { if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) return CNG_ImportECCPubKey(pubKeyInfo, key); + + if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_RSA_RSA)) + return CNG_ImportRSAPubKey(pubKeyInfo, key); + FIXME("Unsupported public key type: %s\n", debugstr_a(pubKeyInfo->Algorithm.pszObjId)); SetLastError(NTE_BAD_ALGID); return FALSE; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 38d2f84db14..7c72eba1b9b 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -30,6 +30,7 @@ static BOOL (WINAPI *pCryptDecodeObjectEx)(DWORD,LPCSTR,const BYTE*,DWORD,DWORD,PCRYPT_DECODE_PARA,void*,DWORD*); static BOOL (WINAPI *pCryptEncodeObjectEx)(DWORD,LPCSTR,const void*,DWORD,PCRYPT_ENCODE_PARA,void*,DWORD*); +static DWORD (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); struct encodedInt { @@ -8400,6 +8401,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) { BOOL ret; HCRYPTKEY key; + BCRYPT_KEY_HANDLE key2; PCCERT_CONTEXT context; DWORD dwSize; ALG_ID ai; @@ -8469,6 +8471,12 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) &context->pCertInfo->SubjectPublicKeyInfo, 0, 0, NULL, &key); ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); CryptDestroyKey(key); + + ret = CryptImportPublicKeyInfoEx2(X509_ASN_ENCODING, + &context->pCertInfo->SubjectPublicKeyInfo, 0, NULL, &key2); + ok(ret, "CryptImportPublicKeyInfoEx2 failed: %08x\n", GetLastError()); + if (pBCryptDestroyKey) pBCryptDestroyKey(key2); + CertFreeCertificateContext(context); } } @@ -8502,7 +8510,7 @@ START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING }; - HMODULE hCrypt32; + HMODULE hCrypt32, hBcrypt; DWORD i; hCrypt32 = GetModuleHandleA("crypt32.dll"); @@ -8514,6 +8522,9 @@ START_TEST(encode) return; } + hBcrypt = GetModuleHandleA("bcrypt.dll"); + pBCryptDestroyKey = (void*)GetProcAddress(hBcrypt, "BCryptDestroyKey"); + for (i = 0; i < ARRAY_SIZE(encodings); i++) { test_encodeInt(encodings[i]); -- 2.30.2

2 1

[PATCH v3 1/2] crypt32: Implement CryptImportPublicKeyInfoEx2.
by Dmitry Timoshkov April 12, 2021

April 12, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/crypt32_private.h | 2 ++ dlls/crypt32/encode.c | 9 ++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index aad8fa047b7..95e2746a7d5 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2689,7 +2689,7 @@ done: return !status; } -static BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) +BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) { if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) return CNG_ImportECCPubKey(pubKeyInfo, key); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 30cf4334de4..9f8f43e7632 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -21,6 +21,8 @@ #include "wine/list.h" +BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) DECLSPEC_HIDDEN; + /* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 46f4b8f25e7..02b235696ce 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -5050,8 +5050,11 @@ BOOL WINAPI CryptImportPublicKeyInfoEx2(DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, DWORD dwFlags, void *pvAuxInfo, BCRYPT_KEY_HANDLE *phKey) { - FIXME_(crypt)("(%d, %p, %08x, %p, %p): stub\n", dwCertEncodingType, pInfo, + TRACE_(crypt)("(%d, %p, %08x, %p, %p)\n", dwCertEncodingType, pInfo, dwFlags, pvAuxInfo, phKey); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; + + if (dwFlags) + FIXME("flags %#x ignored\n", dwFlags); + + return CNG_ImportPubKey(pInfo, phKey); } -- 2.30.2

2 1

[PATCH v2 2/2] crypt32: Add support for importing RSA public keys with BCrypt.
by Dmitry Timoshkov April 12, 2021

April 12, 2021

v2: - Fixed calculation of cbPublicExp and cbModulus. - pass PublicExp in BE format to follow MSDN. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50925 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 81 +++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 13 +++++- 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 95e2746a7d5..920561b9c76 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2689,11 +2689,92 @@ done: return !status; } +static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *key) +{ + DWORD size, rsakey_len, modulus_len; + BLOBHEADER *hdr; + RSAPUBKEY *rsapubkey; + const WCHAR *rsa_algo; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_RSAKEY_BLOB *rsakey; + BYTE *p; + NTSTATUS status; + + if (!info->PublicKey.cbData) + { + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, RSA_CSP_PUBLICKEYBLOB, info->PublicKey.pbData, + info->PublicKey.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &hdr, &size)) + { + WARN("CryptDecodeObjectEx failed\n"); + return FALSE; + } + + if (hdr->aiKeyAlg == CALG_RSA_KEYX) + rsa_algo = BCRYPT_RSA_ALGORITHM; + else if (hdr->aiKeyAlg == CALG_RSA_SIGN) + rsa_algo = BCRYPT_RSA_SIGN_ALGORITHM; + else + { + FIXME("Unsupported RSA algorithm: %#x\n", hdr->aiKeyAlg); + CryptMemFree(hdr); + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + + if ((status = BCryptOpenAlgorithmProvider(&alg, rsa_algo, NULL, 0))) + goto done; + + rsapubkey = (RSAPUBKEY *)(hdr + 1); + + modulus_len = size - sizeof(*hdr) - sizeof(*rsapubkey); + if (modulus_len != rsapubkey->bitlen / 8) + FIXME("RSA pubkey has wrong modulus_len %u\n", modulus_len); + + rsakey_len = sizeof(*rsakey) + sizeof(ULONG) + modulus_len; + + if (!(rsakey = CryptMemAlloc(rsakey_len))) + { + status = STATUS_NO_MEMORY; + goto done; + } + + rsakey->Magic = BCRYPT_RSAPUBLIC_MAGIC; + rsakey->BitLength = rsapubkey->bitlen; + rsakey->cbPublicExp = sizeof(ULONG); + rsakey->cbModulus = modulus_len; + rsakey->cbPrime1 = 0; + rsakey->cbPrime2 = 0; + + p = (BYTE *)(rsakey + 1); + /* According to MSDN RSAPUBKEY.pubexp is in LE while + * BCRYPT_RSAKEY_BLOB is supposed to have it in BE format */ + *(ULONG *)p = RtlUlongByteSwap(rsapubkey->pubexp); + p += sizeof(ULONG); + memcpy(p, rsapubkey + 1, modulus_len); + + status = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, key, (BYTE *)rsakey, rsakey_len, 0); + CryptMemFree(rsakey); + +done: + CryptMemFree(hdr); + if (alg) BCryptCloseAlgorithmProvider(alg, 0); + if (status) SetLastError(RtlNtStatusToDosError(status)); + return !status; +} + BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) { if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) return CNG_ImportECCPubKey(pubKeyInfo, key); + + if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_RSA_RSA)) + return CNG_ImportRSAPubKey(pubKeyInfo, key); + FIXME("Unsupported public key type: %s\n", debugstr_a(pubKeyInfo->Algorithm.pszObjId)); SetLastError(NTE_BAD_ALGID); return FALSE; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 38d2f84db14..7c72eba1b9b 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -30,6 +30,7 @@ static BOOL (WINAPI *pCryptDecodeObjectEx)(DWORD,LPCSTR,const BYTE*,DWORD,DWORD,PCRYPT_DECODE_PARA,void*,DWORD*); static BOOL (WINAPI *pCryptEncodeObjectEx)(DWORD,LPCSTR,const void*,DWORD,PCRYPT_ENCODE_PARA,void*,DWORD*); +static DWORD (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); struct encodedInt { @@ -8400,6 +8401,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) { BOOL ret; HCRYPTKEY key; + BCRYPT_KEY_HANDLE key2; PCCERT_CONTEXT context; DWORD dwSize; ALG_ID ai; @@ -8469,6 +8471,12 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) &context->pCertInfo->SubjectPublicKeyInfo, 0, 0, NULL, &key); ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); CryptDestroyKey(key); + + ret = CryptImportPublicKeyInfoEx2(X509_ASN_ENCODING, + &context->pCertInfo->SubjectPublicKeyInfo, 0, NULL, &key2); + ok(ret, "CryptImportPublicKeyInfoEx2 failed: %08x\n", GetLastError()); + if (pBCryptDestroyKey) pBCryptDestroyKey(key2); + CertFreeCertificateContext(context); } } @@ -8502,7 +8510,7 @@ START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING }; - HMODULE hCrypt32; + HMODULE hCrypt32, hBcrypt; DWORD i; hCrypt32 = GetModuleHandleA("crypt32.dll"); @@ -8514,6 +8522,9 @@ START_TEST(encode) return; } + hBcrypt = GetModuleHandleA("bcrypt.dll"); + pBCryptDestroyKey = (void*)GetProcAddress(hBcrypt, "BCryptDestroyKey"); + for (i = 0; i < ARRAY_SIZE(encodings); i++) { test_encodeInt(encodings[i]); -- 2.30.2

2 4

[PATCH v2 1/2] crypt32: Implement CryptImportPublicKeyInfoEx2.
by Dmitry Timoshkov April 12, 2021

April 12, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/crypt32_private.h | 2 ++ dlls/crypt32/encode.c | 9 ++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index aad8fa047b7..95e2746a7d5 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2689,7 +2689,7 @@ done: return !status; } -static BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) +BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) { if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) return CNG_ImportECCPubKey(pubKeyInfo, key); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 30cf4334de4..9f8f43e7632 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -21,6 +21,8 @@ #include "wine/list.h" +BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) DECLSPEC_HIDDEN; + /* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 46f4b8f25e7..02b235696ce 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -5050,8 +5050,11 @@ BOOL WINAPI CryptImportPublicKeyInfoEx2(DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, DWORD dwFlags, void *pvAuxInfo, BCRYPT_KEY_HANDLE *phKey) { - FIXME_(crypt)("(%d, %p, %08x, %p, %p): stub\n", dwCertEncodingType, pInfo, + TRACE_(crypt)("(%d, %p, %08x, %p, %p)\n", dwCertEncodingType, pInfo, dwFlags, pvAuxInfo, phKey); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; + + if (dwFlags) + FIXME("flags %#x ignored\n", dwFlags); + + return CNG_ImportPubKey(pInfo, phKey); } -- 2.30.2

1 0

[PATCH 1/5] mf/topology: Copy input topology attributes on Load().
by Nikolay Sivov April 12, 2021

April 12, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 4 ++++ dlls/mf/topology.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index df286db6385..458da0cb275 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2109,9 +2109,13 @@ todo_wine { IMFTopologyNode_Release(sink_node2); + hr = IMFTopology_SetUINT32(full_topology, &IID_IMFTopology, 123); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL); ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); ok(full_topology != topology2, "Unexpected instance.\n"); + hr = IMFTopology_GetUINT32(topology2, &IID_IMFTopology, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFTopology_Release(topology2); IMFTopology_Release(full_topology); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 58639a67bdb..bbed2cba893 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2567,6 +2567,8 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (FAILED(hr = MFCreateTopology(&output_topology))) return hr; + IMFTopology_CopyAllItems(input_topology, (IMFAttributes *)output_topology); + context.input_topology = input_topology; context.output_topology = output_topology; memset(&context.key, 0xff, sizeof(context.key)); -- 2.30.2

1 4

[PATCH v2 1/4] advapi32/tests: Check that registry time zone records have a display name.
by Giovanni Mascellani April 12, 2021

April 12, 2021

While the display name is not a member of TIME_ZONE_INFORMATION, it is still available in the registry. In English it corresponds to the comments preceding groups of time zones in Unicode CLDR's windowsZones.xml[1]. [1] https://github.com/unicode-org/cldr/blob/master/common/supplemental/windows… Windows UI shows the display name in the time zone selection control panel. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 534982565d9..66382876fa5 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4014,6 +4014,7 @@ static void test_EnumDynamicTimeZoneInformation(void) HKEY key, subkey; WCHAR name[32]; WCHAR keyname[128]; + WCHAR displayname[128]; WCHAR sysdir[MAX_PATH]; DWORD index, ret, gle, size; DYNAMIC_TIME_ZONE_INFORMATION bogus_dtzi, dtzi; @@ -4095,6 +4096,14 @@ static void test_EnumDynamicTimeZoneInformation(void) ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); ok(!memcmp(&dtzi.DaylightName, name, size), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); + + size = sizeof(displayname); + memset(displayname, 0, sizeof(displayname)); + if (pRegLoadMUIStringW) + status = pRegLoadMUIStringW(subkey, L"MUI_Display", displayname, size, &size, 0, sysdir); + else + status = pRegGetValueW(subkey, NULL, L"Display", RRF_RT_REG_SZ, NULL, displayname, &size); + todo_wine ok(status == ERROR_SUCCESS, "status %d displayname %s\n", status, wine_dbgstr_w(displayname)); } else { -- 2.31.0

1 3

[PATCH 1/3] comctl32/tests: Enable some ComboEx tests on version 6.
by Nikolay Sivov April 12, 2021

April 12, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/combo.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 63470a50ff7..4102191e2f6 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1391,6 +1391,11 @@ START_TEST(combo) return; } + test_comboex(); + test_comboex_CB_GETLBTEXT(); + test_comboex_WM_WINDOWPOSCHANGING(); + test_comboex_get_set_item(); + /* ComboBox control tests. */ test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); -- 2.30.2

1 2

[tools 1/2] winetest: Move the scripts documentation to the usage message.
by Francois Gouget April 12, 2021

April 12, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-index | 34 +++++++++++++++------- winetest/dissect | 69 +++++++++++++++++++++++++------------------- winetest/gather | 60 +++++++++++++++++++++----------------- 3 files changed, 95 insertions(+), 68 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 94453f4ab..01533c4d4 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -1,6 +1,7 @@ #!/usr/bin/perl # # Copyright 2008 Alexandre Julliard <julliard(a)winehq.org> +# Copyright 2014-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -15,9 +16,6 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# This program creates the global index of all the builds for which we have -# WineTest result data. use strict; use warnings; @@ -175,14 +173,28 @@ if (defined $usage) error("try '$name0 --help' for more information\n"); exit $usage; } - print "Usage: $name0 [--workdir DIR] [--help]\n"; - print "\n"; - print "Processes the build summaries to generate the global index.\n"; - print "\n"; - print "Where:\n"; - print " --workdir DIR Specifies the directory containing the winetest website\n"; - print " files.\n"; - print " --help Shows this usage message.\n"; + print <<EOF; +Usage: $name0 [--workdir DIR] [--help] + +Processes the build summaries to generate the global index and per-test +index pages. + +Where: + --workdir DIR Specifies the directory containing the winetest website + files. Can be omitted if set in winetest.conf. + --help Shows this usage message. + +Actions: + $name0 should be called after the gather script has updated all the builds. + +Generated files: + \$workdir/data/index.html + \$workdir/data/tests/TEST:UNIT.html + +Exit: + 0 - success + 2 - usage error +EOF exit 0; } diff --git a/winetest/dissect b/winetest/dissect index 43b2754f0..d6ce316d9 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -2,7 +2,7 @@ # # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard -# Copyright (C) 2017, 2019 Francois Gouget +# Copyright (C) 2008-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,25 +17,6 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# This program looks for a WineTest report file matching queue/rep*/report, -# takes it apart in its directory while also creating summary.txt. If an error -# occurs the directory is renamed to errXXXXX to avoid future attempts at -# processing this report. -# If everything goes flawlessly the whole directory is renamed (based on the -# information learned in the process) to data/BUILD/VERSION_TAG_DIGIT -# where DIGIT is for resolving name clashes and data/BUILD/outdated is -# created to signal the change in the given build. -# -# To test this script: -# - Put a test report in queue/rep1/report -# - Run ./dissect -# - Examine the result in data/ -# -# Exit: 0 - successfully processed a report, call again -# 1 - failed to process a report, call again -# 2 - there was nothing to do -# 3 - fatal error, something went utterly wrong use strict; use warnings; @@ -183,16 +164,44 @@ if (defined $usage) error("try '$name0 --help' for more information\n"); exit $usage; } - print "Usage: $name0 [--workdir DIR] [--update REPORT] [--help]\n"; - print "\n"; - print "Processes a test report to generate the corresponding HTML files.\n"; - print "\n"; - print "Where:\n"; - print " --workdir DIR Specifies the directory containing the winetest website\n"; - print " files.\n"; - print " --update REPORT Updates the HTML files of the specified test report. Note that\n"; - print " it must have already been moved into place.\n"; - print " --help Shows this usage message.\n"; + print <<EOF; +Usage: $name0 [--workdir DIR] [--update REPORT] [--help] + +Processes a test report to generate the corresponding HTML files. + +Where: + --workdir DIR Specifies the directory containing the winetest website + files. Can be omitted if set in winetest.conf. + --update REPORT Updates the HTML files of the specified test report. Note + that it must have already been moved into place. + --help Shows this usage message. + +Actions: + $name0 looks for a WineTest report file matching queue/rep*/report, + takes it apart in its directory while also creating summary.txt. If an error + occurs the directory is renamed to errXXXXX to avoid future attempts at + processing this report. + + If everything goes flawlessly the whole directory is renamed (based on the + information learned in the process) to data/BUILD/PLATFORM_TAG_DIGIT + where DIGIT is for resolving name clashes and data/BUILD/outdated is + created to signal the change in the given build. + +Generated files: + \$workdir/queue/errXXXXX/error + \$workdir/queue/errXXXXX/summary.txt + or + \$workdir/data/BUILD/outdated + \$workdir/data/BUILD/PLATFORM_TAG_DIGIT/summary.txt + \$workdir/data/BUILD/PLATFORM_TAG_DIGIT/report.html + \$workdir/data/BUILD/PLATFORM_TAG_DIGIT/TEST:UNIT.html + +Exit: + 0 - successfully processed a report, call again + 1 - failed to process a report, call again + 2 - there was nothing to do or usage error + 3 - fatal error, something went utterly wrong +EOF exit 0; } diff --git a/winetest/gather b/winetest/gather index 79bea91de..1a61b0c13 100755 --- a/winetest/gather +++ b/winetest/gather @@ -1,6 +1,7 @@ #!/usr/bin/perl # # Copyright (C) 2004 Ferenc Wagner +# Copyright (C) 2008-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -15,24 +16,6 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# This program looks for builds that have received new reports. These are -# identified by the presence of a file matching data/*/outdated. -# It then creates an index.html file in the same directory and removes the -# outdated file. -# -# It is thus intended to run as a second stage invoked by the winetest.cron -# script. Races and concurrency problems must be dealt with on that higher -# level. -# -# To test this script: -# - After running dissect, run ./gather -# - Examine the result in data/ -# -# Exit: 0 - successfully processed a build, call again -# 1 - should not happen -# 2 - there was nothing to do -# 3 - fatal error, something went utterly wrong use strict; use warnings; @@ -265,15 +248,38 @@ if (defined $usage) error("try '$name0 --help' for more information\n"); exit $usage; } - print "Usage: $name0 [--workdir DIR] [--update BUILDDIR] [--help]\n"; - print "\n"; - print "Processes a build's report summaries to create the build's index files.\n"; - print "\n"; - print "Where:\n"; - print " --workdir DIR Specifies the directory containing the winetest website\n"; - print " files.\n"; - print " --update BUILDDIR Updates the HTML files of the specified build directory.\n"; - print " --help Shows this usage message.\n"; + print <<EOF; +Usage: $name0 [--workdir DIR] [--update BUILD] [--help] + +Identifies one build that received new reports and updates its summary and +HTML index files. + +Where: + --workdir DIR Specifies the directory containing the winetest website + files. Can be omitted if set in winetest.conf. + --update BUILD Forcefully refreshes the specified build directory. + BUILD should be a full path. If an outdated file is + present, it is removed. + --help Shows this usage message. + +Actions: + The build to process is identified by the presence of the data/*/outdated + file generated by the dissect script. That file is removed after all + processing is done. It is up to the caller to invoke $name0 as many times as + necessary and to deal with any concurrency issues. + +Generated files: + \$workdir/data/BUILD/summary.txt + \$workdir/data/BUILD/total.txt + \$workdir/data/BUILD/index.html + \$workdir/data/BUILD/index_GROUP.html + +Exit: + 0 - successfully processed a build, call again + 1 - should not happen + 2 - there was nothing to do or usage error + 3 - fatal error, something went utterly wrong +EOF exit 0; } -- 2.20.1

1 1

[PATCH] po: Remove duplicate line in Dutch translation
by Hugh McMaster April 12, 2021

April 12, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- po/nl.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/nl.po b/po/nl.po index e5ea842cfea..b212ed1736e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14785,7 +14785,6 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" -" /reg:32\n" " /reg:32\n" " Open de 32-bits weergave van het register.\n" "\n" -- 2.31.0

1 0