March 2022 - Wine-devel - list.winehq.org

[PATCH 2/2] widl: Support basic BYTE type
by Alistair Leslie-Hughes 04 Mar '22

04 Mar '22

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 04 Mar '22

04 Mar '22

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 04 Mar '22

04 Mar '22

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

[PATCH v2] bcrypt: Add support for PUBLICKEY blob types.
by Hans Leidekker 04 Mar '22

04 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v2: Avoid copying key type. Add DSA public key support. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 28 ++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 16 ++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9fb9b6adf87..0fb78ce39a5 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1775,6 +1775,34 @@ NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HAN return STATUS_NOT_IMPLEMENTED; } + if (!wcscmp( type, BCRYPT_PUBLIC_KEY_BLOB )) + { + BCRYPT_KEY_BLOB *key_blob = (BCRYPT_KEY_BLOB *)input; + + if (input_len < sizeof(*key_blob)) return STATUS_INVALID_PARAMETER; + + switch (key_blob->Magic) + { + case BCRYPT_ECDH_PUBLIC_P256_MAGIC: + case BCRYPT_ECDSA_PUBLIC_P256_MAGIC: + case BCRYPT_ECDSA_PUBLIC_P384_MAGIC: + type = BCRYPT_ECCPUBLIC_BLOB; + break; + + case BCRYPT_RSAPUBLIC_MAGIC: + type = BCRYPT_RSAPUBLIC_BLOB; + break; + + case BCRYPT_DSA_PUBLIC_MAGIC: + type = BCRYPT_DSA_PUBLIC_BLOB; + break; + + default: + FIXME( "unsupported key magic %#lx\n", key_blob->Magic ); + return STATUS_NOT_SUPPORTED; + } + } + return key_import_pair( alg, type, ret_key, input, input_len ); } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1588b72c3fd..5fb29a0e0ff 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1845,6 +1845,10 @@ static void test_ECDSA(void) ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; + status = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, buffer, size, 0); + ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + BCryptDestroyKey(key); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); @@ -2015,6 +2019,10 @@ static void test_RSA(void) ok(schemes, "schemes not set\n"); ok(size == sizeof(schemes), "got %lu\n", size); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); + BCryptDestroyKey(key); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); @@ -2341,6 +2349,10 @@ static void test_ECDH(void) ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); ok(size == sizeof(*ecckey) + ecckey->cbKey * 2, "got %lu\n", size); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &pubkey, buf, size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + BCryptDestroyKey(pubkey); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &pubkey, buf, size, 0); ok(status == STATUS_SUCCESS, "got %#lx\n", status); HeapFree(GetProcessHeap(), 0, buf); @@ -2842,6 +2854,10 @@ static void test_DSA(void) ret = BCryptGetProperty(alg, L"PaddingSchemes", (UCHAR *)&schemes, sizeof(schemes), &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, dsaPublicBlob, sizeof(dsaPublicBlob), 0); + ok(!ret, "got %#lx\n", ret); + BCryptDestroyKey(key); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_DSA_PUBLIC_BLOB, &key, dsaPublicBlob, sizeof(dsaPublicBlob), 0); ok(!ret, "got %#lx\n", ret); -- 2.30.2

1 0

[PATCH v2 1/3] winegstreamer: Implement WMA decoder Process(Input|Output) error checks.
by Rémi Bernon 04 Mar '22

04 Mar '22

