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

Eric Pouech : sapi/tests: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 0b3c158cb8cdb2cc4f7a3b5095ce72522cac86f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b3c158cb8cdb2cc4f7a3b50… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:28 2022 +0100 sapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/Makefile.in | 1 - dlls/sapi/tests/automation.c | 10 ++--- dlls/sapi/tests/resource.c | 8 ++-- dlls/sapi/tests/stream.c | 8 ++-- dlls/sapi/tests/token.c | 100 +++++++++++++++++++++---------------------- dlls/sapi/tests/tts.c | 16 +++---- 6 files changed, 71 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b3c158cb8cdb2cc4f7a…

1 0

Eric Pouech : mfplat/tests: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 02c3bc5fc50040cf64ba92af137859378f8d1cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=02c3bc5fc50040cf64ba92af… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 10:55:45 2022 +0300 mfplat/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/Makefile.in | 1 - dlls/mfplat/tests/mfplat.c | 2580 ++++++++++++++++++++--------------------- 2 files changed, 1290 insertions(+), 1291 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02c3bc5fc50040cf64ba…

1 0

Zebediah Figura : dxgi: Explicitly use Wine d3d12 and Vulkan headers.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 8859022a87ddb90a1d807405be86f004af3f4329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8859022a87ddb90a1d807405… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 19:50:09 2022 -0600 dxgi: Explicitly use Wine d3d12 and Vulkan headers. Avoid depending on our modified copy of vkd3d.h to include Wine headers; this will not work with system vkd3d.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index aaf4fe101de..98b020217e4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -18,6 +18,10 @@ */ #include "dxgi_private.h" + +#define VKD3D_NO_VULKAN_H +#define VKD3D_NO_WIN32_TYPES +#include "wine/vulkan.h" #include <vkd3d.h> WINE_DEFAULT_DEBUG_CHANNEL(dxgi);

1 0

Eric Pouech : rasapi32/tests: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 8c5a301debbb65d7d62007126a36ed8ae0f95066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c5a301debbb65d7d6200712… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:24:50 2022 +0100 rasapi32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/tests/Makefile.in | 1 - dlls/rasapi32/tests/rasapi.c | 48 ++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/rasapi32/tests/Makefile.in b/dlls/rasapi32/tests/Makefile.in index 8e49604cf41..64d91ee7359 100644 --- a/dlls/rasapi32/tests/Makefile.in +++ b/dlls/rasapi32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = rasapi32.dll C_SRCS = \ diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index 5171bb2762c..167b5a3828d 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -64,9 +64,9 @@ static void test_rasenum(void) win_skip("RasEnumDevicesA found nothing to enumerate\n"); return; } - trace("RasEnumDevicesA: returned %d buffersize %d\n", result, bufsize); + trace("RasEnumDevicesA: returned %ld buffersize %ld\n", result, bufsize); ok(result == ERROR_BUFFER_TOO_SMALL, - "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + "Expected ERROR_BUFFER_TOO_SMALL, got %08ld\n", result); rasDevInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, max(bufsize,sizeof(RASDEVINFOA))); @@ -79,99 +79,99 @@ static void test_rasenum(void) cb = bufsize; cDevices = 0xdeadbeef; result = pRasEnumDevicesA(NULL, &cb, &cDevices); - ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %lu\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL || result == ERROR_INVALID_USER_BUFFER, /* win98 */ - "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + "Expected ERROR_BUFFER_TOO_SMALL, got %08ld\n", result); rasDevInfo[0].dwSize = 0; cb = bufsize; cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %lu\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ - "Expected ERROR_INVALID_SIZE, got %08d\n", result); + "Expected ERROR_INVALID_SIZE, got %08ld\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) -1; cb = bufsize; cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %lu\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ - "Expected ERROR_INVALID_SIZE, got %08d\n", result); + "Expected ERROR_INVALID_SIZE, got %08ld\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) +1; cb = bufsize; cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %lu\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ - "Expected ERROR_INVALID_SIZE, got %08d\n", result); + "Expected ERROR_INVALID_SIZE, got %08ld\n", result); /* test second parameter */ rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, NULL, &cDevices); - ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %lu\n", cDevices); ok(result == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + "Expected ERROR_INVALID_PARAMETER, got %08ld\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = 0; cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); todo_wine - ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %lu\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL || result == ERROR_INVALID_SIZE, /* vista, 2k8 */ - "Expected ERROR_BUFFER_TOO_SMALL/ERROR_INVALID_SIZE, got %08d\n", result); + "Expected ERROR_BUFFER_TOO_SMALL/ERROR_INVALID_SIZE, got %08ld\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize -1; cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %lu\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL, - "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + "Expected ERROR_BUFFER_TOO_SMALL, got %08ld\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize +1; cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %lu\n", cDevices); ok(result == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got %08d\n", result); + "Expected ERROR_SUCCESS, got %08ld\n", result); /* test third parameter */ rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, NULL); ok(result == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + "Expected ERROR_INVALID_PARAMETER, got %08ld\n", result); /* test combinations of invalid parameters */ cDevices = 0xdeadbeef; result = pRasEnumDevicesA(NULL, NULL, &cDevices); - ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %lu\n", cDevices); ok(result == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + "Expected ERROR_INVALID_PARAMETER, got %08ld\n", result); result = pRasEnumDevicesA(NULL, &cb, NULL); ok(result == ERROR_INVALID_PARAMETER || result == ERROR_INVALID_USER_BUFFER, /* win98 */ - "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + "Expected ERROR_INVALID_PARAMETER, got %08ld\n", result); cb = 0; rasDevInfo[0].dwSize = 0; cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %lu\n", cDevices); ok(result == ERROR_INVALID_SIZE || broken(result == ERROR_BUFFER_TOO_SMALL), /* win98 */ - "Expected ERROR_INVALID_SIZE, got %08d\n", result); + "Expected ERROR_INVALID_SIZE, got %08ld\n", result); HeapFree(GetProcessHeap(), 0, rasDevInfo); }

