November 2022 - Wine-commits

Jacek Caban : winevulkan: Assert Unix call result in private thunks.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 0c38bb0b2bafca5eb232396e39c77a3e60de05fc URL: https://gitlab.winehq.org/wine/wine/-/commit/0c38bb0b2bafca5eb232396e39c77a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 1 15:36:09 2022 +0100 winevulkan: Assert Unix call result in private thunks. --- dlls/winevulkan/loader.c | 49 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index d6fe9fe078f..20bd9d38c27 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -257,6 +257,7 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, struct vkCreateInstance_params params; struct VkInstance_T *instance; uint32_t phys_dev_count = 8, i; + NTSTATUS status; TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, ret); @@ -275,7 +276,8 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, params.pAllocator = allocator; params.pInstance = ret; params.client_ptr = instance; - vk_unix_call(unix_vkCreateInstance, &params); + status = vk_unix_call(unix_vkCreateInstance, &params); + assert(!status); if (instance->phys_dev_count <= phys_dev_count) break; phys_dev_count = instance->phys_dev_count; @@ -290,9 +292,12 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, void WINAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) { struct vkDestroyInstance_params params; + NTSTATUS status; + params.instance = instance; params.pAllocator = pAllocator; - vk_unix_call(unix_vkDestroyInstance, &params); + status = vk_unix_call(unix_vkDestroyInstance, &params); + assert(!status); free(instance); } @@ -300,6 +305,7 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { struct vkEnumerateInstanceExtensionProperties_params params; + NTSTATUS status; TRACE("%p, %p, %p\n", layer_name, count, properties); @@ -318,13 +324,15 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, params.pLayerName = layer_name; params.pPropertyCount = count; params.pProperties = properties; - vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, &params); + status = vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, &params); + assert(!status); return params.result; } VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) { struct vkEnumerateInstanceVersion_params params; + NTSTATUS status; TRACE("%p\n", version); @@ -335,7 +343,8 @@ VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) } params.pApiVersion = version; - vk_unix_call(unix_vkEnumerateInstanceVersion, &params); + status = vk_unix_call(unix_vkEnumerateInstanceVersion, &params); + assert(!status); return params.result; } @@ -434,12 +443,14 @@ void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, VkPhysicalDeviceProperties2 *properties2) { struct vkGetPhysicalDeviceProperties2_params params; + NTSTATUS status; TRACE("%p, %p\n", phys_dev, properties2); params.physicalDevice = phys_dev; params.pProperties = properties2; - vk_unix_call(unix_vkGetPhysicalDeviceProperties2, &params); + status = vk_unix_call(unix_vkGetPhysicalDeviceProperties2, &params); + assert(!status); fill_luid_property(properties2); } @@ -447,12 +458,14 @@ void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, VkPhysicalDeviceProperties2 *properties2) { struct vkGetPhysicalDeviceProperties2KHR_params params; + NTSTATUS status; TRACE("%p, %p\n", phys_dev, properties2); params.physicalDevice = phys_dev; params.pProperties = properties2; - vk_unix_call(unix_vkGetPhysicalDeviceProperties2KHR, &params); + status = vk_unix_call(unix_vkGetPhysicalDeviceProperties2KHR, &params); + assert(!status); fill_luid_property(properties2); } @@ -462,6 +475,7 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn struct vkCreateDevice_params params; uint32_t queue_count = 0, i; VkDevice device; + NTSTATUS status; for (i = 0; i < create_info->queueCreateInfoCount; i++) queue_count += create_info->pQueueCreateInfos[i].queueCount; @@ -475,7 +489,8 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn params.pAllocator = allocator; params.pDevice = ret; params.client_ptr = device; - vk_unix_call(unix_vkCreateDevice, &params); + status = vk_unix_call(unix_vkCreateDevice, &params); + assert(!status); if (!device->base.unix_handle) free(device); return params.result; @@ -484,10 +499,12 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn void WINAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *allocator) { struct vkDestroyDevice_params params; + NTSTATUS status; params.device = device; params.pAllocator = allocator; - vk_unix_call(unix_vkDestroyDevice, &params); + status = vk_unix_call(unix_vkDestroyDevice, &params); + assert(!status); free(device); } @@ -496,6 +513,7 @@ VkResult WINAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateIn { struct vkCreateCommandPool_params params; struct vk_command_pool *cmd_pool; + NTSTATUS status; if (!(cmd_pool = malloc(sizeof(*cmd_pool)))) return VK_ERROR_OUT_OF_HOST_MEMORY; @@ -507,7 +525,8 @@ VkResult WINAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateIn params.pAllocator = allocator; params.pCommandPool = ret; params.client_ptr = cmd_pool; - vk_unix_call(unix_vkCreateCommandPool, &params); + status = vk_unix_call(unix_vkCreateCommandPool, &params); + assert(!status); if (!cmd_pool->unix_handle) free(cmd_pool); return params.result; @@ -518,6 +537,7 @@ void WINAPI vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const Vk struct vk_command_pool *cmd_pool = command_pool_from_handle(handle); struct vkDestroyCommandPool_params params; VkCommandBuffer buffer, cursor; + NTSTATUS status; if (!cmd_pool) return; @@ -534,7 +554,8 @@ void WINAPI vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const Vk params.device = device; params.commandPool = handle; params.pAllocator = allocator; - vk_unix_call(unix_vkDestroyCommandPool, &params); + status = vk_unix_call(unix_vkDestroyCommandPool, &params); + assert(!status); free(cmd_pool); } @@ -543,6 +564,7 @@ VkResult WINAPI vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferA { struct vk_command_pool *pool = command_pool_from_handle(allocate_info->commandPool); struct vkAllocateCommandBuffers_params params; + NTSTATUS status; uint32_t i; for (i = 0; i < allocate_info->commandBufferCount; i++) @@ -551,7 +573,8 @@ VkResult WINAPI vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferA params.device = device; params.pAllocateInfo = allocate_info; params.pCommandBuffers = buffers; - vk_unix_call(unix_vkAllocateCommandBuffers, &params); + status = vk_unix_call(unix_vkAllocateCommandBuffers, &params); + assert(!status); if (params.result == VK_SUCCESS) { for (i = 0; i < allocate_info->commandBufferCount; i++) @@ -572,13 +595,15 @@ void WINAPI vkFreeCommandBuffers(VkDevice device, VkCommandPool cmd_pool, uint32 const VkCommandBuffer *buffers) { struct vkFreeCommandBuffers_params params; + NTSTATUS status; uint32_t i; params.device = device; params.commandPool = cmd_pool; params.commandBufferCount = count; params.pCommandBuffers = buffers; - vk_unix_call(unix_vkFreeCommandBuffers, &params); + status = vk_unix_call(unix_vkFreeCommandBuffers, &params); + assert(!status); for (i = 0; i < count; i++) { list_remove(&buffers[i]->pool_link);

