wine-devel

wine-devel@winehq.org

7 participants
84466 discussions

[PATCH 1/3] include: Add ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES declaration.
by Rémi Bernon 06 Apr '22

06 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index 079858d2f7d..31c6b7d69e9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5861,6 +5861,7 @@ typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { #define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 #define ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS 10 #define ACTIVATION_CONTEXT_SECTION_COMPATIBILITY_INFO 11 +#define ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES 12 typedef enum _JOBOBJECTINFOCLASS { -- 2.35.1

1 2

Re: TestBot job 111813 results: [PATCH 1/3] ntdll/tests: Add some exception tests.
by Daniel Lehman 06 Apr '22

06 Apr '22

> You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=111813 > > > === debian11 (64 bit WoW report) === > > Report validation errors: > ntdll:exception prints too much data (35604 bytes) I have similar errors in these as well: - https://testbot.winehq.org/JobDetails.pl?Key=111814 - https://testbot.winehq.org/JobDetails.pl?Key=111815 but i didn't see them in testbot before i submitted. i retried this one on testbot and it passed: https://testbot.winehq.org/JobDetails.pl?Key=112000 anything i can do different? thanks daniel

1 0

[PATCH] cryptnet: Support verifying certificate revocation with OCSP.
by Hans Leidekker 06 Apr '22

06 Apr '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/cryptnet/Makefile.in | 2 +- dlls/cryptnet/cryptnet_main.c | 391 ++++++++++++++++++++++++++++++++-- include/wincrypt.h | 4 + 3 files changed, 375 insertions(+), 22 deletions(-) diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in index 8b13861da1e..af41122193f 100644 --- a/dlls/cryptnet/Makefile.in +++ b/dlls/cryptnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = cryptnet.dll IMPORTLIB = cryptnet -IMPORTS = crypt32 shell32 ole32 +IMPORTS = crypt32 shell32 ole32 advapi32 DELAYIMPORTS = wininet C_SRCS = \ diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 8aec76e9b81..6654ef77c8c 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1720,37 +1720,386 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * return error; } +static void sha1_hash(const BYTE *data, DWORD datalen, BYTE *buf, DWORD *buflen) +{ + HCRYPTPROV prov; + HCRYPTHASH hash; + + CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + CryptCreateHash(prov, CALG_SHA1, 0, 0, &hash); + CryptHashData(hash, data, datalen, 0); + CryptGetHashParam(hash, HP_HASHVAL, buf, buflen, 0); + + CryptDestroyHash(hash); + CryptReleaseContext(prov, 0); +} + +static BYTE *build_ocsp_request(const CERT_CONTEXT *cert, const CERT_CONTEXT *issuer_cert, DWORD *ret_size) +{ + OCSP_REQUEST_ENTRY entry; + OCSP_REQUEST_INFO request; + OCSP_SIGNED_REQUEST_INFO request_signed; + CERT_INFO *issuer = issuer_cert->pCertInfo; + BYTE issuer_name_hash[20], issuer_key_hash[20], *buf, *ret; + DWORD size = 0, hash_len = sizeof(issuer_name_hash); + + memset(&entry, 0, sizeof(entry)); + entry.CertId.HashAlgorithm.pszObjId = (char *)szOID_OIWSEC_sha1; + + sha1_hash(issuer->Subject.pbData, issuer->Subject.cbData, issuer_name_hash, &hash_len); + entry.CertId.IssuerNameHash.cbData = sizeof(issuer_name_hash); + entry.CertId.IssuerNameHash.pbData = issuer_name_hash; + + sha1_hash(issuer->SubjectPublicKeyInfo.PublicKey.pbData, issuer->SubjectPublicKeyInfo.PublicKey.cbData, + issuer_key_hash, &hash_len); + entry.CertId.IssuerKeyHash.cbData = sizeof(issuer_key_hash); + entry.CertId.IssuerKeyHash.pbData = issuer_key_hash; + + entry.CertId.SerialNumber.cbData = cert->pCertInfo->SerialNumber.cbData; + entry.CertId.SerialNumber.pbData = cert->pCertInfo->SerialNumber.pbData; + + request.dwVersion = OCSP_REQUEST_V1; + request.pRequestorName = NULL; + request.cRequestEntry = 1; + request.rgRequestEntry = &entry; + request.cExtension = 0; + request.rgExtension = NULL; + if (!CryptEncodeObjectEx(X509_ASN_ENCODING, OCSP_REQUEST, &request, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size)) + { + ERR("failed to encode request %#lx\n", GetLastError()); + return NULL; + } + + request_signed.ToBeSigned.pbData = buf; + request_signed.ToBeSigned.cbData = size; + request_signed.pOptionalSignatureInfo = NULL; + if (!CryptEncodeObjectEx(X509_ASN_ENCODING, OCSP_SIGNED_REQUEST, &request_signed, CRYPT_ENCODE_ALLOC_FLAG, NULL, + &ret, &size)) + { + ERR("failed to encode signed request %#lx\n", GetLastError()); + LocalFree(buf); + return NULL; + } + + LocalFree(buf); + *ret_size = size; + return ret; +} + +static void escape_path(const WCHAR *src, DWORD src_len, WCHAR *dst, DWORD *dst_len) +{ + static const WCHAR hex[] = L"0123456789ABCDEF"; + WCHAR *ptr = dst; + DWORD i; + + *dst_len = src_len; + for (i = 0; i < src_len; i++) + { + if (src[i] == '+' || src[i] == '/' || src[i] == '=') + { + if (dst) + { + ptr[0] = '%'; + ptr[1] = hex[(src[i] >> 4) & 0xf]; + ptr[2] = hex[src[i] & 0xf]; + ptr += 3; + } + *dst_len += 2; + } + else if (dst) *ptr++ = src[i]; + } +} + +static WCHAR *build_request_path(const BYTE *data, DWORD data_size) +{ + WCHAR *path, *ret; + DWORD path_len, ret_len; + + if (!CryptBinaryToStringW(data, data_size, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF, NULL, &path_len)) return NULL; + if (!(path = malloc(path_len * sizeof(WCHAR)))) return NULL; + CryptBinaryToStringW(data, data_size, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF, path, &path_len); + + escape_path(path, path_len, NULL, &ret_len); + if (!(ret = malloc((ret_len + 2) * sizeof(WCHAR)))) + { + free(path); + return NULL; + } + escape_path(path, path_len, ret + 1, &ret_len); + ret[ret_len + 1] = 0; + ret[0] = '/'; + + free(path); + return ret; +} + +static WCHAR *build_request_url(const WCHAR *base_url, const BYTE *data, DWORD data_size) +{ + WCHAR *path, *ret; + DWORD len = 0; + + if (!(path = build_request_path(data, data_size))) return NULL; + + InternetCombineUrlW(base_url, path, NULL, &len, 0); + if (!(ret = malloc(len * sizeof(WCHAR)))) + { + free(path); + return NULL; + } + InternetCombineUrlW(base_url, path, ret, &len, 0); + free(path); + return ret; +} + +static DWORD map_ocsp_status(DWORD status) +{ + switch (status) + { + case OCSP_BASIC_GOOD_CERT_STATUS: return ERROR_SUCCESS; + case OCSP_BASIC_REVOKED_CERT_STATUS: return CRYPT_E_REVOKED; + case OCSP_BASIC_UNKNOWN_CERT_STATUS: return CRYPT_E_REVOCATION_OFFLINE; + default: + FIXME("unhandled status %lu\n", status); + return CRYPT_E_REVOCATION_OFFLINE; + } +} + +static BOOL match_cert_id(const OCSP_CERT_ID *id, const CERT_INFO *cert, const CERT_INFO *issuer) +{ + BYTE hash[20]; + DWORD hash_len = sizeof(hash); + + if (!id->HashAlgorithm.pszObjId || strcmp(id->HashAlgorithm.pszObjId, szOID_OIWSEC_sha1)) + { + FIXME("hash algorithm %s not supported\n", debugstr_a(id->HashAlgorithm.pszObjId)); + return FALSE; + } + + sha1_hash(issuer->Subject.pbData, issuer->Subject.cbData, hash, &hash_len); + if (id->IssuerNameHash.cbData != hash_len) return FALSE; + if (memcmp(id->IssuerNameHash.pbData, hash, hash_len)) return FALSE; + + sha1_hash(issuer->SubjectPublicKeyInfo.PublicKey.pbData, + issuer->SubjectPublicKeyInfo.PublicKey.cbData, hash, &hash_len); + if (id->IssuerKeyHash.cbData != hash_len) return FALSE; + if (memcmp(id->IssuerKeyHash.pbData, hash, hash_len)) return FALSE; + + if (cert->SerialNumber.cbData != id->SerialNumber.cbData) return FALSE; + return !memcmp(cert->SerialNumber.pbData, id->SerialNumber.pbData, id->SerialNumber.cbData); +} + +static DWORD check_ocsp_response_info(const CERT_INFO *cert, const CERT_INFO *issuer, + const CRYPT_OBJID_BLOB *blob, DWORD *status) +{ + OCSP_BASIC_RESPONSE_INFO *info; + DWORD size, i; + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_RESPONSE, blob->pbData, blob->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); + + FIXME("check responder id\n"); + for (i = 0; i < info->cResponseEntry; i++) + { + OCSP_BASIC_RESPONSE_ENTRY *entry = &info->rgResponseEntry[i]; + if (match_cert_id(&entry->CertId, cert, issuer)) *status = map_ocsp_status(entry->dwCertStatus); + } + + LocalFree(info); + return ERROR_SUCCESS; +} + +static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_INFO *issuer, + const CRYPT_OBJID_BLOB *blob) +{ + OCSP_BASIC_SIGNED_RESPONSE_INFO *info; + DWORD size, error, status = CRYPT_E_REVOCATION_OFFLINE; + CRYPT_ALGORITHM_IDENTIFIER *alg; + CRYPT_BIT_BLOB *sig; + HCRYPTPROV prov = 0; + HCRYPTHASH hash = 0; + HCRYPTKEY key = 0; + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_SIGNED_RESPONSE, blob->pbData, blob->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); + + if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status))) goto done; + + alg = &info->SignatureInfo.SignatureAlgorithm; + if (!alg->pszObjId || strcmp(alg->pszObjId, szOID_RSA_SHA256RSA)) + { + FIXME("unhandled signature algorithm %s\n", debugstr_a(alg->pszObjId)); + error = CRYPT_E_NO_REVOCATION_CHECK; + goto done; + } + + if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) goto done; + if (!CryptCreateHash(prov, CALG_SHA_256, 0, 0, &hash)) goto done; + if (!CryptHashData(hash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0)) goto done; + + sig = &info->SignatureInfo.Signature; + if (!CryptImportPublicKeyInfoEx(prov, X509_ASN_ENCODING, (CERT_PUBLIC_KEY_INFO *)&issuer->SubjectPublicKeyInfo, + 0, 0, NULL, &key)) + { + error = GetLastError(); + TRACE("failed to import public key %#lx\n", error); + } + else if (!CryptVerifySignatureW(hash, sig->pbData, sig->cbData, key, NULL, 0)) + { + error = GetLastError(); + TRACE("failed to verify signature %#lx\n", error); + } + else error = ERROR_SUCCESS; + +done: + CryptDestroyKey(key); + CryptDestroyHash(hash); + CryptReleaseContext(prov, 0); + LocalFree(info); + if (error) return error; + return status; +} + +static DWORD handle_ocsp_response(const CERT_INFO *cert, const CERT_INFO *issuer, const BYTE *encoded, + DWORD encoded_size) +{ + OCSP_RESPONSE_INFO *info; + DWORD size, error = CRYPT_E_NO_REVOCATION_CHECK; + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_RESPONSE, encoded, encoded_size, CRYPT_DECODE_ALLOC_FLAG, NULL, + &info, &size)) return GetLastError(); + + switch (info->dwStatus) + { + case OCSP_SUCCESSFUL_RESPONSE: + if (!info->pszObjId || strcmp(info->pszObjId, szOID_PKIX_OCSP_BASIC_SIGNED_RESPONSE)) + { + FIXME("unhandled response type %s\n", debugstr_a(info->pszObjId)); + break; + } + error = verify_signed_ocsp_response_info(cert, issuer, &info->Value); + break; + + default: + FIXME("unhandled status %lu\n", info->dwStatus); + break; + } + + LocalFree(info); + return error; +} + +static DWORD verify_cert_revocation_with_ocsp(const CERT_CONTEXT *cert, const WCHAR *base_url, + const CERT_REVOCATION_PARA *revpara) +{ + HINTERNET ses, con, req = NULL; + BYTE *request_data = NULL, *response_data = NULL; + DWORD size, flags, status, request_len, response_len, count, ret = CRYPT_E_REVOCATION_OFFLINE; + URL_COMPONENTSW comp; + WCHAR *url; + + if (!revpara || !revpara->pIssuerCert) + { + TRACE("no issuer certificate\n"); + return CRYPT_E_REVOCATION_OFFLINE; + } + if (!(request_data = build_ocsp_request(cert, revpara->pIssuerCert, &request_len))) + return CRYPT_E_REVOCATION_OFFLINE; + + url = build_request_url(base_url, request_data, request_len); + LocalFree(request_data); + if (!url) return CRYPT_E_REVOCATION_OFFLINE; + + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.dwHostNameLength = ~0u; + comp.dwUrlPathLength = ~0u; + if (!InternetCrackUrlW(url, 0, 0, &comp)) + { + free(url); + return CRYPT_E_REVOCATION_OFFLINE; + } + + switch (comp.nScheme) + { + case INTERNET_SCHEME_HTTP: + flags = 0; + break; + case INTERNET_SCHEME_HTTPS: + flags = INTERNET_FLAG_SECURE; + break; + default: + FIXME("scheme %u not supported\n", comp.nScheme); + free(url); + return ERROR_NOT_SUPPORTED; + } + + if (!(ses = InternetOpenW(L"CryptoAPI", 0, NULL, NULL, 0))) return GetLastError(); + comp.lpszHostName[comp.dwHostNameLength] = 0; + if (!(con = InternetConnectW(ses, comp.lpszHostName, comp.nPort, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0))) + { + free(url); + InternetCloseHandle(ses); + return GetLastError(); + } + comp.lpszHostName[comp.dwHostNameLength] = '/'; + if (!(req = HttpOpenRequestW(con, NULL, comp.lpszUrlPath, NULL, NULL, NULL, flags, 0)) || + !HttpSendRequestW(req, NULL, 0, NULL, 0)) goto done; + + size = sizeof(status); + if (!HttpQueryInfoW(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL)) goto done; + if (status != HTTP_STATUS_OK) + { + WARN("request status %lu\n", status); + goto done; + } + + size = sizeof(response_len); + if (!HttpQueryInfoW(req, HTTP_QUERY_FLAG_NUMBER | HTTP_QUERY_CONTENT_LENGTH, &response_len, &size, 0) || + !response_len || !(response_data = malloc(response_len)) || + !InternetReadFile(req, response_data, response_len, &count) || count != response_len) goto done; + + ret = handle_ocsp_response(cert->pCertInfo, revpara->pIssuerCert->pCertInfo, response_data, response_len); + +done: + free(url); + free(response_data); + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + return ret; +} + static DWORD verify_cert_revocation_from_aia_ext(const CRYPT_DATA_BLOB *value, const CERT_CONTEXT *cert, FILETIME *pTime, DWORD dwFlags, CERT_REVOCATION_PARA *pRevPara, CERT_REVOCATION_STATUS *pRevStatus) { BOOL ret; - DWORD error, size; + DWORD size, i, error = CRYPT_E_NO_REVOCATION_CHECK; CERT_AUTHORITY_INFO_ACCESS *aia; - ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_AUTHORITY_INFO_ACCESS, - value->pbData, value->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &aia, &size); - if (ret) - { - DWORD i; + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_AUTHORITY_INFO_ACCESS, value->pbData, value->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &aia, &size); + if (!ret) return GetLastError(); - for (i = 0; i < aia->cAccDescr; i++) - if (!strcmp(aia->rgAccDescr[i].pszAccessMethod, - szOID_PKIX_OCSP)) + for (i = 0; i < aia->cAccDescr; i++) + { + if (!strcmp(aia->rgAccDescr[i].pszAccessMethod, szOID_PKIX_OCSP)) + { + if (aia->rgAccDescr[i].AccessLocation.dwAltNameChoice == CERT_ALT_NAME_URL) { - if (aia->rgAccDescr[i].AccessLocation.dwAltNameChoice == - CERT_ALT_NAME_URL) - FIXME("OCSP URL = %s\n", - debugstr_w(aia->rgAccDescr[i].AccessLocation.u.pwszURL)); - else - FIXME("unsupported AccessLocation type %ld\n", - aia->rgAccDescr[i].AccessLocation.dwAltNameChoice); + const WCHAR *url = aia->rgAccDescr[i].AccessLocation.u.pwszURL; + TRACE("OCSP URL = %s\n", debugstr_w(url)); + error = verify_cert_revocation_with_ocsp(cert, url, pRevPara); } - LocalFree(aia); - /* FIXME: lie and pretend OCSP validated the cert */ - error = ERROR_SUCCESS; + else + { + FIXME("unsupported AccessLocation type %lu\n", aia->rgAccDescr[i].AccessLocation.dwAltNameChoice); + error = ERROR_NOT_SUPPORTED; + } + break; + } } - else - error = GetLastError(); + + LocalFree(aia); return error; } diff --git a/include/wincrypt.h b/include/wincrypt.h index f5f05c1f8d0..2c1e3f0d4c3 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -669,6 +669,10 @@ typedef struct _OCSP_BASIC_REVOKED_INFO { DWORD dwCrlReasonCode; } OCSP_BASIC_REVOKED_INFO, *POCSP_BASIC_REVOKED_INFO; +#define OCSP_BASIC_GOOD_CERT_STATUS 0 +#define OCSP_BASIC_REVOKED_CERT_STATUS 1 +#define OCSP_BASIC_UNKNOWN_CERT_STATUS 2 + typedef struct _OCSP_BASIC_RESPONSE_ENTRY { OCSP_CERT_ID CertId; DWORD dwCertStatus; -- 2.30.2

1 0

[PATCH v2 1/6] include: Add CWMAEncMediaObject class declaration to wmcodecdsp.idl.
by Rémi Bernon 06 Apr '22

06 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use "pts" rather than "timestamp", use UINT64 for their types. include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index ae2a42419b4..4ad965ab3d9 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -45,6 +45,11 @@ coclass CMSH264DecoderMFT {} ] coclass CWMADecMediaObject {}; +[ + uuid(70f598e9-f4ab-495a-99e2-a7c4d3d89abf) +] +coclass CWMAEncMediaObject {}; + [ uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) ] -- 2.35.1