Checking that WMA decoder ignores any incorrectly sized input sample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Try to make the output buffer length test more resilient to FFmpeg variations. dlls/mf/tests/mf.c | 23 +++++++++++++--------- dlls/winegstreamer/wma_decoder.c | 33 ++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e61442bb512..0ab46445d9a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6031,6 +6031,7 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; MFT_OUTPUT_STREAM_INFO output_info; + MFT_OUTPUT_DATA_BUFFER outputs[2]; MFT_INPUT_STREAM_INFO input_info; MFT_OUTPUT_DATA_BUFFER output; const BYTE *wma_encoded_data; @@ -6208,7 +6209,7 @@ static void test_wma_decoder(void) ok(hr == S_OK, "ProcessInput returned %#x\n", hr); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %u\n", ret); - sample = create_sample(wma_encoded_data + wma_block_size, wma_block_size - wma_block_size / 2); + sample = create_sample(wma_encoded_data, wma_block_size + 1); hr = IMFTransform_ProcessInput(transform, 0, sample, 0); todo_wine ok(hr == S_OK, "ProcessInput returned %#x\n", hr); @@ -6231,16 +6232,13 @@ static void test_wma_decoder(void) status = 0xdeadbeef; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); ok(!output.pSample, "got pSample %p\n", output.pSample); - todo_wine ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, "got dwStatus %#x\n", output.dwStatus); ok(!output.pEvents, "got pEvents %p\n", output.pEvents); - todo_wine ok(status == 0, "got status %#x\n", status); sample = create_sample(wma_encoded_data, wma_block_size); @@ -6253,16 +6251,25 @@ static void test_wma_decoder(void) status = 0xdeadbeef; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); ok(!output.pSample, "got pSample %p\n", output.pSample); - todo_wine ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, "got dwStatus %#x\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#x\n", status); + status = 0xdeadbeef; + memset(&output, 0, sizeof(output)); + output_info.cbSize = sizeof(wma_decoded_data); + sample = create_sample(NULL, output_info.cbSize); + outputs[0].pSample = sample; + sample = create_sample(NULL, output_info.cbSize); + outputs[1].pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 2, outputs, &status); + ok(hr == E_INVALIDARG, "ProcessOutput returned %#x\n", hr); + IMFSample_Release(outputs[0].pSample); + IMFSample_Release(outputs[1].pSample); + i = 1; status = 0xdeadbeef; output_info.cbSize = sizeof(wma_decoded_data); @@ -6333,7 +6340,6 @@ static void test_wma_decoder(void) ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); ok(output.pSample == sample, "got pSample %p\n", output.pSample); ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#x\n", status); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %u\n", ret); @@ -6349,7 +6355,6 @@ static void test_wma_decoder(void) ok(output.dwStatus == 0 || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7)) /* Win7 */, "got dwStatus %#x\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#x\n", status); check_sample(sample, NULL, 0, NULL); ret = IMFSample_Release(sample); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 6c198706944..a35da1cdc70 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -520,14 +520,47 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MFT_INPUT_STREAM_INFO info; + HRESULT hr; + FIXME("iface %p, id %lu, sample %p, flags %#lx stub!\n", iface, id, sample, flags); + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) + return hr; + return E_NOTIMPL; } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MFT_OUTPUT_STREAM_INFO info; + HRESULT hr; + FIXME("iface %p, flags %#lx, count %lu, samples %p, status %p stub!\n", iface, flags, count, samples, status); + + if (count > 1) + return E_INVALIDARG; + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(iface, 0, &info))) + return hr; + + *status = 0; + samples[0].dwStatus = 0; + if (!samples[0].pSample) + { + samples[0].dwStatus = MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE; + return MF_E_TRANSFORM_NEED_MORE_INPUT; + } + return E_NOTIMPL; } -- 2.34.1

2 4

[PATCH v2] bcrypt: Add support for PUBLICKEY blob types.
by Santino Mazza 04 Mar '22

