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

Francois Gouget : testbot: Always allow direct access to the table rows.
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: tools Branch: master Commit: 7dd896b2c6b79af7b4fb30fcccf7a5b7e7b9aa9c URL: https://source.winehq.org/git/tools.git/?a=commit;h=7dd896b2c6b79af7b4fb30f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 26 05:20:27 2018 +0200 testbot: Always allow direct access to the table rows. So far it was always necessary to go through the hierarchies like Job -> Step -> Task. Now it is possible to directly retrieve all the rows in any table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm | 17 ++++++++++++++++- testbot/lib/ObjectModel/Item.pm | 4 +--- testbot/lib/ObjectModel/PropertyDescriptor.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/PendingPatchSets.pm | 1 + testbot/lib/WineTestBot/PendingPatches.pm | 16 ++++++++++++++-- testbot/lib/WineTestBot/RecordGroups.pm | 1 + testbot/lib/WineTestBot/Steps.pm | 16 +++++++++++----- testbot/lib/WineTestBot/Tasks.pm | 14 ++++++++++++-- testbot/lib/WineTestBot/UserRoles.pm | 13 +++++++++++-- testbot/lib/WineTestBot/Users.pm | 1 + 11 files changed, 70 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=7dd896b2c6b79af7b4f…

1 0

Francois Gouget : testbot/testagentd: Show a message when testagentd is restarted.
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: tools Branch: master Commit: 96a8d7b7001197a03cde782f58bb9631f3aec221 URL: https://source.winehq.org/git/tools.git/?a=commit;h=96a8d7b7001197a03cde782… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 26 05:20:10 2018 +0200 testbot/testagentd: Show a message when testagentd is restarted. It can be useful to set up a VM to auto-login on Windows and have TestAgentd start automatically on boot. However in such a configuration it can be hard to detect when a test causes Windows to reboot: the client reconnects automatically just like after a network glitch and the VM desktop looks normal. So with this patch TestAgentd can keep track of its restarts, lets the client query that value, and brings up a dialog if an unexpected restart occurs. The start count can also be overriden to deal with cases where some automated process causes a Windows reboot as part of the VM set up process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 20 +++++ testbot/scripts/TestAgent | 15 +++- testbot/src/testagentd/platform.h | 8 ++ testbot/src/testagentd/platform_unix.c | 9 ++ testbot/src/testagentd/platform_windows.c | 31 +++++++ testbot/src/testagentd/testagentd.c | 131 +++++++++++++++++++++++++++++- 6 files changed, 210 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=96a8d7b7001197a03cd…

1 0