4 13

Re: [PATCH v3 1/4] dwrite/tests: Add some tests for Segoe UI font family.
by Nikolay Sivov 06 Apr '22

06 Apr '22

> + > +static void test_SegoeUI(void) > +{ > + HRESULT hr; > + IDWriteFactory2 *factory; > + IDWriteFontCollection *collection; > + IDWriteFontFamily *family; > + IDWriteFont *font; > + UINT32 index, count, i; > + WCHAR name[256]; > + BOOL exists, found; > + > + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, > &IID_IDWriteFactory2, (IUnknown **)&factory); > + if (hr != S_OK) > + { > + win_skip("IDWriteFactory2 is not supported\n"); > + return; > + } > + > + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, > FALSE); > + ok(hr == S_OK, "got %#x\n", hr); > + > + hr = IDWriteFontCollection_FindFamilyName(collection, L"Segoe UI", > &index, &exists); > + ok(hr == S_OK, "got %#x\n", hr); > + if (!exists) > + { > + skip("Segoe UI is not installed\n"); > + IDWriteFontCollection_Release(collection); > + IDWriteFactory2_Release(factory); > + return; > + } > + ok(index != UINT_MAX && exists, "Segoe UI was not found\n"); > + > + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); > + ok(hr == S_OK, "got %#x\n", hr); > + > + count = IDWriteFontFamily_GetFontCount(family); > + trace("family Segoe UI has %u fonts\n", count); > + > + found = FALSE; > + > + for (i = 0; i < count; i++) > + { > + hr = IDWriteFontFamily_GetFont(family, i, &font); > + ok(hr == S_OK, "got %#x\n", hr); > + > + get_font_name(font, name, ARRAY_SIZE(name)); > + if (!wcscmp(name, L"Segoe UI Symbol")) > + found = TRUE; > + > + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); > + ok(hr == S_OK, "got %#x\n", hr); > + ok(!exists, "%u: %s has character 0x25d4\n", i, > wine_dbgstr_w(name)); > + > + IDWriteFont_Release(font); > + } > + > + ok(!found, "Segoe UI Symbol should not be part of Segoe UI family\n"); > + > + IDWriteFontFamily_Release(family); > + IDWriteFontCollection_Release(collection); > + IDWriteFactory2_Release(factory); > +} All this does is checking if font is installed, and we know it is installed on all current Windows versions, it's not some directwrite functionality. Second patch will already trigger a todo case when font is installed in Wine.