1 0

Brendan Shanks : ntdll: Print correct thread rename trace if non-pseudo-handle to current thread is used.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: f726b6ba79e2b0b98c5afba747457f6685e80f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/f726b6ba79e2b0b98c5afba747457f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 18 15:45:24 2022 -0700 ntdll: Print correct thread rename trace if non-pseudo-handle to current thread is used. --- dlls/ntdll/unix/thread.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 3a737044407..0cf0da4ad4c 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -2282,9 +2282,10 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, if (!info) return STATUS_ACCESS_VIOLATION; if (info->ThreadName.Length && !info->ThreadName.Buffer) return STATUS_ACCESS_VIOLATION; - if (handle == GetCurrentThread()) + status = NtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + if (handle == GetCurrentThread() || (!status && (HandleToULong(tbi.ClientId.UniqueThread) == GetCurrentThreadId()))) WARN_(threadname)( "Thread renamed to %s\n", debugstr_us(&info->ThreadName) ); - else if (!NtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL )) + else if (!status) WARN_(threadname)( "Thread ID %04x renamed to %s\n", HandleToULong( tbi.ClientId.UniqueThread ), debugstr_us(&info->ThreadName) ); else WARN_(threadname)( "Thread handle %p renamed to %s\n", handle, debugstr_us(&info->ThreadName) );

