- Wine-Devel - list.winehq.org

[PATCH v3 1/7] include/winerror.h: Add missing WinRT HRESULT codes.
by Bernhard Kölbl April 6, 2022

April 6, 2022

Taken from MSDN and original winerror.h. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/winerror.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index b63b74a5b18..d51d5648cdb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2578,6 +2578,25 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define E_CHANGED_STATE _HRESULT_TYPEDEF_(0x8000000C) #define E_ILLEGAL_STATE_CHANGE _HRESULT_TYPEDEF_(0x8000000D) #define E_ILLEGAL_METHOD_CALL _HRESULT_TYPEDEF_(0x8000000E) +#define RO_E_METADATA_NAME_NOT_FOUND _HRESULT_TYPEDEF_(0x8000000F) +#define RO_E_METADATA_NAME_IS_NAMESPACE _HRESULT_TYPEDEF_(0x80000010) +#define RO_E_METADATA_INVALID_TYPE_FORMAT _HRESULT_TYPEDEF_(0x80000011) +#define RO_E_INVALID_METADATA_FILE _HRESULT_TYPEDEF_(0x80000012) +#define RO_E_CLOSED _HRESULT_TYPEDEF_(0x80000013) +#define RO_E_EXCLUSIVE_WRITE _HRESULT_TYPEDEF_(0x80000014) +#define RO_E_CHANGE_NOTIFICATION_IN_PROGRESS _HRESULT_TYPEDEF_(0x80000015) +#define RO_E_ERROR_STRING_NOT_FOUND _HRESULT_TYPEDEF_(0x80000016) +#define E_STRING_NOT_NULL_TERMINATED _HRESULT_TYPEDEF_(0x80000017) +#define E_ILLEGAL_DELEGATE_ASSIGNMENT _HRESULT_TYPEDEF_(0x80000018) +#define E_ASYNC_OPERATION_NOT_STARTED _HRESULT_TYPEDEF_(0x80000019) +#define E_APPLICATION_EXITING _HRESULT_TYPEDEF_(0x8000001A) +#define E_APPLICATION_VIEW_EXITING _HRESULT_TYPEDEF_(0x8000001B) +#define RO_E_MUST_BE_AGILE _HRESULT_TYPEDEF_(0x8000001C) +#define RO_E_UNSUPPORTED_FROM_MTA _HRESULT_TYPEDEF_(0x8000001D) +#define RO_E_COMMITTED _HRESULT_TYPEDEF_(0x8000001E) +#define RO_E_BLOCKED_CROSS_ASTA_CALL _HRESULT_TYPEDEF_(0x8000001F) +#define RO_E_CANNOT_ACTIVATE_FULL_TRUST_SERVER _HRESULT_TYPEDEF_(0x80000020) +#define RO_E_CANNOT_ACTIVATE_UNIVERSAL_APPLICATION_SERVER _HRESULT_TYPEDEF_(0x80000021) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001) #define E_NOINTERFACE _HRESULT_TYPEDEF_(0x80004002) -- 2.35.1

2 12

[PATCH vkd3d v3 1/7] vkd3d-shader/hlsl: Lower casts to bool to comparisons.
by Giovanni Mascellani April 6, 2022