Józef Kucia : winevulkan: Simplify wine_vk_instance_convert_create_info() a bit.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: c6648a960b44aeaca0568c2c2577bf31bce97c73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6648a960b44aeaca0568c2c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 23 14:46:16 2018 +0100 winevulkan: Simplify wine_vk_instance_convert_create_info() a bit. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8cc5a51..7e800cc 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -191,14 +191,12 @@ static BOOL wine_vk_init(void) * This function takes care of extensions handled at winevulkan layer, a Wine graphics * driver is responsible for handling e.g. surface extensions. */ -static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, +static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, VkInstanceCreateInfo *dst) { unsigned int i; - dst->sType = src->sType; - dst->flags = src->flags; - dst->pApplicationInfo = src->pApplicationInfo; + *dst = *src; if (dst->pApplicationInfo) { @@ -231,7 +229,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo break; default: - FIXME("Application requested a linked structure of type %d\n", header->sType); + FIXME("Application requested a linked structure of type %#x.\n", header->sType); } } } @@ -244,17 +242,11 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo dst->enabledLayerCount = 0; dst->ppEnabledLayerNames = NULL; - /* TODO: convert non-WSI win32 extensions here to host specific ones. */ - dst->ppEnabledExtensionNames = src->ppEnabledExtensionNames; - dst->enabledExtensionCount = src->enabledExtensionCount; - TRACE("Enabled extensions: %u\n", dst->enabledExtensionCount); for (i = 0; i < dst->enabledExtensionCount; i++) { TRACE("Extension %u: %s\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); } - - return VK_SUCCESS; } /* Helper function which stores wrapped physical devices in the instance object. */ @@ -633,12 +625,7 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - res = wine_vk_instance_convert_create_info(create_info, &create_info_host); - if (res != VK_SUCCESS) - { - ERR("Failed to convert instance create info, res=%d\n", res); - goto err; - } + wine_vk_instance_convert_create_info(create_info, &create_info_host); res = vk_funcs->p_vkCreateInstance(&create_info_host, NULL /* allocator */, &object->instance); if (res != VK_SUCCESS)

1 0

Józef Kucia : winevulkan: Fix minor coding style issues in autogenerated code.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: 78447f8d102fee76839a3f9a2e6bf791534a8d25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78447f8d102fee76839a3f9a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 23 14:46:17 2018 +0100 winevulkan: Fix minor coding style issues in autogenerated code. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 8 ++++---- dlls/winevulkan/vulkan_thunks.c | 6 +++--- dlls/winevulkan/vulkan_thunks.h | 34 +++++++++++++++++----------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 35524f2..5303fec 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1787,7 +1787,7 @@ class VkGenerator(object): f.write(" {\n") f.write(" if (strcmp(vk_device_dispatch_table[i].name, name) == 0)\n") f.write(" {\n") - f.write(" TRACE(\"Found name=%s in device table\\n\", name);\n") + f.write(" TRACE(\"Found name=%s in device table\\n\", debugstr_a(name));\n") f.write(" return vk_device_dispatch_table[i].func;\n") f.write(" }\n") f.write(" }\n") @@ -1801,7 +1801,7 @@ class VkGenerator(object): f.write(" {\n") f.write(" if (strcmp(vk_instance_dispatch_table[i].name, name) == 0)\n") f.write(" {\n") - f.write(" TRACE(\"Found name=%s in instance table\\n\", name);\n") + f.write(" TRACE(\"Found name=%s in instance table\\n\", debugstr_a(name));\n") f.write(" return vk_instance_dispatch_table[i].func;\n") f.write(" }\n") f.write(" }\n") @@ -1818,7 +1818,7 @@ class VkGenerator(object): f.write("};\n\n") # Create array of instance extensions. - f.write("static const char *vk_instance_extensions[] =\n{\n") + f.write("static const char * const vk_instance_extensions[] =\n{\n") for ext in self.registry.extensions: if ext["type"] != "instance": continue @@ -1950,7 +1950,7 @@ class VkGenerator(object): f.write(" USE_VK_FUNC({0})".format(vk_func.name)) first = False else: - f.write("\\\n USE_VK_FUNC({0})".format(vk_func.name)) + f.write(" \\\n USE_VK_FUNC({0})".format(vk_func.name)) f.write("\n\n") f.write("#endif /* __WINE_VULKAN_THUNKS_H */\n") diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index f7aa09b..bf8e78c 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2315,7 +2315,7 @@ void *wine_vk_get_device_proc_addr(const char *name) { if (strcmp(vk_device_dispatch_table[i].name, name) == 0) { - TRACE("Found name=%s in device table\n", name); + TRACE("Found name=%s in device table\n", debugstr_a(name)); return vk_device_dispatch_table[i].func; } } @@ -2329,7 +2329,7 @@ void *wine_vk_get_instance_proc_addr(const char *name) { if (strcmp(vk_instance_dispatch_table[i].name, name) == 0) { - TRACE("Found name=%s in instance table\n", name); + TRACE("Found name=%s in instance table\n", debugstr_a(name)); return vk_instance_dispatch_table[i].func; } } @@ -2369,7 +2369,7 @@ static const char * const vk_device_extensions[] = "VK_NV_viewport_swizzle", }; -static const char *vk_instance_extensions[] = +static const char * const vk_instance_extensions[] = { "VK_KHR_get_physical_device_properties2", "VK_KHR_surface", diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 803d621..cca1026 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -975,23 +975,23 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkWaitForFences) #define ALL_VK_INSTANCE_FUNCS() \ - USE_VK_FUNC(vkCreateDevice)\ - USE_VK_FUNC(vkEnumerateDeviceExtensionProperties)\ - USE_VK_FUNC(vkEnumerateDeviceLayerProperties)\ - USE_VK_FUNC(vkEnumeratePhysicalDevices)\ - USE_VK_FUNC(vkGetPhysicalDeviceFeatures)\ - USE_VK_FUNC(vkGetPhysicalDeviceFeatures2KHR)\ - USE_VK_FUNC(vkGetPhysicalDeviceFormatProperties)\ - USE_VK_FUNC(vkGetPhysicalDeviceFormatProperties2KHR)\ - USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties)\ - USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties2KHR)\ - USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties)\ - USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR)\ - USE_VK_FUNC(vkGetPhysicalDeviceProperties)\ - USE_VK_FUNC(vkGetPhysicalDeviceProperties2KHR)\ - USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties)\ - USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties2KHR)\ - USE_VK_FUNC(vkGetPhysicalDeviceSparseImageFormatProperties)\ + USE_VK_FUNC(vkCreateDevice) \ + USE_VK_FUNC(vkEnumerateDeviceExtensionProperties) \ + USE_VK_FUNC(vkEnumerateDeviceLayerProperties) \ + USE_VK_FUNC(vkEnumeratePhysicalDevices) \ + USE_VK_FUNC(vkGetPhysicalDeviceFeatures) \ + USE_VK_FUNC(vkGetPhysicalDeviceFeatures2KHR) \ + USE_VK_FUNC(vkGetPhysicalDeviceFormatProperties) \ + USE_VK_FUNC(vkGetPhysicalDeviceFormatProperties2KHR) \ + USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties) \ + USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties2KHR) \ + USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties) \ + USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR) \ + USE_VK_FUNC(vkGetPhysicalDeviceProperties) \ + USE_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) \ + USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties) \ + USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties2KHR) \ + USE_VK_FUNC(vkGetPhysicalDeviceSparseImageFormatProperties) \ USE_VK_FUNC(vkGetPhysicalDeviceSparseImageFormatProperties2KHR) #endif /* __WINE_VULKAN_THUNKS_H */

1 0

André Hentschel : ntdll: Fix build on PowerPC.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: 7b3e9ff935653a64dd6b4b8db623c6852b2aaef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b3e9ff935653a64dd6b4b8d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 23 15:29:00 2018 +0100 ntdll: Fix build on PowerPC. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_powerpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index cb5089b..d86412a 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1171,7 +1171,7 @@ static void thread_startup( void *param ) context.Iar = (DWORD)info->start; if (info->suspend) wait_suspend( &context ); - attach_dlls( &context, (void **)&context->Gpr3 ); + attach_dlls( &context, (void **)&context.Gpr3 ); ((thread_start_func)context.Iar)( (LPTHREAD_START_ROUTINE)context.Gpr3, (void *)context.Gpr4 ); }

1 0

Michael Müller : bcrypt: Add support for 192 and 256 bit AES keys.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: d0006d05c9ef847b754c523bc303dae28955bfee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0006d05c9ef847b754c523b… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Mar 23 14:06:10 2018 +0100 bcrypt: Add support for 192 and 256 bit AES keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 14 ++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 1aeafd0..69d5129 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1003,11 +1003,21 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) WARN( "handle block size\n" ); switch (key->mode) { - case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_GCM: + if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_GCM; + if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_GCM; + break; case MODE_ID_ECB: /* can be emulated with CBC + empty IV */ case MODE_ID_CBC: - default: return GNUTLS_CIPHER_AES_128_CBC; + if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_CBC; + if (key->secret_len == 24) return GNUTLS_CIPHER_AES_192_CBC; + if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_CBC; + break; + default: + break; } + FIXME( "aes mode %u with key length %u not supported\n", key->mode, key->secret_len ); + return GNUTLS_CIPHER_UNKNOWN; default: FIXME( "algorithm %u not supported\n", key->alg_id ); return GNUTLS_CIPHER_UNKNOWN; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3abbd75..971dee5 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -622,6 +622,9 @@ static void test_BCryptEncrypt(void) {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; static UCHAR secret[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR secret256[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, + 0x0f,0x0e,0x0d,0x0c,0x0b,0x0a,0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00}; static UCHAR iv[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; static UCHAR data[] = @@ -654,6 +657,10 @@ static void test_BCryptEncrypt(void) {0xb5,0x8a,0x10,0x64,0xd8,0xac,0xa9,0x9b,0xd9,0xb0,0x40,0x5b,0x85,0x45,0xf5,0xbb}; static UCHAR expected9[] = {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a}; + static UCHAR expected10[] = + {0x66,0xb8,0xbd,0xe5,0x90,0x6c,0xec,0xdf,0xfa,0x8a,0xb2,0xfd,0x92,0x84,0xeb,0xf0, + 0x95,0xc4,0xdf,0xa7,0x7a,0x62,0xe4,0xab,0xd4,0x0e,0x94,0x4e,0xd7,0x6e,0xa1,0x47, + 0x29,0x4b,0x37,0xfe,0x28,0x6d,0x5f,0x69,0x46,0x30,0x73,0xc0,0xaa,0x42,0xe4,0x46}; static UCHAR expected_tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR expected_tag2[] = @@ -785,6 +792,31 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + /* 256 bit key */ + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret256, sizeof(secret256), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + ok(!memcmp(ciphertext, expected10, sizeof(expected10)), "wrong data\n"); + for (i = 0; i < 48; i++) + ok(ciphertext[i] == expected10[i], "%u: %02x != %02x\n", i, ciphertext[i], expected10[i]); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + /****************** * AES - GCM mode * ******************/

1 0

Michael Müller : bcrypt/tests: Add basic test for ECDSA.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: 5946973021285dd6ecb8df224956fea4817f8fed URL: https://source.winehq.org/git/wine.git/?a=commit;h=5946973021285dd6ecb8df22… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Mar 23 14:06:11 2018 +0100 bcrypt/tests: Add basic test for ECDSA. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 971dee5..57d0488 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -50,6 +50,8 @@ static NTSTATUS (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); static NTSTATUS (WINAPI *pBCryptImportKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptExportKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptImportKeyPair)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptVerifySignature)(BCRYPT_KEY_HANDLE, VOID *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); static void test_BCryptGenRandom(void) { @@ -1433,6 +1435,66 @@ static void test_key_import_export(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static BYTE eccPubkey[] = +{ + /* X */ + 0x3b, 0x3c, 0x34, 0xc8, 0x3f, 0x15, 0xea, 0x02, 0x68, 0x46, 0x69, 0xdf, 0x0c, 0xa6, 0xee, 0x7a, + 0xd9, 0x82, 0x08, 0x9b, 0x37, 0x53, 0x42, 0xf3, 0x13, 0x63, 0xda, 0x65, 0x79, 0xe8, 0x04, 0x9e, + /* Y */ + 0x8c, 0x77, 0xc4, 0x33, 0x77, 0xd9, 0x5a, 0x7f, 0x60, 0x7b, 0x98, 0xce, 0xf3, 0x96, 0x56, 0xd6, + 0xb5, 0x8d, 0x87, 0x7a, 0x00, 0x2b, 0xf3, 0x70, 0xb3, 0x90, 0x73, 0xa0, 0x56, 0x06, 0x3b, 0x22, +}; +static BYTE certHash[] = +{ + 0x28, 0x19, 0x0f, 0x15, 0x6d, 0x75, 0xcc, 0xcf, 0x62, 0xf1, 0x5e, 0xe6, 0x8a, 0xc3, 0xf0, 0x5d, + 0x89, 0x28, 0x2d, 0x48, 0xd8, 0x73, 0x7c, 0x05, 0x05, 0x8e, 0xbc, 0xce, 0x28, 0xb7, 0xba, 0xc9, +}; +static BYTE certSignature[] = +{ + /* r */ + 0xd7, 0x29, 0xce, 0x5a, 0xef, 0x74, 0x85, 0xd1, 0x18, 0x5f, 0x6e, 0xf1, 0xba, 0x53, 0xd4, 0xcd, + 0xdd, 0xe0, 0x5d, 0xf1, 0x5e, 0x48, 0x51, 0xea, 0x63, 0xc0, 0xe8, 0xe2, 0xf6, 0xfa, 0x4c, 0xaf, + /* s */ + 0xe3, 0x94, 0x15, 0x3b, 0x6c, 0x71, 0x6e, 0x44, 0x22, 0xcb, 0xa0, 0x88, 0xcd, 0x0a, 0x5a, 0x50, + 0x29, 0x7c, 0x5c, 0xd6, 0x6c, 0xd2, 0xe0, 0x7f, 0xcd, 0x02, 0x92, 0x21, 0x4c, 0x2c, 0x92, 0xee, +}; + +static void test_ECDSA(void) +{ + BYTE buffer[sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey)]; + BCRYPT_ECCKEY_BLOB *ecckey = (void *)buffer; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_KEY_HANDLE key = NULL; + NTSTATUS status; + + status = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); + if (status) + { + skip("Failed to open ECDSA provider: %08x, skipping test\n", status); + return; + } + + ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + memcpy(ecckey + 1, eccPubkey, sizeof(eccPubkey)); + + ecckey->cbKey = 2; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->cbKey = sizeof(eccPubkey) / 2; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ok(!status, "BCryptImportKeyPair failed: %08x\n", status); + + status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); + ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); + + status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); + ok(!status, "BCryptVerifySignature failed: %08x\n", status); + + pBCryptDestroyKey(key); + pBCryptCloseAlgorithmProvider(alg, 0); +} + START_TEST(bcrypt) { HMODULE module; @@ -1463,6 +1525,8 @@ START_TEST(bcrypt) pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey"); pBCryptImportKey = (void *)GetProcAddress(module, "BCryptImportKey"); pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); + pBCryptImportKeyPair = (void *)GetProcAddress(module, "BCryptImportKeyPair"); + pBCryptVerifySignature = (void *)GetProcAddress(module, "BCryptVerifySignature"); test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); @@ -1473,6 +1537,7 @@ START_TEST(bcrypt) test_BCryptEncrypt(); test_BCryptDecrypt(); test_key_import_export(); + test_ECDSA(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash();

1 0

Hans Leidekker : bcrypt: Implement support for ECB chain mode.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: 0c55f8faa3e46ec9ea565d58608a5585ae7e6cae URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c55f8faa3e46ec9ea565d58… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 23 14:06:09 2018 +0100 bcrypt: Implement support for ECB chain mode. Based on a patch by Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 72 ++++++++++-- dlls/bcrypt/tests/bcrypt.c | 275 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 330 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c55f8faa3e46ec9ea56…

1 0

Józef Kucia : winex11: Simplify X11DRV_vkEnumerateInstanceExtensionProperties().
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: eefc444f9f00b70eb0f26fd6499e5b45997ba0fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=eefc444f9f00b70eb0f26fd6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 23 14:46:18 2018 +0100 winex11: Simplify X11DRV_vkEnumerateInstanceExtensionProperties(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index f96ef64..68fb339 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -368,8 +368,7 @@ static void X11DRV_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapcha static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties* properties) { - VkResult res; - unsigned int i, num_copies; + unsigned int i; TRACE("layer_name %p, count %p, properties %p\n", debugstr_a(layer_name), count, properties); @@ -382,37 +381,18 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ if (!properties) { - /* When properties is NULL, we need to return the number of extensions - * supported. For now report 0 until we add some e.g. - * VK_KHR_win32_surface. Long-term this needs to be an intersection - * between what the native library supports and what thunks we have. - */ *count = winex11_vk_instance_extensions_count; return VK_SUCCESS; } - if (*count < winex11_vk_instance_extensions_count) - { - /* Incomplete is a type of success used to signal the application - * that not all devices got copied. - */ - num_copies = *count; - res = VK_INCOMPLETE; - } - else - { - num_copies = winex11_vk_instance_extensions_count; - res = VK_SUCCESS; - } - - for (i = 0; i < num_copies; i++) + *count = min(*count, winex11_vk_instance_extensions_count); + for (i = 0; i < *count; i++) { - memcpy(&properties[i], &winex11_vk_instance_extensions[i], sizeof(*properties)); + properties[i] = winex11_vk_instance_extensions[i]; } - *count = num_copies; - TRACE("Result %d, extensions copied %u\n", res, num_copies); - return res; + TRACE("Returning %u extensions.\n", *count); + return *count < winex11_vk_instance_extensions_count ? VK_INCOMPLETE : VK_SUCCESS; } static void * X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name)

1 0

Roderick Colenbrander : winevulkan: Add tracing to wine_vk_instance_convert_create_info.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: ca2f3bae473471a7455c1f8c1c3252161ff52369 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca2f3bae473471a7455c1f8c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 23 14:46:15 2018 +0100 winevulkan: Add tracing to wine_vk_instance_convert_create_info. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index d294b0a..8cc5a51 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -194,10 +194,22 @@ static BOOL wine_vk_init(void) static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, VkInstanceCreateInfo *dst) { + unsigned int i; + dst->sType = src->sType; dst->flags = src->flags; dst->pApplicationInfo = src->pApplicationInfo; + if (dst->pApplicationInfo) + { + const VkApplicationInfo *app_info = dst->pApplicationInfo; + TRACE("Application name %s, application version %#x\n", + debugstr_a(app_info->pApplicationName), app_info->applicationVersion); + TRACE("Engine name %s, engine version %#x\n", debugstr_a(app_info->pEngineName), + app_info->engineVersion); + TRACE("API version %#x\n", app_info->apiVersion); + } + /* Application and loader can pass in a chain of extensions through pNext. * We can't blindly pass these through as often these contain callbacks or * they can even be pass structures for loader / ICD internal use. For now @@ -236,6 +248,12 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo dst->ppEnabledExtensionNames = src->ppEnabledExtensionNames; dst->enabledExtensionCount = src->enabledExtensionCount; + TRACE("Enabled extensions: %u\n", dst->enabledExtensionCount); + for (i = 0; i < dst->enabledExtensionCount; i++) + { + TRACE("Extension %u: %s\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); + } + return VK_SUCCESS; }

1 0