1 0

Hans Leidekker : rsaenh: Pass exact size to BCryptFinishHash().
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 4e3b28709303b93b716e72b21abd6461009775a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e3b28709303b93b716e72b21abd64… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 1 15:08:30 2022 +0100 rsaenh: Pass exact size to BCryptFinishHash(). --- dlls/rsaenh/implglue.c | 4 ++-- dlls/rsaenh/implglue.h | 2 +- dlls/rsaenh/rsaenh.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index b4fe985af9b..636fe4b6ee0 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -70,9 +70,9 @@ BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD return TRUE; } -BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *hash_value, DWORD hash_size) { - BCryptFinishHash(hash_handle, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptFinishHash(hash_handle, hash_value, hash_size, 0); BCryptDestroyHash(hash_handle); return TRUE; } diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 06fa3f4430a..423474dc52e 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -41,7 +41,7 @@ typedef union tagKEY_CONTEXT { BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) DECLSPEC_HIDDEN; BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *hash_value, DWORD hash_size) DECLSPEC_HIDDEN; BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index beac3c7e850..3a2d7126ca4 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -816,7 +816,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) if (pCryptHash->pHMACInfo) { BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; - finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue, pCryptHash->dwHashSize); memcpy(abHashValue, pCryptHash->abHashValue, pCryptHash->dwHashSize); init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); update_hash_impl(pCryptHash->hash_handle, @@ -824,7 +824,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) pCryptHash->pHMACInfo->cbOuterString); update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); - finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue, pCryptHash->dwHashSize); pCryptHash->hash_handle = NULL; } break; @@ -842,7 +842,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) break; default: - finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue, pCryptHash->dwHashSize); pCryptHash->hash_handle = NULL; } }

1 0

Hans Leidekker : bcrypt: Use get_object() in more places.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: d1291ebd4030c3ecc2f30199b963015077ab218c URL: https://gitlab.winehq.org/wine/wine/-/commit/d1291ebd4030c3ecc2f30199b96301… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 13 14:12:01 2022 +0200 bcrypt: Use get_object() in more places. --- dlls/bcrypt/bcrypt_main.c | 114 +++++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 51 deletions(-)

1 0