04 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/bcrypt/bcrypt_main.c | 398 ++++++++++++++++++++++--------------- dlls/bcrypt/tests/bcrypt.c | 12 ++ 2 files changed, 255 insertions(+), 155 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9fb9b6adf87..2ef67bc3024 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1318,207 +1318,295 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu return status; } -static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, - ULONG input_len ) +static NTSTATUS key_import_ecc_public( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) { - struct key_import_params params; - struct key *key; - NTSTATUS status; + BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; + DWORD key_size, magic; ULONG size; - if (!wcscmp( type, BCRYPT_ECCPUBLIC_BLOB )) + if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; + + switch (alg->id) { - BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; - DWORD key_size, magic; + case ALG_ID_ECDH_P256: + key_size = 32; + magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + break; - if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + break; - switch (alg->id) - { - case ALG_ID_ECDH_P256: - key_size = 32; - magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; - break; + case ALG_ID_ECDSA_P384: + key_size = 48; + magic = BCRYPT_ECDSA_PUBLIC_P384_MAGIC; + break; - case ALG_ID_ECDSA_P256: - key_size = 32; - magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; - break; + default: + FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(BCRYPT_ECCPUBLIC_BLOB) ); + return STATUS_NOT_SUPPORTED; + } - case ALG_ID_ECDSA_P384: - key_size = 48; - magic = BCRYPT_ECDSA_PUBLIC_P384_MAGIC; - break; + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; + if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) + return STATUS_INVALID_PARAMETER; - default: - FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); - return STATUS_NOT_SUPPORTED; - } + size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; + return key_asymmetric_create( (struct key **)ret_key, alg, key_size * 8, (BYTE *)ecc_blob, size ); +} - if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; - if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) - return STATUS_INVALID_PARAMETER; +static NTSTATUS key_import_ecc_private( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + struct key_import_params params; + struct key *key; + BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; + DWORD key_size, magic; + NTSTATUS status; + DWORD size; + + if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; + + switch (alg->id) + { + case ALG_ID_ECDH_P256: + key_size = 32; + magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; + break; + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + break; - size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; - return key_asymmetric_create( (struct key **)ret_key, alg, key_size * 8, (BYTE *)ecc_blob, size ); + default: + FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(BCRYPT_ECCPUBLIC_BLOB) ); + return STATUS_NOT_SUPPORTED; } - else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) + + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; + if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 3) + return STATUS_INVALID_PARAMETER; + + size = sizeof(*ecc_blob) + key_size * 2; + if ((status = key_asymmetric_create( &key, alg, key_size * 8, NULL, size ))) return status; + + params.key = key; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_import_ecc, &params ))) { - BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; - DWORD key_size, magic; + BCryptDestroyKey( key ); + return status; + } - if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; + *ret_key = key; + return STATUS_SUCCESS; +} - switch (alg->id) - { - case ALG_ID_ECDH_P256: - key_size = 32; - magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; - break; - case ALG_ID_ECDSA_P256: - key_size = 32; - magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; - break; +static NTSTATUS key_import_rsa_public( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; + DWORD size; - default: - FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); - return STATUS_NOT_SUPPORTED; - } + if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; + if ((alg->id != ALG_ID_RSA && alg->id != ALG_ID_RSA_SIGN) || rsa_blob->Magic != BCRYPT_RSAPUBLIC_MAGIC) + return STATUS_NOT_SUPPORTED; - if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; - if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 3) - return STATUS_INVALID_PARAMETER; + size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; + return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); +} - size = sizeof(*ecc_blob) + key_size * 2; - if ((status = key_asymmetric_create( &key, alg, key_size * 8, NULL, size ))) return status; +static NTSTATUS key_import_rsa_private( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; + struct key_import_params params; + struct key *key; + NTSTATUS status; + DWORD size; - params.key = key; - params.buf = input; - params.len = input_len; - if ((status = UNIX_CALL( key_import_ecc, &params ))) - { - BCryptDestroyKey( key ); - return status; - } + if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; + if (alg->id != ALG_ID_RSA || (rsa_blob->Magic != BCRYPT_RSAPRIVATE_MAGIC && + rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED; - *ret_key = key; - return STATUS_SUCCESS; - } - else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB )) + size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; + if ((status = key_asymmetric_create( &key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) + return status; + params.key = key; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_import_rsa, &params ))) { - BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; + BCryptDestroyKey( key ); + return status; + } - if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; - if ((alg->id != ALG_ID_RSA && alg->id != ALG_ID_RSA_SIGN) || rsa_blob->Magic != BCRYPT_RSAPUBLIC_MAGIC) - return STATUS_NOT_SUPPORTED; + *ret_key = key; + return STATUS_SUCCESS; +} - size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); - } - else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) - { - BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; +static NTSTATUS key_import_dsa_public( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + BCRYPT_DSA_KEY_BLOB *dsa_blob = (BCRYPT_DSA_KEY_BLOB *)input; + DWORD size; - if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; - if (alg->id != ALG_ID_RSA || (rsa_blob->Magic != BCRYPT_RSAPRIVATE_MAGIC && - rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED; + if (input_len < sizeof(*dsa_blob)) return STATUS_INVALID_PARAMETER; + if ((alg->id != ALG_ID_DSA) || dsa_blob->dwMagic != BCRYPT_DSA_PUBLIC_MAGIC) + return STATUS_NOT_SUPPORTED; - size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - if ((status = key_asymmetric_create( &key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) - return status; - params.key = key; - params.buf = input; - params.len = input_len; - if ((status = UNIX_CALL( key_import_rsa, &params ))) - { - BCryptDestroyKey( key ); - return status; - } + size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; + return key_asymmetric_create( (struct key **)ret_key, alg, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); +} - *ret_key = key; - return STATUS_SUCCESS; - } - else if (!wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB )) - { - BCRYPT_DSA_KEY_BLOB *dsa_blob = (BCRYPT_DSA_KEY_BLOB *)input; +static NTSTATUS key_import_legacy_dsa_v2_public( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + BLOBHEADER *hdr = (BLOBHEADER *)input; + DSSPUBKEY *pubkey; + struct key_import_params params; + struct key *key; + DWORD size; + NTSTATUS status; - if (input_len < sizeof(*dsa_blob)) return STATUS_INVALID_PARAMETER; - if ((alg->id != ALG_ID_DSA) || dsa_blob->dwMagic != BCRYPT_DSA_PUBLIC_MAGIC) - return STATUS_NOT_SUPPORTED; + if (alg->id != ALG_ID_DSA) return STATUS_NOT_SUPPORTED; + if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; - size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; - return key_asymmetric_create( (struct key **)ret_key, alg, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); - } - else if (!wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB )) + if (hdr->bType != PUBLICKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) { - BLOBHEADER *hdr = (BLOBHEADER *)input; - DSSPUBKEY *pubkey; + FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); + return STATUS_NOT_SUPPORTED; + } - if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; + if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; + pubkey = (DSSPUBKEY *)(hdr + 1); + if (pubkey->magic != MAGIC_DSS1) return STATUS_NOT_SUPPORTED; - if (hdr->bType != PRIVATEKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) - { - FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); - return STATUS_NOT_SUPPORTED; - } - if (alg->id != ALG_ID_DSA) - { - FIXME( "algorithm %u does not support importing blob of type %s\n", alg->id, debugstr_w(type) ); - return STATUS_NOT_SUPPORTED; - } + size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); + if (input_len < size) return STATUS_INVALID_PARAMETER; - if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; - pubkey = (DSSPUBKEY *)(hdr + 1); - if (pubkey->magic != MAGIC_DSS2) return STATUS_NOT_SUPPORTED; + if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status; + key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; - if (input_len < sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 2 + 40 + sizeof(DSSSEED)) - return STATUS_INVALID_PARAMETER; + *ret_key = key; + return STATUS_SUCCESS; +} - size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); - if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, NULL, size ))) return status; +static NTSTATUS key_import_legacy_dsa_v2_private( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + BLOBHEADER *hdr = (BLOBHEADER *)input; + DSSPUBKEY *pubkey; + struct key_import_params params; + struct key *key; + NTSTATUS status; + DWORD size; - params.key = key; - params.buf = input; - params.len = input_len; - if ((status = UNIX_CALL( key_import_dsa_capi, &params ))) - { - BCryptDestroyKey( key ); - return status; - } + if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; - *ret_key = key; - return STATUS_SUCCESS; + if (hdr->bType != PRIVATEKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) + { + FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); + return STATUS_NOT_SUPPORTED; } - else if (!wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB )) /* not supported on native */ + if (alg->id != ALG_ID_DSA) { - BLOBHEADER *hdr = (BLOBHEADER *)input; - DSSPUBKEY *pubkey; + FIXME( "algorithm %u does not support importing blob of type %s\n", alg->id, debugstr_w(LEGACY_DSA_V2_PRIVATE_BLOB) ); + return STATUS_NOT_SUPPORTED; + } - if (alg->id != ALG_ID_DSA) return STATUS_NOT_SUPPORTED; - if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; + if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; + pubkey = (DSSPUBKEY *)(hdr + 1); + if (pubkey->magic != MAGIC_DSS2) return STATUS_NOT_SUPPORTED; - if (hdr->bType != PUBLICKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) - { - FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); - return STATUS_NOT_SUPPORTED; - } + if (input_len < sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 2 + 40 + sizeof(DSSSEED)) + return STATUS_INVALID_PARAMETER; + + size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); + if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, NULL, size ))) return status; - if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; - pubkey = (DSSPUBKEY *)(hdr + 1); - if (pubkey->magic != MAGIC_DSS1) return STATUS_NOT_SUPPORTED; + params.key = key; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_import_dsa_capi, &params ))) + { + BCryptDestroyKey( key ); + return status; + } - size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); - if (input_len < size) return STATUS_INVALID_PARAMETER; + *ret_key = key; + return STATUS_SUCCESS; +} - if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status; - key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; +static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + WCHAR *final_type = type; + NTSTATUS status; - *ret_key = key; - return STATUS_SUCCESS; + if (!wcscmp( type, BCRYPT_PUBLIC_KEY_BLOB )) + { + DWORD magic = *(DWORD *)input; + switch(magic) + { + case BCRYPT_ECDH_PUBLIC_P256_MAGIC: + case BCRYPT_ECDSA_PUBLIC_P256_MAGIC: + case BCRYPT_ECDSA_PUBLIC_P384_MAGIC: + final_type = malloc( sizeof(BCRYPT_ECCPUBLIC_BLOB) ); + wcscpy( final_type, BCRYPT_ECCPUBLIC_BLOB ); + break; + case BCRYPT_RSAPUBLIC_MAGIC: + final_type = malloc( sizeof(BCRYPT_RSAPUBLIC_BLOB) ); + wcscpy( final_type, BCRYPT_RSAPUBLIC_BLOB ); + break; + default: + { + FIXME( "Unsupported key magic %#lx\n", magic ); + return STATUS_NOT_SUPPORTED; + } + } } - FIXME( "unsupported key type %s\n", debugstr_w(type) ); - return STATUS_NOT_SUPPORTED; + if (!wcscmp( final_type, BCRYPT_ECCPUBLIC_BLOB )) + { + status = key_import_ecc_public( alg, ret_key, input, input_len ); + } + else if (!wcscmp( final_type, BCRYPT_ECCPRIVATE_BLOB )) + { + status = key_import_ecc_private( alg, ret_key, input, input_len ); + } + else if (!wcscmp( final_type, BCRYPT_RSAPUBLIC_BLOB )) + { + status = key_import_rsa_public(alg, ret_key, input, input_len); + } + else if (!wcscmp( final_type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) + { + status = key_import_rsa_private( alg, ret_key, input, input_len ); + } + else if (!wcscmp( final_type, BCRYPT_DSA_PUBLIC_BLOB )) + { + status = key_import_dsa_public( alg, ret_key, input, input_len ); + } + else if (!wcscmp( final_type, LEGACY_DSA_V2_PRIVATE_BLOB )) + { + status = key_import_legacy_dsa_v2_private( alg, ret_key, input, input_len ); + } + else if (!wcscmp( final_type, LEGACY_DSA_V2_PUBLIC_BLOB )) /* not supported on native */ + { + status = key_import_legacy_dsa_v2_public( alg, ret_key, input, input_len ); + } + else + { + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_SUPPORTED; + } + + if (!wcscmp( type, BCRYPT_PUBLIC_KEY_BLOB )) free(final_type); + + return status; } static ULONG get_block_size( struct algorithm *alg ) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e7619897cfd..6fc4097492b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1845,6 +1845,10 @@ static void test_ECDSA(void) ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; + status = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, buffer, size, 0); + ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + BCryptDestroyKey(key); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); @@ -1997,6 +2001,10 @@ static void test_RSA(void) ok(schemes, "schemes not set\n"); ok(size == sizeof(schemes), "got %lu\n", size); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); + BCryptDestroyKey(key); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); @@ -2317,6 +2325,10 @@ static void test_ECDH(void) ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); ok(size == sizeof(*ecckey) + ecckey->cbKey * 2, "got %lu\n", size); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &pubkey, buf, size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + BCryptDestroyKey(pubkey); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &pubkey, buf, size, 0); ok(status == STATUS_SUCCESS, "got %#lx\n", status); HeapFree(GetProcessHeap(), 0, buf); -- 2.32.0