2 4

[PATCH 6/6] win32u: Move NtUserCloseClipboard implementation from user32.
by Jacek Caban 06 Apr '22

06 Apr '22

3 2

[PATCH 5/6] user.exe: Remove no longer used wait_message16.
by Jacek Caban 06 Apr '22

06 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user.exe16/message.c | 15 --------------- dlls/user.exe16/user_private.h | 2 -- dlls/user32/controls.h | 2 -- dlls/user32/driver.c | 11 +---------- dlls/user32/winproc.c | 10 ---------- 5 files changed, 1 insertion(+), 39 deletions(-)

3 2

[PATCH 4/6] win32u: Move process_hardware_message implementation from user32.
by Jacek Caban 06 Apr '22

06 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 395 +---------------------------------- dlls/user32/user_main.c | 3 +- dlls/user32/user_private.h | 4 +- dlls/win32u/message.c | 393 +++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 4 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/window.c | 8 +- 7 files changed, 405 insertions(+), 406 deletions(-)

3 2

[PATCH 3/6] win32u: Move NtUserPostMessage implementation from user32.
by Jacek Caban 06 Apr '22

06 Apr '22

3 2

[PATCH 2/6] win32u: Move NtUserPostThreadMessage implementation from user32.
by Jacek Caban 06 Apr '22

