- Wine-Devel - list.winehq.org

[PATCH 1/6] win32u: Move winproc array from user32.
by Jacek Caban March 4, 2022

March 4, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 26 +----- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 1 + dlls/user32/winproc.c | 159 ++++++++------------------------- dlls/win32u/Makefile.in | 1 + dlls/win32u/class.c | 167 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 36 ++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 4 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++ include/ntuser.h | 24 +++++ 13 files changed, 285 insertions(+), 146 deletions(-) create mode 100644 dlls/win32u/class.c

2 1

[PATCH v2 1/5] mf/tests: Check the number of input samples to get a H264 stream change.
by Rémi Bernon March 4, 2022

March 4, 2022

We check that we can at least push two input samples at a time, which matches what Call of Duty Black Ops 3 is doing, as it is not checking ProcessInput result most of the time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Call MFT_MESSAGE_COMMAND_DRAIN. It seems to be synchronizing the transform and makes the number of input sample consistent. The MF_LOW_LATENCY attribute may not be necessary anymore but some games are actually setting the attribute so I'm keeping the test. * Allocate a fixed size sample in PATCH 2, output_info.cbSize is not initialized on Wine yet. dlls/mf/tests/mf.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6462594dae2..d08f0c82807 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6615,6 +6615,7 @@ static void test_h264_decoder(void) MFT_OUTPUT_DATA_BUFFER output; const BYTE *h264_encoded_data; ULONG h264_encoded_data_len; + IMFAttributes *attributes; IMFMediaType *media_type; IMFTransform *transform; ULONG i, ret, flags; @@ -6632,6 +6633,14 @@ static void test_h264_decoder(void) &transform, &class_id)) goto failed; + hr = IMFTransform_GetAttributes(transform, &attributes); + todo_wine + ok(hr == S_OK, "GetAttributes returned %#x\n", hr); + if (hr != S_OK) MFCreateAttributes(&attributes, 0); + hr = IMFAttributes_SetUINT32(attributes, &MF_LOW_LATENCY, 1); + ok(hr == S_OK, "SetUINT32 returned %#x\n", hr); + IMFAttributes_Release(attributes); + /* no output type is available before an input type is set */ hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); @@ -6826,6 +6835,7 @@ static void test_h264_decoder(void) ok(!output.pEvents, "got pEvents %p\n", output.pEvents); ok(status == 0, "got status %#x\n", status); + i = 0; sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); while (1) { @@ -6844,19 +6854,30 @@ static void test_h264_decoder(void) ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %u\n", ret); - while (h264_encoded_data_len > 4) - { - hr = IMFTransform_ProcessInput(transform, 0, sample, 0); - if (FAILED(hr)) break; - ok(hr == S_OK, "ProcessInput returned %#x\n", hr); - ret = IMFSample_Release(sample); - ok(ret <= 1, "Release returned %u\n", ret); - sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); - } - ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); - EXPECT_REF(sample, 1); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret <= 1, "Release returned %u\n", ret); + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret <= 1, "Release returned %u\n", ret); + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + i++; + + hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_COMMAND_DRAIN, 0); + todo_wine + ok(hr == S_OK, "ProcessMessage returned %#x\n", hr); } todo_wine + ok(i == 2, "got %u iterations\n", i); + todo_wine + ok(h264_encoded_data_len == 44959, "got h264_encoded_data_len %u\n", h264_encoded_data_len); + todo_wine ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#x\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); ok(!!output.pSample, "got pSample %p\n", output.pSample); -- 2.34.1

2 6

[PATCH 2/2] crypt32: Add support for encoding OCSP requests.
by Hans Leidekker March 4, 2022