1 0

[PATCH 1/4] makedep: Do not forbid importing system headers in msvcrt modules.
by Zebediah Figura 04 Mar '22

04 Mar '22

The apparent intention of catching mistakes early is laudable. However, the number of exceptions both in the code and not in the code (in particular, valgrind.h) shows that this is clearly getting in the way more often than not. In practice an attempt to compile with a system API we don't support will be met with a clear error at link time, e.g.: /usr/bin/x86_64-w64-mingw32-ld: dlls/xmllite/reader.cross.o: in function `debugstr_nodetype': /home/whatsit/git/wine64/../wine/dlls/xmllite/reader.c:116: undefined reference to `pthread_once' And when there is no external function involved (as with stdarg.h, x86intrin.h, valgrind.h), there's no reason to prevent use of the headers. The motivation for this patch is the ability to import system vkd3d.h in e.g. d3d12 and dxgi, which do not link to libvkd3d directly (but rather indirectly through wined3d) and so do not fall under the has_external_import() exception. I could see no simple way to adapt has_external_import() to account for this case. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Am I missing some other point of doing this? I'm fully willing to retract this patch if so, but I still don't see a good way to deal with the aforementioned problem. tools/makedep.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 25277efd7bb..cc988e2aee7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1359,22 +1359,6 @@ static struct makefile *find_importlib_module( const char *name ) } -/******************************************************************* - * has_external_import - */ -static int has_external_import( const struct makefile *make ) -{ - unsigned int i; - - for (i = 0; i < make->imports.count; i++) - { - if (!strncmp( make->imports.str[i], "-l", 2 )) - return 1; - } - return 0; -} - - /******************************************************************* * open_include_file */ @@ -1452,17 +1436,6 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; } - if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt && - !make->extlib && !pFile->included_by->is_external) - { - if (!strcmp( pFile->name, "stdarg.h" )) return NULL; - if (!strcmp( pFile->name, "x86intrin.h" )) return NULL; - if (has_external_import( make )) return NULL; - fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", - pFile->included_by->file->name, pFile->included_line, pFile->name ); - exit(1); - } - if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ /* try in src file directory */ -- 2.35.1

1 3

[PATCH 1/6] bcrypt: Add support for PUBLICKEY blob types.
by Santino Mazza 04 Mar '22

04 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.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 9fb9b6adf87..73071d70992 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1404,7 +1404,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP *ret_key = key; return STATUS_SUCCESS; } - else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB )) + else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_PUBLIC_KEY_BLOB )) { BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; -- 2.32.0

2 17

[PATCH 1/2] kernel32/tests: Add additional Get/SetThreadDescription() tests.
by Brendan Shanks 03 Mar '22

03 Mar '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/kernel32/tests/thread.c | 95 ++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 6ccf7af85f8..bcdda77c553 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -100,6 +100,8 @@ static BOOL (WINAPI *pSetThreadGroupAffinity)(HANDLE,const GROUP_AFFINITY*,GROUP static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *); static HRESULT (WINAPI *pGetThreadDescription)(HANDLE,WCHAR **); +static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG,PVECTORED_EXCEPTION_HANDLER); +static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static HANDLE create_target_process(const char *arg) { @@ -2351,6 +2353,23 @@ static void test_thread_info(void) CloseHandle(thread); } +typedef struct tagTHREADNAME_INFO +{ + DWORD dwType; /* Must be 0x1000. */ + LPCSTR szName; /* Pointer to name (in user addr space). */ + DWORD dwThreadID; /* Thread ID (-1 = caller thread). */ + DWORD dwFlags; /* Reserved for future use, must be zero. */ +} THREADNAME_INFO; + +static LONG CALLBACK msvc_threadname_vec_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + if (ExceptionInfo->ExceptionRecord != NULL && + ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_WINE_NAME_THREAD) + return EXCEPTION_CONTINUE_EXECUTION; + + return EXCEPTION_CONTINUE_SEARCH; +} + static void test_thread_description(void) { THREAD_NAME_INFORMATION *thread_desc; @@ -2360,6 +2379,9 @@ static void test_thread_description(void) char buff[128]; WCHAR *ptr; HRESULT hr; + HANDLE thread; + PVOID vectored_handler; + THREADNAME_INFO info; if (!pGetThreadDescription) { @@ -2463,6 +2485,24 @@ static void test_thread_description(void) ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); LocalFree(ptr); + /* Set with a string from RtlInitUnicodeString. */ + hr = pSetThreadDescription(GetCurrentThread(), L"123"); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + lstrcpyW((WCHAR *)(thread_desc + 1), L"desc"); + RtlInitUnicodeString(&thread_desc->ThreadName, (WCHAR *)(thread_desc + 1)); + + status = pNtSetInformationThread(GetCurrentThread(), ThreadNameInformation, thread_desc, sizeof(*thread_desc)); + todo_wine + ok(status == STATUS_SUCCESS, "Failed to set thread description, status %#x.\n", status); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + todo_wine + ok(!lstrcmpW(ptr, L"desc"), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + /* Set with 0 length/NULL pointer. */ hr = pSetThreadDescription(GetCurrentThread(), L"123"); ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); @@ -2476,6 +2516,59 @@ static void test_thread_description(void) ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); LocalFree(ptr); + + /* Get with only THREAD_QUERY_LIMITED_INFORMATION access. */ + thread = OpenThread(THREAD_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + + ptr = NULL; + hr = pGetThreadDescription(thread, &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + len = 0; + status = pNtQueryInformationThread(thread, ThreadNameInformation, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); + + CloseHandle(thread); + + /* Set with only THREAD_SET_LIMITED_INFORMATION access. */ + thread = OpenThread(THREAD_SET_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + + hr = pSetThreadDescription(thread, desc); + todo_wine + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + todo_wine + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + CloseHandle(thread); + + /* The old exception-based thread name method should not affect GetThreadDescription. */ + hr = pSetThreadDescription(GetCurrentThread(), desc); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + vectored_handler = pRtlAddVectoredExceptionHandler(FALSE, &msvc_threadname_vec_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + info.dwType = 0x1000; + info.szName = "123"; + info.dwThreadID = -1; + info.dwFlags = 0; + RaiseException(EXCEPTION_WINE_NAME_THREAD, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)&info); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); } static void init_funcs(void) @@ -2524,6 +2617,8 @@ static void init_funcs(void) X(NtQueryInformationThread); X(RtlGetThreadErrorMode); X(NtSetInformationThread); + X(RtlAddVectoredExceptionHandler); + X(RtlRemoveVectoredExceptionHandler); } #undef X } -- 2.34.1

1 1

[PATCH] winepulse: Move "last_time" to a local variable.
by Huw Davies 03 Mar '22

03 Mar '22

It's unused outside of pulse_timer_loop(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 6552e4ce250..901e054f6d0 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -65,7 +65,7 @@ struct pulse_stream BYTE *local_buffer, *tmp_buffer, *peek_buffer; void *locked_ptr; BOOL please_quit, just_started, just_underran; - pa_usec_t last_time, mmdev_period_usec; + pa_usec_t mmdev_period_usec; INT64 clock_lastpos, clock_written; @@ -1409,13 +1409,14 @@ static NTSTATUS pulse_timer_loop(void *args) struct timer_loop_params *params = args; struct pulse_stream *stream = params->stream; LARGE_INTEGER delay; + pa_usec_t last_time; UINT32 adv_bytes; int success; pa_operation *o; pulse_lock(); delay.QuadPart = -stream->mmdev_period_usec * 10; - pa_stream_get_time(stream->stream, &stream->last_time); + pa_stream_get_time(stream->stream, &last_time); pulse_unlock(); while (!stream->please_quit) @@ -1439,31 +1440,31 @@ static NTSTATUS pulse_timer_loop(void *args) err = pa_stream_get_time(stream->stream, &now); if (err == 0) { - TRACE("got now: %s, last time: %s\n", wine_dbgstr_longlong(now), wine_dbgstr_longlong(stream->last_time)); + TRACE("got now: %s, last time: %s\n", wine_dbgstr_longlong(now), wine_dbgstr_longlong(last_time)); if (stream->started && (stream->dataflow == eCapture || stream->held_bytes)) { if(stream->just_underran) { - stream->last_time = now; + last_time = now; stream->just_started = TRUE; } if (stream->just_started) { /* let it play out a period to absorb some latency and get accurate timing */ - pa_usec_t diff = now - stream->last_time; + pa_usec_t diff = now - last_time; if (diff > stream->mmdev_period_usec) { stream->just_started = FALSE; - stream->last_time = now; + last_time = now; } } else { - INT32 adjust = stream->last_time + stream->mmdev_period_usec - now; + INT32 adjust = last_time + stream->mmdev_period_usec - now; - adv_usec = now - stream->last_time; + adv_usec = now - last_time; if(adjust > ((INT32)(stream->mmdev_period_usec / 2))) adjust = stream->mmdev_period_usec / 2; @@ -1472,7 +1473,7 @@ static NTSTATUS pulse_timer_loop(void *args) delay.QuadPart = -(stream->mmdev_period_usec + adjust) * 10; - stream->last_time += stream->mmdev_period_usec; + last_time += stream->mmdev_period_usec; } if (stream->dataflow == eRender) @@ -1492,7 +1493,7 @@ static NTSTATUS pulse_timer_loop(void *args) } else { - stream->last_time = now; + last_time = now; delay.QuadPart = -stream->mmdev_period_usec * 10; } } -- 2.25.1

2 1