1 0

Eric Pouech : riched32/tests: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 724dc6d53d15e324e140fd6cdf4a2e09594307c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=724dc6d53d15e324e140fd6c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:09 2022 +0100 riched32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/Makefile.in | 1 - dlls/riched32/tests/editor.c | 138 ++++++++++++++++++++-------------------- 2 files changed, 69 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=724dc6d53d15e324e140…

1 0

Eric Pouech : mfplat/tests: Use correct integral type.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: de243ad2188ed9ff21185f32fce13357bc98588a URL: https://source.winehq.org/git/wine.git/?a=commit;h=de243ad2188ed9ff21185f32… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 10:55:44 2022 +0300 mfplat/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Eric Pouech : kernel32/tests/heap: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 08fff6d9d56815462201d24bcbd52a062a29ec2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=08fff6d9d56815462201d24b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:24:12 2022 +0100 kernel32/tests/heap: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 179 +++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08fff6d9d56815462201…

1 0

Eric Pouech : kernel32/tests/loader: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 1aaafa6a84532c238a0db32745f44ab925239daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aaafa6a84532c238a0db327… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:24:18 2022 +0100 kernel32/tests/loader: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 969 ++++++++++++++++++++++--------------------- 1 file changed, 485 insertions(+), 484 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1aaafa6a84532c238a0d…

1 0

Eric Pouech : kernel32/tests/locale: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: c56cf9dad26c646e818ad135ad51dc4824c34049 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56cf9dad26c646e818ad135… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:24:25 2022 +0100 kernel32/tests/locale: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 859 ++++++++++++++++++++++--------------------- 1 file changed, 430 insertions(+), 429 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c56cf9dad26c646e818a…

1 0

Santino Mazza : bcrypt: Add support for PUBLICKEY blob types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: b3073dc14a967fcc7fac38de4a347b46e6e6de82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3073dc14a967fcc7fac38de… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Fri Mar 4 08:45:17 2022 +0100 bcrypt: Add support for PUBLICKEY blob types. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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);

1 0