March 4, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/encode.c | 192 ++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 85 ++++++++++++++++ 2 files changed, 277 insertions(+) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 7668d0ddb2c..a506f197be1 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4472,6 +4472,195 @@ BOOL CRYPT_AsnEncodePKCSEnvelopedData(const CRYPT_ENVELOPED_DATA *envelopedData, ARRAY_SIZE(items), 0, NULL, pvData, pcbData); } +static BOOL WINAPI CRYPT_AsnEncodeCertId(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + const OCSP_CERT_ID *id = pvStructInfo; + struct AsnEncodeSequenceItem items[] = { + { &id->HashAlgorithm, CRYPT_AsnEncodeAlgorithmIdWithNullParams, 0 }, + { &id->IssuerNameHash, CRYPT_AsnEncodeOctets, 0 }, + { &id->IssuerKeyHash, CRYPT_AsnEncodeOctets, 0 }, + { &id->SerialNumber, CRYPT_AsnEncodeInteger, 0 }, + }; + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeOCSPRequestEntry(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + const OCSP_REQUEST_ENTRY *info = pvStructInfo; + struct AsnEncodeSequenceItem items[] = { + { &info->CertId, CRYPT_AsnEncodeCertId, 0 }, + }; + + if (info->cExtension) + { + FIXME("extensions not supported\n"); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else + { + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + +struct ocsp_request_list +{ + DWORD count; + OCSP_REQUEST_ENTRY *entry; +}; + +static BOOL WINAPI CRYPT_AsnEncodeOCSPRequestEntries(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + DWORD bytesNeeded, dataLen, lenBytes, i; + const struct ocsp_request_list *list = pvStructInfo; + + ret = TRUE; + for (i = 0, dataLen = 0; ret && i < list->count; i++) + { + DWORD size; + ret = CRYPT_AsnEncodeOCSPRequestEntry(dwCertEncodingType, lpszStructType, &list->entry[i], + dwFlags, pEncodePara, NULL, &size); + if (ret) + dataLen += size; + } + if (ret) + { + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + BYTE *out; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + out = pbEncoded; + *out++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, out, &lenBytes); + out += lenBytes; + for (i = 0; i < list->count; i++) + { + DWORD size = dataLen; + + ret = CRYPT_AsnEncodeOCSPRequestEntry(dwCertEncodingType, lpszStructType, + &list->entry[i], dwFlags, pEncodePara, out, &size); + out += size; + dataLen -= size; + } + + if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pEncodePara, pbEncoded); + } + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeOCSPRequest(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + const OCSP_REQUEST_INFO *info = pvStructInfo; + + if (info->dwVersion != OCSP_REQUEST_V1) + { + FIXME("version %lu not supported\n", info->dwVersion); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else + { + if (info->cExtension) + { + FIXME("extensions not supported\n"); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else + { + struct AsnConstructedItem name; + struct AsnEncodeSequenceItem items[2]; + DWORD count = 1; + + name.tag = 1; + name.pvStructInfo = info->pRequestorName; + name.encodeFunc = CRYPT_AsnEncodeAltNameEntry; + items[0].pvStructInfo = &name; + items[0].encodeFunc = CRYPT_AsnEncodeConstructed; + + if (info->cRequestEntry) + { + items[1].pvStructInfo = &info->cRequestEntry; + items[1].encodeFunc = CRYPT_AsnEncodeOCSPRequestEntries; + count++; + } + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + count, dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, LPCSTR lpszStructType) { @@ -4612,6 +4801,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(CNG_RSA_PUBLIC_KEY_BLOB): encodeFunc = CRYPT_AsnEncodeRsaPubKey_Bcrypt; break; + case LOWORD(OCSP_REQUEST): + encodeFunc = CRYPT_AsnEncodeOCSPRequest; + break; default: FIXME("Unimplemented encoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 3ba6b2680a7..9d12223c54c 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8633,6 +8633,90 @@ static void testPortPublicKeyInfo(void) ok(ret,"CryptAcquireContextA failed\n"); } +static void test_encodeOCSPRequestInfo(DWORD dwEncoding) +{ + static const BYTE expected[] = + {0x30, 0x68, 0xa1, 0x17, 0x82, 0x15, 0x2a, 0x2e, 0x63, 0x6d, 0x2e, 0x73, 0x74, 0x65, 0x61, 0x6d, + 0x70, 0x6f, 0x77, 0x65, 0x72, 0x65, 0x64, 0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x4d, 0x30, 0x4b, 0x30, + 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0xe4, 0xe3, + 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98 ,0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, + 0xab, 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, + 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, + 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE expected2[] = + {0x30, 0x81, 0xb6, 0xa1, 0x17, 0x82, 0x15, 0x2a, 0x2e, 0x63, 0x6d, 0x2e, 0x73, 0x74, 0x65, 0x61, + 0x6d, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x65, 0x64, 0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x81, 0x9a, 0x30, + 0x4b, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, + 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, + 0x09, 0x8a, 0xab, 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, + 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, + 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08, 0x30, 0x4b, 0x30, 0x49, + 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0xe4, 0xe3, 0x95, + 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, + 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, + 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, + 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE issuer_name[] = + {0xe4, 0xe3 ,0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, + 0x09, 0x8a, 0xab, 0xd8}; + static const BYTE issuer_key[] = + {0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, + 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE serial[] = + {0x08, 0x49, 0x8f, 0x6d, 0xd9, 0xef, 0xfb, 0x40, 0x55, 0x1e, 0xac, 0x54, 0x54, 0x87, 0xc1, 0xb1}; + OCSP_REQUEST_ENTRY entry[2]; + CERT_ALT_NAME_ENTRY name; + OCSP_REQUEST_INFO info; + DWORD size; + BYTE *buf; + BOOL ret; + + memset(&entry, 0, sizeof(entry)); + entry[0].CertId.HashAlgorithm.pszObjId = (char *)szOID_OIWSEC_sha1; + entry[0].CertId.IssuerNameHash.cbData = sizeof(issuer_name); + entry[0].CertId.IssuerNameHash.pbData = (BYTE *)issuer_name; + entry[0].CertId.IssuerKeyHash.cbData = sizeof(issuer_key); + entry[0].CertId.IssuerKeyHash.pbData = (BYTE *)issuer_key; + entry[0].CertId.SerialNumber.cbData = sizeof(serial); + entry[0].CertId.SerialNumber.pbData = (BYTE *)serial; + + name.dwAltNameChoice = CERT_ALT_NAME_DNS_NAME; + name.pwszDNSName = (WCHAR *)L"*.cm.steampowered.com"; + + info.dwVersion = OCSP_REQUEST_V1; + info.pRequestorName = &name; + info.cRequestEntry = 1; + info.rgRequestEntry = entry; + info.cExtension = 0; + info.rgExtension = NULL; + + size = 0; + SetLastError(0xdeadbeef); + ret = pCryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "got %08lx\n", GetLastError()); + ok(size == sizeof(expected), "got %lu\n", size); + ok(!memcmp(buf, expected, sizeof(expected)), "unexpected value\n"); + LocalFree(buf); + + /* two entries */ + entry[1].CertId.HashAlgorithm.pszObjId = (char *)szOID_OIWSEC_sha1; + entry[1].CertId.IssuerNameHash.cbData = sizeof(issuer_name); + entry[1].CertId.IssuerNameHash.pbData = (BYTE *)issuer_name; + entry[1].CertId.IssuerKeyHash.cbData = sizeof(issuer_key); + entry[1].CertId.IssuerKeyHash.pbData = (BYTE *)issuer_key; + entry[1].CertId.SerialNumber.cbData = sizeof(serial); + entry[1].CertId.SerialNumber.pbData = (BYTE *)serial; + info.cRequestEntry = 2; + + size = 0; + SetLastError(0xdeadbeef); + ret = pCryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "got %08lx\n", GetLastError()); + ok(size == sizeof(expected2), "got %lu\n", size); + ok(!memcmp(buf, expected2, sizeof(expected2)), "unexpected value\n"); + LocalFree(buf); +} + START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, @@ -8726,6 +8810,7 @@ START_TEST(encode) test_encodeCertPolicyConstraints(encodings[i]); test_decodeCertPolicyConstraints(encodings[i]); test_decodeRsaPrivateKey(encodings[i]); + test_encodeOCSPRequestInfo(encodings[i]); } testPortPublicKeyInfo(); } -- 2.30.2

1 0

[PATCH 1/2] include: Add OCSP definitions.
by Hans Leidekker March 4, 2022

March 4, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/wincrypt.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/include/wincrypt.h b/include/wincrypt.h index 456f2f14446..f5f05c1f8d0 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -608,6 +608,97 @@ typedef struct _CERT_SIGNED_CONTENT_INFO { CRYPT_BIT_BLOB Signature; } CERT_SIGNED_CONTENT_INFO, *PCERT_SIGNED_CONTENT_INFO; +typedef struct _OCSP_SIGNATURE_INFO { + CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm; + CRYPT_BIT_BLOB Signature; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; +} OCSP_SIGNATURE_INFO, *POCSP_SIGNATURE_INFO; + +typedef struct _OCSP_SIGNED_REQUEST_INFO { + CRYPT_DER_BLOB ToBeSigned; + POCSP_SIGNATURE_INFO pOptionalSignatureInfo; +} OCSP_SIGNED_REQUEST_INFO, *POCSP_SIGNED_REQUEST_INFO; + +typedef struct _OCSP_CERT_ID { + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + CRYPT_HASH_BLOB IssuerNameHash; + CRYPT_HASH_BLOB IssuerKeyHash; + CRYPT_INTEGER_BLOB SerialNumber; +} OCSP_CERT_ID, *POCSP_CERT_ID; + +typedef struct _OCSP_REQUEST_ENTRY { + OCSP_CERT_ID CertId; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_REQUEST_ENTRY, *POCSP_REQUEST_ENTRY; + +#define OCSP_REQUEST_V1 0 + +typedef struct _OCSP_REQUEST_INFO { + DWORD dwVersion; + PCERT_ALT_NAME_ENTRY pRequestorName; + DWORD cRequestEntry; + POCSP_REQUEST_ENTRY rgRequestEntry; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_REQUEST_INFO, *POCSP_REQUEST_INFO; + +#define OCSP_SUCCESSFUL_RESPONSE 0 +#define OCSP_MALFORMED_REQUEST_RESPONSE 1 +#define OCSP_INTERNAL_ERROR_RESPONSE 2 +#define OCSP_TRY_LATER_RESPONSE 3 +#define OCSP_SIG_REQUIRED_RESPONSE 5 +#define OCSP_UNAUTHORIZED_RESPONSE 6 + +#define szOID_PKIX_OCSP_BASIC_SIGNED_RESPONSE "1.3.6.1.5.5.7.48.1.1" + +typedef struct _OCSP_RESPONSE_INFO { + DWORD dwStatus; + LPSTR pszObjId; + CRYPT_OBJID_BLOB Value; +} OCSP_RESPONSE_INFO, *POCSP_RESPONSE_INFO; + +typedef struct _OCSP_BASIC_SIGNED_RESPONSE_INFO { + CRYPT_DER_BLOB ToBeSigned; + OCSP_SIGNATURE_INFO SignatureInfo; +} OCSP_BASIC_SIGNED_RESPONSE_INFO, *POCSP_BASIC_SIGNED_RESPONSE_INFO; + +typedef struct _OCSP_BASIC_REVOKED_INFO { + FILETIME RevocationDate; + DWORD dwCrlReasonCode; +} OCSP_BASIC_REVOKED_INFO, *POCSP_BASIC_REVOKED_INFO; + +typedef struct _OCSP_BASIC_RESPONSE_ENTRY { + OCSP_CERT_ID CertId; + DWORD dwCertStatus; + union { + POCSP_BASIC_REVOKED_INFO pRevokedInfo; + } DUMMYUNIONNAME; + FILETIME ThisUpdate; + FILETIME NextUpdate; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_BASIC_RESPONSE_ENTRY, *POCSP_BASIC_RESPONSE_ENTRY; + +#define OCSP_BASIC_RESPONSE_V1 0 +#define OCSP_BASIC_BY_NAME_RESPONDER_ID 1 +#define OCSP_BASIC_BY_KEY_RESPONDER_ID 2 + +typedef struct _OCSP_BASIC_RESPONSE_INFO { + DWORD dwVersion; + DWORD dwResponderIdChoice; + union { + CERT_NAME_BLOB ByNameResponderId; + CRYPT_HASH_BLOB ByKeyResponderId; + } DUMMYUNIONNAME; + FILETIME ProducedAt; + DWORD cResponseEntry; + POCSP_BASIC_RESPONSE_ENTRY rgResponseEntry; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_BASIC_RESPONSE_INFO, *POCSP_BASIC_RESPONSE_INFO; + typedef struct _CRL_CONTEXT { DWORD dwCertEncodingType; BYTE *pbCrlEncoded; @@ -3179,6 +3270,11 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CMC_ADD_EXTENSIONS ((LPCSTR)62) #define CMC_ADD_ATTRIBUTES ((LPCSTR)63) #define X509_CERTIFICATE_TEMPLATE ((LPCSTR)64) +#define OCSP_SIGNED_REQUEST ((LPCSTR)65) +#define OCSP_REQUEST ((LPCSTR)66) +#define OCSP_RESPONSE ((LPCSTR)67) +#define OCSP_BASIC_SIGNED_RESPONSE ((LPCSTR)68) +#define OCSP_BASIC_RESPONSE ((LPCSTR)69) #define CNG_RSA_PUBLIC_KEY_BLOB ((LPCSTR)72) #define X509_OBJECT_IDENTIFIER ((LPCSTR)73) #define PKCS7_SIGNER_INFO ((LPCSTR)500) -- 2.30.2

1 0

[PATCH 1/5] mf/tests: Check the number of input samples to get a H264 stream change.
by Rémi Bernon March 4, 2022

March 4, 2022

This is not completely exact, and depending on how often ProcessInput and ProcessOutput are called the numbers may vary a bit, but this version seems to be consistent enough. We could very well ignore the checks too as GStreamer output doesn't seem to match. We check that we can at least push two input samples at a time, which matches what Call of Duty Black Ops 3 is doing, as it is not checking ProcessInput result most of the time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6462594dae2..69ad4c2e5fc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6615,6 +6615,7 @@ static void test_h264_decoder(void) MFT_OUTPUT_DATA_BUFFER output; const BYTE *h264_encoded_data; ULONG h264_encoded_data_len; + IMFAttributes *attributes; IMFMediaType *media_type; IMFTransform *transform; ULONG i, ret, flags; @@ -6632,6 +6633,14 @@ static void test_h264_decoder(void) &transform, &class_id)) goto failed; + hr = IMFTransform_GetAttributes(transform, &attributes); + todo_wine + ok(hr == S_OK, "GetAttributes returned %#x\n", hr); + if (hr != S_OK) MFCreateAttributes(&attributes, 0); + hr = IMFAttributes_SetUINT32(attributes, &MF_LOW_LATENCY, 1); + ok(hr == S_OK, "SetUINT32 returned %#x\n", hr); + IMFAttributes_Release(attributes); + /* no output type is available before an input type is set */ hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); @@ -6826,6 +6835,7 @@ static void test_h264_decoder(void) ok(!output.pEvents, "got pEvents %p\n", output.pEvents); ok(status == 0, "got status %#x\n", status); + i = 0; sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); while (1) { @@ -6844,19 +6854,26 @@ static void test_h264_decoder(void) ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %u\n", ret); - while (h264_encoded_data_len > 4) - { - hr = IMFTransform_ProcessInput(transform, 0, sample, 0); - if (FAILED(hr)) break; - ok(hr == S_OK, "ProcessInput returned %#x\n", hr); - ret = IMFSample_Release(sample); - ok(ret <= 1, "Release returned %u\n", ret); - sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); - } - ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); - EXPECT_REF(sample, 1); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret <= 1, "Release returned %u\n", ret); + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret <= 1, "Release returned %u\n", ret); + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + i++; } todo_wine + ok(i == 3, "got %u iterations\n", i); + todo_wine + ok(h264_encoded_data_len == 43479, "got h264_encoded_data_len %u\n", h264_encoded_data_len); + todo_wine ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#x\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); ok(!!output.pSample, "got pSample %p\n", output.pSample); -- 2.34.1

2 7

[PATCH v2] kernelbase: Add support for progress callback in CopyFileEx.
by Alistair Leslie-Hughes March 4, 2022

March 4, 2022

From: Michael Müller <michael(a)fds-team.de> v2: Rebase to git after long type changes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/tests/file.c | 6 --- dlls/kernelbase/file.c | 77 +++++++++++++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 77174d43d5b..4bd9f790cc0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1170,23 +1170,17 @@ static void test_CopyFileEx(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %ld\n", GetLastError()); SetLastError(0xdeadbeef); retok = CopyFileExA(source, dest, copy_progress_cb, hfile, NULL, 0); - todo_wine ok(!retok, "CopyFileExA unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %ld\n", GetLastError()); ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file was deleted\n"); hfile = CreateFileA(dest, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); - todo_wine ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %ld\n", GetLastError()); SetLastError(0xdeadbeef); retok = CopyFileExA(source, dest, copy_progress_cb, hfile, NULL, 0); - todo_wine ok(!retok, "CopyFileExA unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %ld\n", GetLastError()); - todo_wine ok(GetFileAttributesA(dest) == INVALID_FILE_ATTRIBUTES, "file was not deleted\n"); retok = CopyFileExA(source, NULL, copy_progress_cb, hfile, NULL, 0); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index c6dc904044a..b9ba1bd7c26 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -499,11 +499,16 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT { static const int buffer_size = 65536; HANDLE h1, h2; - FILE_BASIC_INFORMATION info; + FILE_NETWORK_OPEN_INFORMATION info; + FILE_BASIC_INFORMATION basic_info; IO_STATUS_BLOCK io; DWORD count; BOOL ret = FALSE; char *buffer; + LARGE_INTEGER size; + LARGE_INTEGER transferred; + DWORD cbret; + DWORD source_access = GENERIC_READ; if (!source || !dest) { @@ -518,7 +523,15 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT TRACE("%s -> %s, %lx\n", debugstr_w(source), debugstr_w(dest), flags); - if ((h1 = CreateFileW( source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + if (flags & COPY_FILE_RESTARTABLE) + FIXME("COPY_FILE_RESTARTABLE is not supported\n"); + if (flags & COPY_FILE_COPY_SYMLINK) + FIXME("COPY_FILE_COPY_SYMLINK is not supported\n"); + + if (flags & COPY_FILE_OPEN_SOURCE_FOR_WRITE) + source_access |= GENERIC_WRITE; + + if ((h1 = CreateFileW( source, source_access, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) { WARN("Unable to open source %s\n", debugstr_w(source)); @@ -526,7 +539,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT return FALSE; } - if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileBasicInformation ))) + if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileNetworkOpenInformation ))) { WARN("GetFileInformationByHandle returned error for %s\n", debugstr_w(source)); HeapFree( GetProcessHeap(), 0, buffer ); @@ -552,7 +565,11 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT } } - if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + if ((h2 = CreateFileW( dest, GENERIC_WRITE | DELETE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + (flags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS, + info.FileAttributes, h1 )) == INVALID_HANDLE_VALUE && + /* retry without DELETE if we got a sharing violation */ + (h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, (flags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS, info.FileAttributes, h1 )) == INVALID_HANDLE_VALUE) { @@ -562,6 +579,29 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT return FALSE; } + size = info.EndOfFile; + transferred.QuadPart = 0; + + if (progress) + { + cbret = progress( size, transferred, size, transferred, 1, + CALLBACK_STREAM_SWITCH, h1, h2, param ); + if (cbret == PROGRESS_QUIET) + progress = NULL; + else if (cbret == PROGRESS_STOP) + { + SetLastError( ERROR_REQUEST_ABORTED ); + goto done; + } + else if (cbret == PROGRESS_CANCEL) + { + BOOLEAN disp = TRUE; + SetFileInformationByHandle( h2, FileDispositionInfo, &disp, sizeof(disp) ); + SetLastError( ERROR_REQUEST_ABORTED ); + goto done; + } + } + while (ReadFile( h1, buffer, buffer_size, &count, NULL ) && count) { char *p = buffer; @@ -571,13 +611,38 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT if (!WriteFile( h2, p, count, &res, NULL ) || !res) goto done; p += res; count -= res; + + if (progress) + { + transferred.QuadPart += res; + cbret = progress( size, transferred, size, transferred, 1, + CALLBACK_CHUNK_FINISHED, h1, h2, param ); + if (cbret == PROGRESS_QUIET) + progress = NULL; + else if (cbret == PROGRESS_STOP) + { + SetLastError( ERROR_REQUEST_ABORTED ); + goto done; + } + else if (cbret == PROGRESS_CANCEL) + { + BOOLEAN disp = TRUE; + SetFileInformationByHandle( h2, FileDispositionInfo, &disp, sizeof(disp) ); + SetLastError( ERROR_REQUEST_ABORTED ); + goto done; + } + } } } ret = TRUE; done: /* Maintain the timestamp of source file to destination file */ - info.FileAttributes = 0; - NtSetInformationFile( h2, &io, &info, sizeof(info), FileBasicInformation ); + basic_info.CreationTime = info.CreationTime; + basic_info.LastAccessTime = info.LastAccessTime; + basic_info.LastWriteTime = info.LastWriteTime; + basic_info.ChangeTime = info.ChangeTime; + basic_info.FileAttributes = 0; + NtSetInformationFile( h2, &io, &basic_info, sizeof(basic_info), FileBasicInformation ); HeapFree( GetProcessHeap(), 0, buffer ); CloseHandle( h1 ); CloseHandle( h2 ); -- 2.34.1

2 1

[PATCH 1/4] windows.gaming.input: Add an internal WineGameControllerProvider runtimeclass.
by Rémi Bernon March 4, 2022

March 4, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This introduces a new background thread, although I still don't have a good way to shut it down. For now the thread holds a module reference and stays alive until process shutdown. dlls/windows.gaming.input/Makefile.in | 3 +- dlls/windows.gaming.input/provider.idl | 55 ++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 dlls/windows.gaming.input/provider.idl diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index d7f93283bec..46470ac045b 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -8,4 +8,5 @@ C_SRCS = \ manager.c \ vector.c -IDL_SRCS = classes.idl +IDL_SRCS = classes.idl \ + provider.idl diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl new file mode 100644 index 00000000000..dc67a94acaa --- /dev/null +++ b/dlls/windows.gaming.input/provider.idl @@ -0,0 +1,55 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep header + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.gaming.input.idl"; +import "windows.gaming.input.custom.idl"; + +namespace Windows.Gaming.Input.Custom { + interface IWineGameControllerProvider; + runtimeclass WineGameControllerProvider; + + [ + exclusiveto(Windows.Gaming.Input.Custom.WineGameControllerProvider), + uuid(8967b6ef-a4de-4b9a-984a-9f920b4d1b26) + ] + interface IWineGameControllerProvider : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerProvider + { + } + + [ + marshaling_behavior(agile), + threading(both) + ] + runtimeclass WineGameControllerProvider + { + [default] interface Windows.Gaming.Input.Custom.IWineGameControllerProvider; + interface Windows.Gaming.Input.Custom.IGameControllerProvider; + } +} -- 2.34.1

1 3

[PATCH 2/2] widl: Support basic BYTE type
by Alistair Leslie-Hughes March 4, 2022

March 4, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- tools/widl/typetree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index dc4db35e835..800ddf77219 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -226,12 +226,14 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t case TYPE_BASIC_DOUBLE: n += strappend(buf, len, pos + n, "f8"); return n; + case TYPE_BASIC_BYTE: + n += strappend(buf, len, pos + n, "u1"); + return n; case TYPE_BASIC_INT16: case TYPE_BASIC_INT3264: case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: - case TYPE_BASIC_BYTE: case TYPE_BASIC_WCHAR: case TYPE_BASIC_ERROR_STATUS_T: case TYPE_BASIC_HANDLE: -- 2.34.1

2 1

[PATCH 1/2] include: Correct BYTE typedef
by Alistair Leslie-Hughes March 4, 2022

March 4, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/wtypes.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wtypes.idl b/include/wtypes.idl index 754258839d7..5a09ed717cb 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -33,7 +33,7 @@ interface IWinTypes /******************** BASIC WIN32 TYPES ********************/ cpp_quote("#if 0 /* winnt.h */") /* don't redefine these */ -typedef unsigned char BYTE; +typedef byte BYTE; typedef unsigned short WORD; typedef unsigned long DWORD; typedef long BOOL; -- 2.34.1

2 1

[v2 PATCH 1/2] mfplat/tests: Use correct integral type.
by Nikolay Sivov March 4, 2022

March 4, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 91c9d971a3b..14d05d7c1be 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1154,8 +1154,9 @@ static void test_media_type(void) IMFMediaType *mediatype, *mediatype2; IMFVideoMediaType *video_type; IUnknown *unk, *unk2; - DWORD count, flags; BOOL compressed; + DWORD flags; + UINT count; HRESULT hr; GUID guid; @@ -1956,10 +1957,11 @@ static void test_MFCreateMFByteStreamOnStream(void) IMFByteStream *bytestream2; IStream *stream; IMFAttributes *attributes = NULL; - DWORD caps, written, count; + DWORD caps, written; IUnknown *unknown; ULONG ref, size; HRESULT hr; + UINT count; if(!pMFCreateMFByteStreamOnStream) { @@ -2061,10 +2063,11 @@ static void test_file_stream(void) IMFAttributes *attributes = NULL; MF_ATTRIBUTE_TYPE item_type; WCHAR pathW[MAX_PATH]; - DWORD caps, count; WCHAR *filename; HRESULT hr; WCHAR *str; + DWORD caps; + UINT count; BOOL eos; filename = load_resource(L"test.mp4"); @@ -4234,6 +4237,7 @@ image_size_tests[] = static void test_MFCalculateImageSize(void) { + DWORD plane_size; unsigned int i; UINT32 size; HRESULT hr; @@ -4258,11 +4262,11 @@ static void test_MFCalculateImageSize(void) if (pMFGetPlaneSize) { - unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; + unsigned int expected = ptr->plane_size ? ptr->plane_size : ptr->size; - hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); + hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &plane_size); ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); - ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); + ok(plane_size == expected, "%u: unexpected plane size %u, expected %u.\n", i, plane_size, expected); } } } @@ -4270,7 +4274,7 @@ static void test_MFCalculateImageSize(void) static void test_MFGetPlaneSize(void) { unsigned int i; - UINT32 size; + DWORD size; HRESULT hr; if (!pMFGetPlaneSize) @@ -5685,12 +5689,13 @@ static void test_MFCreate2DMediaBuffer(void) { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, { 4, 1, D3DFMT_A8R8G8B8, 16, 64 }, }; - unsigned int max_length, length, length2; + DWORD max_length, length, length2; BYTE *buffer_start, *data, *data2; - int i, j, k, pitch, pitch2, stride; + LONG pitch, pitch2, stride; IMF2DBuffer2 *_2dbuffer2; IMF2DBuffer *_2dbuffer; IMFMediaBuffer *buffer; + int i, j, k; HRESULT hr; BOOL ret; @@ -5986,7 +5991,7 @@ static void test_MFCreateMediaBufferFromMediaType(void) { 2, 0, 0, 4, 16, 52 }, }; IMFMediaBuffer *buffer; - UINT32 length; + DWORD length; HRESULT hr; IMFMediaType *media_type; unsigned int i; @@ -7094,11 +7099,11 @@ static void test_sample_allocator_sysmem(void) IMFVideoSampleAllocatorCallback *allocator_cb; IMFVideoSampleAllocatorEx *allocatorex; IMFVideoSampleAllocator *allocator; - unsigned int buffer_count; IMFSample *sample, *sample2; IMFAttributes *attributes; IMFMediaBuffer *buffer; LONG refcount, count; + DWORD buffer_count; IUnknown *unk; HRESULT hr; -- 2.34.1

2 3