Hans Leidekker : bcrypt: Validate hash output length.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: d75f651404028baa23d2591edf222837a167f790 URL: https://gitlab.winehq.org/wine/wine/-/commit/d75f651404028baa23d2591edf2228… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 1 12:09:38 2022 +0100 bcrypt: Validate hash output length. --- dlls/bcrypt/bcrypt_main.c | 19 ++++++++++++------- dlls/bcrypt/tests/bcrypt.c | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index e2eb8e95057..266c30fa426 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -496,7 +496,7 @@ static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, UCHAR * return STATUS_SUCCESS; } -static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, UCHAR *output, ULONG size ) +static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, UCHAR *output ) { switch (alg_id) { @@ -920,8 +920,7 @@ static NTSTATUS hash_prepare( struct hash *hash ) struct hash_impl temp; if ((status = hash_init( &temp, hash->alg_id ))) return status; if ((status = hash_update( &temp, hash->alg_id, hash->secret, hash->secret_len ))) return status; - if ((status = hash_finish( &temp, hash->alg_id, buffer, - builtin_algorithms[hash->alg_id].hash_length ))) return status; + if ((status = hash_finish( &temp, hash->alg_id, buffer ))) return status; } else memcpy( buffer, hash->secret, hash->secret_len ); @@ -1050,15 +1049,15 @@ static NTSTATUS hash_finalize( struct hash *hash, UCHAR *output, ULONG size ) if (!(hash->flags & HASH_FLAG_HMAC)) { - if ((status = hash_finish( &hash->inner, hash->alg_id, output, size ))) return status; + if ((status = hash_finish( &hash->inner, hash->alg_id, output ))) return status; if (hash->flags & HASH_FLAG_REUSABLE) return hash_prepare( hash ); return STATUS_SUCCESS; } hash_length = builtin_algorithms[hash->alg_id].hash_length; - if ((status = hash_finish( &hash->inner, hash->alg_id, buffer, hash_length ))) return status; + if ((status = hash_finish( &hash->inner, hash->alg_id, buffer ))) return status; if ((status = hash_update( &hash->outer, hash->alg_id, buffer, hash_length ))) return status; - if ((status = hash_finish( &hash->outer, hash->alg_id, output, size ))) return status; + if ((status = hash_finish( &hash->outer, hash->alg_id, output ))) return status; if (hash->flags & HASH_FLAG_REUSABLE) return hash_prepare( hash ); return STATUS_SUCCESS; @@ -1071,7 +1070,7 @@ NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULON TRACE( "%p, %p, %lu, %#lx\n", handle, output, size, flags ); if (!hash) return STATUS_INVALID_HANDLE; - if (!output) return STATUS_INVALID_PARAMETER; + if (!output || size != builtin_algorithms[hash->alg_id].hash_length) return STATUS_INVALID_PARAMETER; return hash_finalize( hash, output, size ); } @@ -1086,8 +1085,14 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE handle, UCHAR *secret, ULONG secre TRACE( "%p, %p, %lu, %p, %lu, %p, %lu\n", handle, secret, secret_len, input, input_len, output, output_len ); if (!alg) return STATUS_INVALID_HANDLE; + if (!output) return STATUS_INVALID_PARAMETER; if ((status = hash_create( alg, secret, secret_len, 0, &hash ))) return status; + if (output_len != builtin_algorithms[hash->alg_id].hash_length) + { + hash_destroy( hash ); + return STATUS_INVALID_PARAMETER; + } if ((status = hash_update( &hash->inner, hash->alg_id, input, input_len ))) { hash_destroy( hash ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d30e8888e49..2035ce346e6 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -330,8 +330,23 @@ static void test_hash(const struct hash_test *test) if (pBCryptHash) { + ret = pBCryptHash(BCRYPT_SHA1_ALG_HANDLE, NULL, 0, NULL, 0, hash_buf, 20); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = pBCryptHash(BCRYPT_SHA1_ALG_HANDLE, NULL, 0, (UCHAR *)"test", sizeof("test"), NULL, 20); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = pBCryptHash(BCRYPT_SHA1_ALG_HANDLE, NULL, 0, (UCHAR *)"test", sizeof("test"), hash_buf, 21); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = pBCryptHash(BCRYPT_SHA1_ALG_HANDLE, NULL, 0, (UCHAR *)"test", sizeof("test"), hash_buf, 20); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptCreateHash(BCRYPT_SHA1_ALG_HANDLE, &hash, NULL, 0, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptFinishHash(hash, hash_buf, 21, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = BCryptFinishHash(hash, hash_buf, 20, 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); }

1 0

Piotr Caban : wineps.drv: Remove DrvDocumentProperties entry point.
by Alexandre Julliard 01 Nov '22

01 Nov '22

1 0

Martin Storsjö : winegcc: Prefer -Wl,--pdb=<file> over -Wl,-pdb,<file>.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 6705a710450b015de9f378a4a4480b7623c837ad URL: https://gitlab.winehq.org/wine/wine/-/commit/6705a710450b015de9f378a4a4480b… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Oct 20 23:52:13 2022 +0300 winegcc: Prefer -Wl,--pdb=<file> over -Wl,-pdb,<file>. The previously used syntax, -Wl,-pdb,<file>, was the originally supported one in lld (since 2018). Later (in 2019) the second syntax was added, allowing both -Wl,-pdb=<file> and -Wl,-pdb,<file>. (This other parameter syntax allows easier distinguishing an empty argument, for letting the linker implicitly pick the file name.) Move over to using the more modern syntax - reducing the usage of the old form of the option. This potentially allows deprecating the original syntax and maybe allows using --pdb as a boolean flag for implying an automatically named PDB file (which currently requires using the awkward syntax "--pdb="). Also prefer the long two dashes form, i.e. --pdb instead of -pdb; the single dash form is only allowed by getopt when there are no conflicts with single-letter options, while the form with two dashes is unambiguous. --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e40aa9270ec..ddd513e55d0 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -464,7 +464,7 @@ static struct strarray get_link_args( struct options *opts, const char *output_n strarray_add( &flags, "-static-libgcc" ); if (opts->debug_file && strendswith(opts->debug_file, ".pdb")) - strarray_add(&link_args, strmake("-Wl,-pdb,%s", opts->debug_file)); + strarray_add(&link_args, strmake("-Wl,--pdb=%s", opts->debug_file)); if (opts->out_implib) strarray_add(&link_args, strmake("-Wl,--out-implib,%s", opts->out_implib));