April 6, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v3: * Fix optimization passes order. * Rename lower_cast_to_bool() to lower_casts_to_bool(). --- libs/vkd3d-shader/hlsl_codegen.c | 32 +++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_constant_ops.c | 9 ++------ libs/vkd3d-shader/hlsl_sm4.c | 3 ++- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2b05264c..72c00430 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -750,6 +750,37 @@ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_type *type = instr->data_type, *arg_type; + struct hlsl_ir_constant *zero; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op != HLSL_OP1_CAST) + return false; + arg_type = expr->operands[0].node->data_type; + if (type->type > HLSL_CLASS_VECTOR || arg_type->type > HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_BOOL) + return false; + + /* Narrowing casts should have already been lowered. */ + assert(type->dimx == arg_type->dimx); + + zero = hlsl_new_constant(ctx, arg_type, &instr->loc); + if (!zero) + return false; + list_add_before(&instr->entry, &zero->node.entry); + + expr->op = HLSL_OP2_NEQUAL; + hlsl_src_from_node(&expr->operands[1], &zero->node); + + return true; +} + static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { switch (instr->type) @@ -1655,6 +1686,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } while (progress); transform_ir(ctx, lower_narrowing_casts, body, NULL); + transform_ir(ctx, lower_casts_to_bool, body, NULL); do { progress = transform_ir(ctx, hlsl_fold_constants, body, NULL); diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index e282dbd4..5cac4bde 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -27,7 +27,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct int32_t i; double d; float f; - bool b; if (dst->node.data_type->dimx != src->node.data_type->dimx || dst->node.data_type->dimy != src->node.data_type->dimy) @@ -47,7 +46,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].f; f = src->value[k].f; d = src->value[k].f; - b = !!src->value[k].f; break; case HLSL_TYPE_DOUBLE: @@ -55,7 +53,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].d; f = src->value[k].d; d = src->value[k].d; - b = !!src->value[k].d; break; case HLSL_TYPE_INT: @@ -63,7 +60,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].i; f = src->value[k].i; d = src->value[k].i; - b = !!src->value[k].i; break; case HLSL_TYPE_UINT: @@ -71,7 +67,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].u; f = src->value[k].u; d = src->value[k].u; - b = !!src->value[k].u; break; case HLSL_TYPE_BOOL: @@ -79,7 +74,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = !!src->value[k].u; f = !!src->value[k].u; d = !!src->value[k].u; - b = !!src->value[k].u; break; default: @@ -107,7 +101,8 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct break; case HLSL_TYPE_BOOL: - dst->value[k].u = b ? ~0u : 0; + /* Casts to bool should have already been lowered. */ + assert(0); break; default: diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 872118c1..f3530084 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1540,7 +1540,8 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool.\n"); + /* Casts to bool should have already been lowered. */ + assert(0); break; default: -- 2.35.1

2 7

[PATCH vkd3d v2 1/9] vkd3d-shader/hlsl: Use an unsigned variable for iteration.
by Giovanni Mascellani April 6, 2022

April 6, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * New --- libs/vkd3d-shader/hlsl_constant_ops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 51cee179..109fc2ee 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -194,11 +194,12 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) { enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; assert(type == src1->node.data_type->base_type); assert(type == src2->node.data_type->base_type); - for (int k = 0; k < 4; ++k) + for (k = 0; k < 4; ++k) { switch (type) { -- 2.35.1

4 35

[PATCH] mf/session: Use correct format specifier for start position.
by Nikolay Sivov April 6, 2022

April 6, 2022

Fixup for 3f84ee1eb6637602e3e95fee20985444639b4602. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 85cbcc29630..85b63f767fe 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2009,7 +2009,7 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format struct session_op *op; HRESULT hr; - TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), debugstr_propvar(start_position)); + TRACE("%p, %s, %s.\n", iface, debugstr_guid(format), debugstr_propvar(start_position)); if (!start_position) return E_POINTER; -- 2.35.1

1 0

[PATCH 1/3] evr/presenter: Fix hns-to-msec conversion multiplier.
by Nikolay Sivov April 6, 2022

April 6, 2022

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 7e14cb2f720..1b119ce9cab 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -548,7 +548,7 @@ static void video_presenter_check_queue(struct video_presenter *presenter, if (delta > 3 * presenter->frame_time_threshold) { /* Convert 100ns -> msec */ - wait = (delta - 3 * presenter->frame_time_threshold) / 100000; + wait = (delta - 3 * presenter->frame_time_threshold) / 10000; present = FALSE; } } -- 2.35.1

1 2

[PATCH] combase: Don't start dllhost if the CLSID key doesn't exist.
by Huw Davies April 6, 2022

April 6, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/rpc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index f620339f19e..c8401fe0cbd 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -538,6 +538,12 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); + hr = open_key_for_clsid(rclsid, NULL, KEY_READ, &key); + if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + hr = open_key_for_clsid(rclsid, NULL, opposite | KEY_READ, &key); + if (FAILED(hr)) return hr; + RegCloseKey(key); + hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) { -- 2.23.0

1 0

[PATCH 1/3] include: Add ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES declaration.
by Rémi Bernon April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

> 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 April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

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