06 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 29 ++--------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 24 ++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ 7 files changed, 36 insertions(+), 29 deletions(-)

3 2

[PATCH 1/6] win32u: Add missing return in NtUserExitingThread implementation.
by Jacek Caban 06 Apr '22

06 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 1/9] mf/tests: Simplify handling of broken Win7 results.
by Rémi Bernon 06 Apr '22

06 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Sending tests first instead, as the review that more tests may be useful. It's not all completely related to H264, but I'm thinking that using the ColorConvertDMO transform instead of a videoconvert element might be best to correctly support H264 transform format changes, although none of the games I've tried are doing that. dlls/mf/tests/mf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 31a84e47bc1..b2dd807dd33 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6631,6 +6631,7 @@ static void test_h264_decoder(void) IMFMediaType *media_type; IMFTransform *transform; DWORD status, length; + BOOL is_win7 = FALSE; ULONG i, ret, flags; HANDLE output_file; IMFSample *sample; @@ -6741,10 +6742,9 @@ static void test_h264_decoder(void) winetest_push_context("out %lu", i); ok(hr == S_OK, "GetOutputAvailableType returned %#lx\n", hr); check_media_type(media_type, default_outputs[i], -1); - if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL))) - check_media_type(media_type, default_outputs_win7[i], -1); - else - check_media_type(media_type, default_outputs_extra[i], -1); + hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL); + is_win7 = broken(FAILED(hr)); + check_media_type(media_type, is_win7 ? default_outputs_win7[i] : default_outputs_extra[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); @@ -6772,11 +6772,9 @@ static void test_h264_decoder(void) init_media_type(media_type, output_type_desc, i + 1); } hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - if (broken(hr == MF_E_INVALIDMEDIATYPE)) - { - init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1); - hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - } + ok(hr == (is_win7 ? MF_E_INVALIDMEDIATYPE : S_OK), "SetOutputType returned %#lx.\n", hr); + init_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 1, "Release returned %lu\n", ret); -- 2.35.1

1 8

[tools] testbot/cgi: Let CollectionBlock operate in read-only mode.
by Francois Gouget 06 Apr '22

06 Apr '22