1 0

Connor McAdams : uiautomationcore: Add UiaNavigate stub.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 4ed9f4c2c506f86d917c7c21abe35e047cb0fcfa URL: https://gitlab.winehq.org/wine/wine/-/commit/4ed9f4c2c506f86d917c7c21abe35e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 17 11:29:34 2022 -0400 uiautomationcore: Add UiaNavigate stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 854 ++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 11 + dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 2 + 4 files changed, 868 insertions(+), 1 deletion(-)

1 0

Connor McAdams : uiautomationcore: Add parent link check to prepare_uia_node().
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 567f00c865fa95c6c19a9c218b7bdc481595f9d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/567f00c865fa95c6c19a9c218b7bdc… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Oct 27 11:55:52 2022 -0400 uiautomationcore: Add parent link check to prepare_uia_node(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 112 ++++++++++++++--------------- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 88 ++++++++++++++++++++++- dlls/uiautomationcore/uia_private.h | 3 + 4 files changed, 147 insertions(+), 57 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add helper function for returning a new node from an IWineUiaProvider.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 4bab221b1dff490cdbbafe1e415ca3f2feada0ae URL: https://gitlab.winehq.org/wine/wine/-/commit/4bab221b1dff490cdbbafe1e415ca3… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Oct 27 12:57:51 2022 -0400 uiautomationcore: Add helper function for returning a new node from an IWineUiaProvider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 48 ++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index d053b88dd11..8f9ac813a8d 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -694,6 +694,34 @@ static void get_variant_for_node(HUIANODE node, VARIANT *v) #endif } +static HRESULT get_variant_for_elprov_node(IRawElementProviderSimple *elprov, BOOL out_nested, + VARIANT *v) +{ + HUIANODE node; + HRESULT hr; + + VariantInit(v); + hr = create_uia_node_from_elprov(elprov, &node, !out_nested); + IRawElementProviderSimple_Release(elprov); + if (SUCCEEDED(hr)) + { + if (out_nested) + { + LRESULT lr = uia_lresult_from_node(node); + + if (!lr) + return E_FAIL; + + V_VT(v) = VT_I4; + V_I4(v) = lr; + } + else + get_variant_for_node(node, v); + } + + return S_OK; +} + static HRESULT uia_provider_get_elem_prop_val(struct uia_provider *prov, const struct uia_prop_info *prop_info, VARIANT *ret_val) { @@ -764,7 +792,6 @@ static HRESULT uia_provider_get_elem_prop_val(struct uia_provider *prov, case UIAutomationType_Element: { IRawElementProviderSimple *elprov; - HUIANODE node; if (V_VT(&v) != VT_UNKNOWN) { @@ -778,23 +805,10 @@ static HRESULT uia_provider_get_elem_prop_val(struct uia_provider *prov, if (FAILED(hr)) goto exit; - hr = create_uia_node_from_elprov(elprov, &node, !prov->return_nested_node); - IRawElementProviderSimple_Release(elprov); - if (SUCCEEDED(hr)) - { - if (prov->return_nested_node) - { - LRESULT lr = uia_lresult_from_node(node); - - if (!lr) - return E_FAIL; + hr = get_variant_for_elprov_node(elprov, prov->return_nested_node, ret_val); + if (FAILED(hr)) + return hr; - V_VT(ret_val) = VT_I4; - V_I4(ret_val) = lr; - } - else - get_variant_for_node(node, ret_val); - } break; }

1 0