When in read-only mode the CollectionBlock does not allow any per-item or global action to be performed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This avoids having to redefine GetItemActions() and GetActions() for the sole purpose of preventing the default actions on a collection block and thus removes a bit of code. When a collection block can operate either in read-only or read-write mode depending on the circumstances (failure blacklist pages) this also makes centralizing the corresponding test a no-brainer. --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 39 ++++++++++++++++--- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 ++++ testbot/web/PatchesList.pl | 13 +------ testbot/web/index.pl | 32 +-------------- 4 files changed, 43 insertions(+), 48 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 40ad61b2b..13c2a62bd 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -53,7 +53,7 @@ use URI::Escape; =item C<new()> -Creates a table showing the content of the specified Collection with +Creates a table showing the content of the specified Collection with optional support for performing actions on selected rows, or performing global actions. Parameters: @@ -67,6 +67,8 @@ ObjectModel::CGI::Page interface. =back +Note that by default the table is in read-write mode (see SetReadWrite()). + =back =cut @@ -76,7 +78,9 @@ sub new($$$@) my ($Collection, $EnclosingPage) = @_; my $self = {Collection => $Collection, - EnclosingPage => $EnclosingPage}; + EnclosingPage => $EnclosingPage, + RW => 1, + }; $self = bless $self, $class; $self->_initialize(@_); return $self; @@ -92,6 +96,28 @@ sub Create($$@) return ObjectModel::CGI::CollectionBlock->new(@_); } +=pod +=over 12 + +=item C<SetReadWrite()> + +If set to true, the table allows selecting rows and applying actions to +them (see GetItemActions()), as well as performing global actions (see +GetActions()). + +Otherwise none of this is allowed, regardless of what GetItemActions() and +GetActions() return. + +=back +=cut + +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{RW} = $RW; +} + sub GetDetailsPage($) { my ($self) = @_; @@ -405,7 +431,7 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n"; - my $ItemActions = $self->GetItemActions(); + my $ItemActions = $self->{RW} ? $self->GetItemActions() : []; $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); print "</thead>\n"; @@ -459,7 +485,7 @@ EOF print "</div>\n"; } - my $Actions = $self->GetActions(); + my $Actions = $self->{RW} ? $self->GetActions() : []; if (@$Actions != 0) { print "<div class='CollectionBlockActions'>\n"; @@ -499,6 +525,7 @@ column of checkboxes is added. sub GetItemActions($) { #my ($self) = @_; + return ["Delete"]; } @@ -523,7 +550,7 @@ sub OnItemAction($$$) { my ($self, $Item, $Action) = @_; - if ($Action eq "Delete") + if ($self->{RW} and $Action eq "Delete") { my $ErrMessage = $self->{Collection}->DeleteItem($Item); if (defined $ErrMessage) @@ -587,7 +614,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($Action eq "Add " . $self->{Collection}->GetItemName()) + if ($self->{RW} and $Action eq "Add ". $self->{Collection}->GetItemName()) { my $Target = $self->GetDetailsPage(); my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 2de667b89..7bdd27e26 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -87,6 +87,13 @@ sub _initialize($$$$;$) $self->SUPER::_initialize($Request, $RequiredRole); } +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{CollectionBlock}->SetReadWrite($RW); +} + # # HTML page generation diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 49e16d8d2..854c2768a 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -64,18 +64,6 @@ sub GenerateDataCell($$$$$) } } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - package main; @@ -84,5 +72,6 @@ use WineTestBot::Patches; my $Request = shift; my $Page = ObjectModel::CGI::CollectionPage->new($Request, "", CreatePatches(), \&PatchesBlock::Create); +$Page->SetReadWrite(0); $Page->SetRefreshInterval(60); $Page->GeneratePage(); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index d2dd2b49d..85f8df39f 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -43,18 +43,6 @@ sub SortKeys($$) return \@SortedKeys; } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -207,18 +195,6 @@ sub SortKeys($$) return $self->{Collection}->SortKeysBySortOrder($Keys); } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -229,12 +205,6 @@ sub DisplayProperty($$) $PropertyName eq "Description"; } -sub GetDetailsPage($) -{ - #my ($self) = @_; - return undef; -} - package StatusPage; @@ -344,6 +314,7 @@ sub GenerateBody($) my $CutOff = time() - $Days * 24 * 60 * 60; $Jobs->AddFilter("Submitted", [$CutOff], ">="); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); + $JobsCollectionBlock->SetReadWrite(0); # We need to collect information about the tasks of all jobs except the # pretty rare queued jobs. But doing so one job at a time is inefficient so @@ -384,6 +355,7 @@ EOF print "<h2><a name='vms'></a>VMs</h2>\n"; my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); + $VMsCollectionBlock->SetReadWrite(0); $VMsCollectionBlock->GenerateList(); print "</div>\n"; -- 2.30.2

1 0

[tools 1/2] testbot/SetWinLocale: Add an option to change the locale of VMs.
by Francois Gouget 06 Apr '22

06 Apr '22

The --vm ensures the right TestAgent connection parameters will be used to connect to the specified VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This partially reverts commit 206c7478dcb4 but with some important differences: - It does not parse the VM name to infer the locale to be used. Here --vm is purely a way to specify how to connect to that machine's TestAgentd server. - It does not add back the options for 'refreshing' snapshots, or creating new VMs for the specified locales. Those were not used and are not coming back. --- testbot/bin/SetWinLocale | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 670de4604..e41af2088 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -40,6 +40,7 @@ use WineTestBot::Config; use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; +use WineTestBot::VMs; my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; @@ -315,7 +316,7 @@ sub CheckLocale($$) return undef; } -my ($OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptUseIntl, $OptReboot); +my ($OptVM, $OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptUseIntl, $OptReboot); my ($OptDefault, $OptLocale, $OptCountry, $OptSystem, $OptUTF8, $OptMUI, $OptKeyboard); while (@ARGV) { @@ -324,6 +325,10 @@ while (@ARGV) { $Usage = 0; } + elsif ($Arg eq "--vm") + { + $OptVM = CheckValue($Arg, $OptVM); + } elsif ($Arg eq "--show") { $OptShow = 1; @@ -415,10 +420,25 @@ while (@ARGV) } # Check and untaint parameters -my ($Keyboard, $CountryId); +my ($VM, $Keyboard, $CountryId); if (!defined $Usage) { - if (!defined $OptHostName) + if (defined $OptVM) + { + my $VMs = CreateVMs(); + $VM = $VMs->GetItem($OptVM); + if (!$VM) + { + Error("could not find the '$OptVM' VM\n"); + $Usage = 2; + } + elsif (!$Debug and $VM->Role eq "deleted") + { + Error("'$OptVM' is marked for deletion\n"); + $Usage = 2; + } + } + elsif (!defined $OptHostName) { Error("you must specify the Windows machine to work on\n"); $Usage = 2; @@ -510,14 +530,16 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--use-intl] [--no-reboot] HOSTNAME\n"; + print "Usage: $name0 [options] --show (HOSTNAME|--vm VM)\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--use-intl] [--no-reboot] (HOSTNAME|--vm VM)\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; print " --show Show the locale settings of the specified host and exit.\n"; + print " --vm VM Work on the specified TestBot VM, using its TestAgent\n"; + print " connection parameters.\n"; print " --default DEF Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; print " control panel module, that is roughly ll-CC where ll is an\n"; @@ -604,7 +626,7 @@ if (defined $Usage) exit 0; } -$TA = TestAgent->new($OptHostName, $AgentPort); +$TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); # -- 2.30.2

1 1

[PATCH 2/2] kernelbase: Add support for CREATE_NO_WINDOW flag.
by Jacek Caban 06 Apr '22

06 Apr '22

Based on patches by Eric Pouech and Torge Matthies. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Both Eric and Torge sent patches for this and both used ConsoleFlags for passing the information. While reviewing both series, I was wondering if using ConsoleHandle instead would be cleaner and I think it is. I ended up having a complete third version... Eric, Torge, I hope you will review this. dlls/kernel32/tests/console.c | 3 --- dlls/kernelbase/console.c | 21 +++++++++++++++------ dlls/kernelbase/process.c | 11 +++++++---- include/wine/condrv.h | 5 +++-- programs/conhost/conhost.c | 11 ++++++++--- programs/conhost/conhost.h | 1 + 6 files changed, 34 insertions(+), 18 deletions(-)

2 6

[PATCH] Replace / with : in ConnectionString
by Florian Manschwetus 06 Apr '22

06 Apr '22

From: manschwetusCS <30724946+manschwetusCS(a)users.noreply.github.com> In Windows ODBC it seems to be legal to use "host/port", which is not legal with Linux ODBC. This patch aims to find and replace such in the ConnectionString Signed-off-by: Florian Manschwetus <manschwetus(a)cs-software-gmbh.de> --- dlls/odbc32/proxyodbc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c1cb44c29fc..3c78d94b69a 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1779,10 +1779,21 @@ SQLRETURN WINAPI SQLDriverConnect(SQLHDBC hdbc, SQLHWND hwnd, SQLCHAR *Connectio SQLCHAR *conn_str_out, SQLSMALLINT conn_str_out_max, SQLSMALLINT *ptr_conn_str_out, SQLUSMALLINT driver_completion) { + static const char *serverStr="SERVER="; struct SQLDriverConnect_params params = { hdbc, hwnd, ConnectionString, Length, conn_str_out, conn_str_out_max, ptr_conn_str_out, driver_completion }; SQLRETURN ret; + SQLCHAR *serverPos; + for (serverPos = strstr(ConnectionString,serverStr);(*serverPos != ';') && (*serverPos != '\0'); ++serverPos) + { + if (*serverPos == '/') + { + *serverPos = ':'; + break; + } + } + TRACE("(hdbc %p, hwnd %p, ConnectionString %s, Length %d, conn_str_out %p, conn_str_out_max %d," " ptr_conn_str_out %p, driver_completion %d)\n", hdbc, hwnd, debugstr_an((const char *)ConnectionString, Length), Length, conn_str_out, conn_str_out_max, -- 2.33.0.windows.2 If you received this email in error, please advise the sender (by return email or otherwise) immediately.

2 2

[PATCH] dlls/urlmon: use I width modifier instead of casting to DWORD
by Eric Pouech 06 Apr '22

06 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/urlmon/sec_mgr.c | 12 +++++------ dlls/urlmon/uri.c | 56 +++++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 5c79cb2b2500..4529f439b7db 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1153,8 +1153,8 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlActionEx2(IInternetSecurityManage DWORD dwFlags, DWORD_PTR dwReserved, DWORD *pdwOutFlags) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%p %08lx %p %ld %p %ld %08lx %08lx %p) stub\n", This, pUri, dwAction, pPolicy, - cbPolicy, pContext, cbContext, dwFlags, (DWORD)dwReserved, pdwOutFlags); + FIXME("(%p)->(%p %08lx %p %ld %p %ld %08lx %08Ix %p) stub\n", This, pUri, dwAction, pPolicy, + cbPolicy, pContext, cbContext, dwFlags, dwReserved, pdwOutFlags); return E_NOTIMPL; } @@ -1162,7 +1162,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityIdEx2(IInternetSecurityManagerEx IUri *pUri, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - TRACE("(%p)->(%p %p %p %08lx) stub\n", This, pUri, pbSecurityId, pcbSecurityId, (DWORD)dwReserved); + TRACE("(%p)->(%p %p %p %08Ix) stub\n", This, pUri, pbSecurityId, pcbSecurityId, dwReserved); if(dwReserved) FIXME("dwReserved is not supported yet\n"); @@ -1178,8 +1178,8 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicyEx2(IInternetSecurityManag DWORD cbContext, DWORD_PTR dwReserved) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%p %s %p %p %p %ld %08lx) stub\n", This, pUri, debugstr_guid(guidKey), ppPolicy, pcbPolicy, - pContext, cbContext, (DWORD)dwReserved); + FIXME("(%p)->(%p %s %p %p %p %ld %08Ix) stub\n", This, pUri, debugstr_guid(guidKey), ppPolicy, pcbPolicy, + pContext, cbContext, dwReserved); return E_NOTIMPL; } @@ -1993,7 +1993,7 @@ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION WCHAR *ret_url; HRESULT hres; - TRACE("(%p,%p,%u,%lu)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); + TRACE("(%p,%p,%u,%Iu)\n", pUri, ppSecUri, psuAction, dwReserved); if(!pUri || !ppSecUri) return E_INVALIDARG; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 838f1d0619db..c774fdf01adc 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4662,7 +4662,7 @@ static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *if IUriBuilder **ppIUriBuilder) { Uri *This = impl_from_IUriBuilderFactory(iface); - TRACE("(%p)->(%08lx %08lx %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p)->(%08lx %08Ix %p)\n", This, dwFlags, dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -4681,7 +4681,7 @@ static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilder IUriBuilder **ppIUriBuilder) { Uri *This = impl_from_IUriBuilderFactory(iface); - TRACE("(%p)->(%08lx %08lx %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p)->(%08lx %08Ix %p)\n", This, dwFlags, dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -5286,7 +5286,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU HRESULT hr; parse_data data; - TRACE("(%s %lx %lx %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI); + TRACE("(%s %lx %Ix %p)\n", debugstr_w(pwzURI), dwFlags, dwReserved, ppURI); if(!ppURI) return E_INVALIDARG; @@ -5374,7 +5374,7 @@ HRESULT WINAPI CreateUriWithFragment(LPCWSTR pwzURI, LPCWSTR pwzFragment, DWORD DWORD_PTR dwReserved, IUri **ppURI) { HRESULT hres; - TRACE("(%s %s %lx %lx %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, (DWORD)dwReserved, ppURI); + TRACE("(%s %s %lx %Ix %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, dwReserved, ppURI); if(!ppURI) return E_INVALIDARG; @@ -5547,11 +5547,11 @@ static HRESULT WINAPI UriBuilder_CreateUriSimple(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(%ld %ld %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(%ld %Id %p)\n", This, dwAllowEncodingPropertyMask, dwReserved, ppIUri); hr = build_uri(This, ppIUri, 0, UriBuilder_USE_ORIGINAL_FLAGS, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(%ld %ld %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(%ld %Id %p)\n", This, dwAllowEncodingPropertyMask, dwReserved, ppIUri); return hr; } @@ -5563,7 +5563,7 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, dwReserved, ppIUri); if(dwCreateFlags == -1) hr = build_uri(This, ppIUri, 0, UriBuilder_USE_ORIGINAL_FLAGS, dwAllowEncodingPropertyMask); @@ -5571,7 +5571,7 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface, hr = build_uri(This, ppIUri, dwCreateFlags, 0, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, dwReserved, ppIUri); return hr; } @@ -5584,13 +5584,13 @@ static HRESULT WINAPI UriBuilder_CreateUriWithFlags(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(0x%08lx 0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwUriBuilderFlags, - dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(0x%08lx 0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwUriBuilderFlags, + dwAllowEncodingPropertyMask, dwReserved, ppIUri); hr = build_uri(This, ppIUri, dwCreateFlags, dwUriBuilderFlags, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(0x%08lx 0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwUriBuilderFlags, - dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(0x%08lx 0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwUriBuilderFlags, + dwAllowEncodingPropertyMask, dwReserved, ppIUri); return hr; } @@ -5932,7 +5932,7 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve { UriBuilder *ret; - TRACE("(%p %lx %lx %p)\n", pIUri, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p %lx %Ix %p)\n", pIUri, dwFlags, dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -5962,8 +5962,8 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve } else { heap_free(ret); *ppIUriBuilder = NULL; - FIXME("(%p %lx %lx %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags, - (DWORD)dwReserved, ppIUriBuilder); + FIXME("(%p %lx %Ix %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags, + dwReserved, ppIUriBuilder); return E_NOTIMPL; } } @@ -6295,7 +6295,7 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d HRESULT hr; IInternetProtocolInfo *info; Uri *relative, *base; - TRACE("(%p %p %lx %p %lx)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + TRACE("(%p %p %lx %p %Ix)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, dwReserved); if(!ppCombinedUri) return E_INVALIDARG; @@ -6309,8 +6309,8 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d base = get_uri_obj(pBaseUri); if(!relative || !base) { *ppCombinedUri = NULL; - FIXME("(%p %p %lx %p %lx) Unknown IUri types not supported yet.\n", - pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + FIXME("(%p %p %lx %p %Ix) Unknown IUri types not supported yet.\n", + pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, dwReserved); return E_NOTIMPL; } @@ -6343,8 +6343,8 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW HRESULT hr; IInternetProtocolInfo *info; - TRACE("(%p %s %lx %p %lx)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, - ppCombinedUri, (DWORD)dwReserved); + TRACE("(%p %s %lx %p %Ix)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, + ppCombinedUri, dwReserved); if(!ppCombinedUri) return E_POINTER; @@ -6362,8 +6362,8 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW base = get_uri_obj(pBaseUri); if(!base) { *ppCombinedUri = NULL; - FIXME("(%p %s %lx %p %lx) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl), - dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + FIXME("(%p %s %lx %p %Ix) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl), + dwCombineFlags, ppCombinedUri, dwReserved); return E_NOTIMPL; } @@ -6828,8 +6828,8 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d Uri *uri; IInternetProtocolInfo *info; - TRACE("(%p %d %lx %p %ld %p %lx)\n", pIUri, ParseAction, dwFlags, pwzResult, - cchResult, pcchResult, (DWORD)dwReserved); + TRACE("(%p %d %lx %p %ld %p %Ix)\n", pIUri, ParseAction, dwFlags, pwzResult, + cchResult, pcchResult, dwReserved); if(!pcchResult) return E_POINTER; @@ -6841,8 +6841,8 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d if(!(uri = get_uri_obj(pIUri))) { *pcchResult = 0; - FIXME("(%p %d %lx %p %ld %p %lx) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + FIXME("(%p %d %lx %p %ld %p %Ix) Unknown IUri's not supported for this action.\n", + pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, dwReserved); return E_NOTIMPL; } @@ -6896,8 +6896,8 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d default: *pcchResult = 0; hr = E_NOTIMPL; - FIXME("(%p %d %lx %p %ld %p %lx) Partial stub.\n", pIUri, ParseAction, dwFlags, - pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + FIXME("(%p %d %lx %p %ld %p %Ix) Partial stub.\n", pIUri, ParseAction, dwFlags, + pwzResult, cchResult, pcchResult, dwReserved); } return hr;

2 1

[PATCH v2 2/2] kernelbase: Add support for CREATE_NO_WINDOW flag.
by Jacek Caban 06 Apr '22

06 Apr '22

Based on patches by Eric Pouech and Torge Matthies. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Added spawn_process part, spotted and implemented by Eric. dlls/kernel32/tests/console.c | 3 --- dlls/kernelbase/console.c | 21 +++++++++++++++------ dlls/kernelbase/process.c | 11 +++++++---- dlls/ntdll/unix/process.c | 1 + include/wine/condrv.h | 5 +++-- programs/conhost/conhost.c | 11 ++++++++--- programs/conhost/conhost.h | 1 + 7 files changed, 35 insertions(+), 18 deletions(-)

3 3

[PATCH 2/2] win32u: Return -1 for NUMCOLORS with 8-bit display DCs.
by Zhiyi Zhang 06 Apr '22

06 Apr '22

According to tests, GetDeviceCaps(NUMCOLORS) returns -1 for display DCs when the current display mode is 8-bit on newer versions of Windows, which makes sense because lower bit depth display modes are actually emulated with 32-bit modes. Spotted by Marc P <marc.pluhar+winehq(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52679 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 1 - dlls/win32u/driver.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 1d88afafb18..67c932398b9 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2310,7 +2310,6 @@ static void test_display_dc(void) value = GetDeviceCaps(hdc, NUMCOLORS); if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) - todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) ok(value == -1, "Expected -1, got %d.\n", value); else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) ok(value > 16 && value <= 256, "Got %d.\n", value); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index d1062cb5f3a..75e07d6c4e3 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -294,7 +294,8 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case LOGPIXELSY: return get_system_dpi(); case NUMCOLORS: bpp = NtGdiGetDeviceCaps( dev->hdc, BITSPIXEL ); - return (bpp > 8) ? -1 : (1 << bpp); + /* Newer versions of Windows return -1 for 8-bit and higher */ + return (bpp > 4) ? -1 : (1 << bpp); case COLORRES: /* The observed correspondence between BITSPIXEL and COLORRES is: * BITSPIXEL: 8 -> COLORRES: 18 -- 2.32.0

2 1

[PATCH v2] wusa: Support wow64 architecture identifier.
by Hans Leidekker 06 Apr '22

06 Apr '22

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> v2: Make the helper take an assembly and rename it to is_assembly_wow64(). Some update packages use both x86 and wow64 expressions. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/wusa/main.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 74dfeb68d5f..53534628c31 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -477,6 +477,14 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) return TRUE; } +static BOOL assembly_is_wow64(const struct assembly_entry *assembly) +{ +#ifdef __x86_64__ + return !wcsicmp(assembly->identity.architecture, L"x86") || !wcsicmp(assembly->identity.architecture, L"wow64"); +#endif + return FALSE; +} + static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; @@ -484,25 +492,19 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; -#endif - if (!csidl) csidl = CSIDL_SYSTEM; + if (assembly_is_wow64(assembly)) csidl = CSIDL_SYSTEMX86; + else csidl = CSIDL_SYSTEM; } else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; else if (!wcsicmp(key, L"runtime.programfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES; + if (assembly_is_wow64(assembly)) csidl = CSIDL_PROGRAM_FILESX86; + else csidl = CSIDL_PROGRAM_FILES; } else if (!wcsicmp(key, L"runtime.commonfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; + if (assembly_is_wow64(assembly)) csidl = CSIDL_PROGRAM_FILES_COMMONX86; + else csidl = CSIDL_PROGRAM_FILES_COMMON; } #ifdef __x86_64__ else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86; -- 2.30.2

1 0

[PATCH] wusa: Support wow64 expressions.
by Mohamad Al-Jaf 06 Apr '22

06 Apr '22

Some update packages use both x86 and wow64 expressions. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- programs/wusa/main.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 74dfeb68d5f..2cfaa1a2d63 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -477,6 +477,14 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) return TRUE; } +static BOOL expression_is_x86(const WCHAR *str) +{ +#ifdef __x86_64__ + return !wcsicmp(str, L"x86") || !wcsicmp(str, L"wow64"); +#endif + return FALSE; +} + static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; @@ -484,25 +492,19 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; -#endif - if (!csidl) csidl = CSIDL_SYSTEM; + if (expression_is_x86(assembly->identity.architecture)) csidl = CSIDL_SYSTEMX86; + else csidl = CSIDL_SYSTEM; } else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; else if (!wcsicmp(key, L"runtime.programfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES; + if (expression_is_x86(assembly->identity.architecture)) csidl = CSIDL_PROGRAM_FILESX86; + else csidl = CSIDL_PROGRAM_FILES; } else if (!wcsicmp(key, L"runtime.commonfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; + if (expression_is_x86(assembly->identity.architecture)) csidl = CSIDL_PROGRAM_FILES_COMMONX86; + else csidl = CSIDL_PROGRAM_FILES_COMMON; } #ifdef __x86_64__ else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86; -- 2.35.1

1 0

[PATCH v2 1/4] ncrypt: Map STATUS_NOT_SUPPORTED to NTE_NOT_SUPPORTED.
by Mohamad Al-Jaf 06 Apr '22

06 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index cc979a539d2..13909a2dd9e 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -40,6 +40,7 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) case STATUS_INVALID_SIGNATURE: return NTE_BAD_SIGNATURE; case STATUS_SUCCESS: return ERROR_SUCCESS; case STATUS_INVALID_PARAMETER: return NTE_INVALID_PARAMETER; + case STATUS_NOT_SUPPORTED: return NTE_NOT_SUPPORTED; case NTE_BAD_DATA: return NTE_BAD_DATA; default: FIXME("unhandled status %#lx\n", status); -- 2.35.1

2 7

[PATCH 2/2] bcrypt: Implement BCryptFreeBuffer().
by Hans Leidekker 06 Apr '22

06 Apr '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 98ae8c97e3a..2c0d2f8f965 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -75,7 +75,7 @@ NTSTATUS WINAPI BCryptEnumContextFunctions( ULONG table, const WCHAR *ctx, ULONG void WINAPI BCryptFreeBuffer( void *buffer ) { - FIXME( "%p\n", buffer ); + free( buffer ); } NTSTATUS WINAPI BCryptRegisterProvider( const WCHAR *provider, ULONG flags, CRYPT_PROVIDER_REG *reg ) -- 2.30.2

2 2

[PATCH] wusa: Reimplement lookup_expression.
by Mohamad Al-Jaf 06 Apr '22

06 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- This is a lot more readable and easily allows for additional expressions to be supported if needed in the future. It also conforms to the general code style in wusa. --- programs/wusa/main.c | 60 ++++++++++++++++++++++++-------------------- programs/wusa/wusa.h | 8 ++++++ 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 74dfeb68d5f..f43e86c0019 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -52,6 +52,31 @@ struct installer_state struct list updates; }; +static const struct expression expression_table[] = +{ + {L"runtime.system32", L"amd64", CSIDL_SYSTEM, NULL}, + {L"runtime.system32", L"x86", CSIDL_SYSTEMX86, NULL}, + {L"runtime.system32", L"wow64", CSIDL_SYSTEMX86, NULL}, + {L"runtime.windows", NULL, CSIDL_WINDOWS, NULL}, + {L"runtime.programfiles", L"amd64", CSIDL_PROGRAM_FILES, NULL}, + {L"runtime.programfiles", L"x86", CSIDL_PROGRAM_FILESX86, NULL}, + {L"runtime.programfiles", L"wow64", CSIDL_PROGRAM_FILESX86, NULL}, + {L"runtime.programfilesX86", L"x86", CSIDL_PROGRAM_FILESX86, NULL}, + {L"runtime.commonfiles", L"amd64", CSIDL_PROGRAM_FILES_COMMON, NULL}, + {L"runtime.commonfiles", L"x86", CSIDL_PROGRAM_FILES_COMMONX86, NULL}, + {L"runtime.commonfiles", L"wow64", CSIDL_PROGRAM_FILES_COMMONX86, NULL}, + {L"runtime.commonfilesX86", L"x86", CSIDL_PROGRAM_FILES_COMMONX86, NULL}, + {L"runtime.programdata", NULL, CSIDL_COMMON_APPDATA, NULL}, + {L"runtime.drivers", L"amd64", CSIDL_SYSTEM, L"\\drivers"}, + {L"runtime.drivers", L"x86", CSIDL_SYSTEMX86, L"\\drivers"}, + {L"runtime.drivers", L"wow64", CSIDL_SYSTEMX86, L"\\drivers"}, + {L"runtime.wbem", L"amd64", CSIDL_SYSTEM, L"\\wbem"}, + {L"runtime.wbem", L"x86", CSIDL_SYSTEMX86, L"\\wbem"}, + {L"runtime.wbem", L"wow64", CSIDL_SYSTEMX86, L"\\wbem"}, + {L"runtime.inf", NULL, CSIDL_WINDOWS, L"\\inf"}, + {L"runtime.fonts", NULL, CSIDL_FONTS, NULL}, +}; + static void * CDECL cabinet_alloc(ULONG cb) { return malloc(cb); @@ -480,36 +505,19 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; + unsigned int i; int csidl = 0; - if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) - { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; -#endif - if (!csidl) csidl = CSIDL_SYSTEM; - } - else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; - else if (!wcsicmp(key, L"runtime.programfiles")) + for (i = 0; i < ARRAY_SIZE(expression_table); ++i) { + if (wcsicmp(key, expression_table[i].key)) continue; #ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; + if (expression_table[i].architecture) + if (wcsicmp(assembly->identity.architecture, expression_table[i].architecture)) continue; #endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES; - } - else if (!wcsicmp(key, L"runtime.commonfiles")) - { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; + csidl = expression_table[i].csidl; + break; } -#ifdef __x86_64__ - else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86; - else if (!wcsicmp(key, L"runtime.commonfilesx86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; -#endif - else if (!wcsicmp(key, L"runtime.programdata")) csidl = CSIDL_COMMON_APPDATA; - else if (!wcsicmp(key, L"runtime.fonts")) csidl = CSIDL_FONTS; if (!csidl) { @@ -522,9 +530,7 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke return NULL; } - if (!wcsicmp(key, L"runtime.inf")) wcscat(path, L"\\inf"); - else if (!wcsicmp(key, L"runtime.drivers")) wcscat(path, L"\\drivers"); - else if (!wcsicmp(key, L"runtime.wbem")) wcscat(path, L"\\wbem"); + if (expression_table[i].append) wcscat(path, expression_table[i].append); return strdupW(path); } diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index da679a27f07..fa8e37979e2 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -33,6 +33,14 @@ struct assembly_identity WCHAR *pubkey_token; }; +struct expression +{ + const WCHAR *key; + const WCHAR *architecture; + int csidl; + const WCHAR *append; +}; + struct dependency_entry { struct list entry; -- 2.35.1

2 7

[PATCH 1/2] bcrypt: Fix array index in BCryptEnumAlgorithms().
by Hans Leidekker 06 Apr '22

06 Apr '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 11 ++++++----- dlls/bcrypt/tests/bcrypt.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2ffeff66d7b..98ae8c97e3a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -147,7 +147,7 @@ NTSTATUS WINAPI BCryptEnumAlgorithms( ULONG type, ULONG *ret_count, BCRYPT_ALGOR BCRYPT_SIGNATURE_OPERATION |\ BCRYPT_RNG_OPERATION; BCRYPT_ALGORITHM_IDENTIFIER *list; - ULONG i, count = 0; + ULONG i, j, count = 0; TRACE( "%#lx, %p, %p, %#lx\n", type, ret_count, ret_list, flags ); @@ -160,12 +160,13 @@ NTSTATUS WINAPI BCryptEnumAlgorithms( ULONG type, ULONG *ret_count, BCRYPT_ALGOR if (!(list = malloc( count * sizeof(*list) ))) return STATUS_NO_MEMORY; - for (i = 0; i < ARRAY_SIZE( builtin_algorithms ); i++) + for (i = 0, j = 0; i < ARRAY_SIZE( builtin_algorithms ); i++) { if (!match_operation_type( type, builtin_algorithms[i].class )) continue; - list[i].pszName = (WCHAR *)builtin_algorithms[i].name; - list[i].dwClass = builtin_algorithms[i].class; - list[i].dwFlags = 0; + list[j].pszName = (WCHAR *)builtin_algorithms[i].name; + list[j].dwClass = builtin_algorithms[i].class; + list[j].dwFlags = 0; + j++; } *ret_count = count; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index df650379cfb..08ce360cac0 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2668,7 +2668,7 @@ static void test_BCryptEnumAlgorithms(void) { BCRYPT_ALGORITHM_IDENTIFIER *list; NTSTATUS ret; - ULONG count; + ULONG count, op; ret = BCryptEnumAlgorithms(0, NULL, NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); @@ -2689,6 +2689,16 @@ static void test_BCryptEnumAlgorithms(void) ok(list != NULL, "NULL list\n"); ok(count, "got %lu\n", count); BCryptFreeBuffer( list ); + + op = BCRYPT_CIPHER_OPERATION | BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION | BCRYPT_SIGNATURE_OPERATION | + BCRYPT_SECRET_AGREEMENT_OPERATION; + count = 0; + list = NULL; + ret = BCryptEnumAlgorithms(op, &count, &list, 0); + ok(!ret, "got %#lx\n", ret); + ok(list != NULL, "NULL list\n"); + ok(count, "got %lu\n", count); + BCryptFreeBuffer( list ); } static void test_aes_vector(void) -- 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