- Wine-Commits - list.winehq.org

Dmitry Timoshkov : widl: In old style typelibs all types are public.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: b8921b414e867b1df01cd2ee2365ed8a3ab524f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8921b414e867b1df01cd2ee2365ed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 3 19:13:17 2024 +0300 widl: In old style typelibs all types are public. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index ac4db609919..7380d94016c 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -411,11 +411,6 @@ static void append_data(struct sltg_data *block, const void *data, int size) block->size = new_size; } -static void add_typedef_typeinfo(struct sltg_typelib *typelib, type_t *type) -{ - error("add_typedef_typeinfo: %s not implemented\n", type->name); -} - static void add_module_typeinfo(struct sltg_typelib *typelib, type_t *type) { error("add_module_typeinfo: %s not implemented\n", type->name); @@ -996,12 +991,8 @@ static void add_statement(struct sltg_typelib *typelib, const statement_t *stmt) LIST_FOR_EACH_ENTRY(ref, stmt->u.type_list, typeref_t, entry) { - /* if the type is public then add the typedef, otherwise attempt - * to add the aliased type */ - if (is_attr(ref->type->attrs, ATTR_PUBLIC)) - add_typedef_typeinfo(typelib, ref->type); - else - add_type_typeinfo(typelib, type_alias_get_aliasee_type(ref->type)); + /* in old style typelibs all types are public */ + add_type_typeinfo(typelib, ref->type); } break; }

1 0

Rémi Bernon : winevulkan: Move vkQueuePresent FPS trace out of the drivers.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 551b535cddeea76f9f277558209e99123d454e59 URL: https://gitlab.winehq.org/wine/wine/-/commit/551b535cddeea76f9f277558209e99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 10 11:03:54 2023 +0100 winevulkan: Move vkQueuePresent FPS trace out of the drivers. --- dlls/winemac.drv/vulkan.c | 27 +-------------------------- dlls/winevulkan/vulkan.c | 23 +++++++++++++++++++++++ dlls/winex11.drv/vulkan.c | 29 +---------------------------- 3 files changed, 25 insertions(+), 54 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 288bd9af4b1..9cb026076f3 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBVULKAN -WINE_DECLARE_DEBUG_CHANNEL(fps); - typedef VkFlags VkMacOSSurfaceCreateFlagsMVK; #define VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK 1000123000 @@ -248,30 +246,7 @@ static VkResult macdrv_vkGetSwapchainImagesKHR(VkDevice device, static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info) { TRACE("%p, %p\n", queue, present_info); - VkResult res = pvkQueuePresentKHR(queue, present_info); - - if (TRACE_ON(fps)) - { - static unsigned long frames, frames_total; - static long prev_time, start_time; - DWORD time; - - time = NtGetTickCount(); - frames++; - frames_total++; - if (time - prev_time > 1500) - { - TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n", - queue, 1000.0 * frames / (time - prev_time), - 1000.0 * frames_total / (time - start_time)); - prev_time = time; - frames = 0; - if (!start_time) - start_time = time; - } - } - - return res; + return pvkQueuePresentKHR(queue, present_info); } static const char *macdrv_get_host_surface_extension(void) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index e906734a506..21e5952caf4 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -31,6 +31,7 @@ #include "ntuser.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +WINE_DECLARE_DEBUG_CHANNEL(fps); static PFN_vkCreateInstance p_vkCreateInstance; static PFN_vkEnumerateInstanceVersion p_vkEnumerateInstanceVersion; @@ -1705,6 +1706,28 @@ VkResult wine_vkQueuePresentKHR(VkQueue queue_handle, const VkPresentInfoKHR *pr if (swapchains != swapchains_buffer) free(swapchains); + if (TRACE_ON(fps)) + { + static unsigned long frames, frames_total; + static long prev_time, start_time; + DWORD time; + + time = NtGetTickCount(); + frames++; + frames_total++; + + if (time - prev_time > 1500) + { + TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n", queue, + 1000.0 * frames / (time - prev_time), + 1000.0 * frames_total / (time - start_time)); + prev_time = time; + frames = 0; + + if (!start_time) start_time = time; + } + } + return res; } diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 4ff319c7ae2..36b6e3a4162 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -47,7 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBVULKAN -WINE_DECLARE_DEBUG_CHANNEL(fps); static pthread_mutex_t vulkan_mutex; @@ -263,34 +262,8 @@ static VkResult X11DRV_vkGetSwapchainImagesKHR(VkDevice device, static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info) { - VkResult res; - TRACE("%p, %p\n", queue, present_info); - - res = pvkQueuePresentKHR(queue, present_info); - - if (TRACE_ON(fps)) - { - static unsigned long frames, frames_total; - static long prev_time, start_time; - DWORD time; - - time = NtGetTickCount(); - frames++; - frames_total++; - if (time - prev_time > 1500) - { - TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n", - queue, 1000.0 * frames / (time - prev_time), - 1000.0 * frames_total / (time - start_time)); - prev_time = time; - frames = 0; - if (!start_time) - start_time = time; - } - } - - return res; + return pvkQueuePresentKHR(queue, present_info); } static const char *X11DRV_get_host_surface_extension(void)

1 0

Dmitry Timoshkov : widl: Add support for interfaces to SLTG typelib generator.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 7db6c30aead9d034c3d88f4b972000f46907990a URL: https://gitlab.winehq.org/wine/wine/-/commit/7db6c30aead9d034c3d88f4b972000… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 19 17:01:01 2016 +0800 widl: Add support for interfaces to SLTG typelib generator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 432 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 418 insertions(+), 14 deletions(-)

1 0

Rémi Bernon : winevulkan: Return VK_SUBOPTIMAL_KHR from vkQueuePresentKHR after resize.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 010b497cf6491bd3d4e103db3110b24de17d4a31 URL: https://gitlab.winehq.org/wine/wine/-/commit/010b497cf6491bd3d4e103db3110b2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 10 11:03:54 2023 +0100 winevulkan: Return VK_SUBOPTIMAL_KHR from vkQueuePresentKHR after resize. --- dlls/vulkan-1/tests/vulkan.c | 3 --- dlls/winevulkan/vulkan.c | 34 ++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 2 ++ 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 716a524e796..71ad2c4cf34 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -762,11 +762,8 @@ static void test_win32_surface_swapchain_hwnd(VkDevice device, VkSwapchainKHR sw vr = vkQueuePresentKHR(queue, &present_info); if (expect_suboptimal) - { - todo_wine ok(vr == VK_SUBOPTIMAL_KHR || broken(vr == VK_ERROR_OUT_OF_DATE_KHR) /* Nvidia */, "Got unexpected vr %d.\n", vr); - } else if (IsWindow(hwnd)) ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); else diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 21e5952caf4..5f513b96480 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1624,6 +1624,12 @@ void wine_vkDestroySurfaceKHR(VkInstance handle, VkSurfaceKHR surface, free(object); } +static BOOL extents_equals(const VkExtent2D *extents, const RECT *rect) +{ + return extents->width == rect->right - rect->left && + extents->height == rect->bottom - rect->top; +} + VkResult wine_vkCreateSwapchainKHR(VkDevice device_handle, const VkSwapchainCreateInfoKHR *create_info, const VkAllocationCallbacks *allocator, VkSwapchainKHR *swapchain_handle) { @@ -1661,6 +1667,9 @@ VkResult wine_vkCreateSwapchainKHR(VkDevice device_handle, const VkSwapchainCrea return res; } + object->surface = surface; + object->extents = create_info->imageExtent; + *swapchain_handle = wine_swapchain_to_handle(object); add_handle_mapping(instance, *swapchain_handle, object->host_swapchain, &object->wrapper_entry); return VK_SUCCESS; @@ -1704,6 +1713,31 @@ VkResult wine_vkQueuePresentKHR(VkQueue queue_handle, const VkPresentInfoKHR *pr res = device->funcs.p_vkQueuePresentKHR(queue->host_queue, &present_info_host); + for (i = 0; i < present_info->swapchainCount; i++) + { + struct wine_swapchain *swapchain = wine_swapchain_from_handle(present_info->pSwapchains[i]); + VkResult swapchain_res = present_info->pResults ? present_info->pResults[i] : res; + struct wine_surface *surface = swapchain->surface; + RECT client_rect; + + if (swapchain_res < VK_SUCCESS) continue; + if (!NtUserGetClientRect(surface->hwnd, &client_rect)) + { + WARN("Swapchain window %p is invalid, returning VK_ERROR_OUT_OF_DATE_KHR\n", surface->hwnd); + if (present_info->pResults) present_info->pResults[i] = VK_ERROR_OUT_OF_DATE_KHR; + if (res >= VK_SUCCESS) res = VK_ERROR_OUT_OF_DATE_KHR; + } + else if (swapchain_res != VK_SUCCESS) + WARN("Present returned status %d for swapchain %p\n", swapchain_res, swapchain); + else if (!extents_equals(&swapchain->extents, &client_rect)) + { + WARN("Swapchain size %dx%d does not match client rect %s, returning VK_SUBOPTIMAL_KHR\n", + swapchain->extents.width, swapchain->extents.height, wine_dbgstr_rect(&client_rect)); + if (present_info->pResults) present_info->pResults[i] = VK_SUBOPTIMAL_KHR; + if (res == VK_SUCCESS) res = VK_SUBOPTIMAL_KHR; + } + } + if (swapchains != swapchains_buffer) free(swapchains); if (TRACE_ON(fps)) diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index f5109aa6377..5e66a6c9670 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -253,7 +253,9 @@ static inline VkSurfaceKHR wine_surface_to_handle(struct wine_surface *surface) struct wine_swapchain { + struct wine_surface *surface; /* parent */ VkSwapchainKHR host_swapchain; + VkExtent2D extents; struct wrapper_entry wrapper_entry; };

1 0

Dmitry Timoshkov : widl: Add support for recursive type references to SLTG typelib generator.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 61583ec2cd89688fd4b706e50d4a2be0c41ef8df URL: https://gitlab.winehq.org/wine/wine/-/commit/61583ec2cd89688fd4b706e50d4a2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 14 15:16:37 2016 +0800 widl: Add support for recursive type references to SLTG typelib generator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 53 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index 7380d94016c..220fd933704 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -183,6 +183,12 @@ struct sltg_hrefinfo #include "poppack.h" +static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type); +static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *type); +static void add_enum_typeinfo(struct sltg_typelib *typelib, type_t *type); +static void add_union_typeinfo(struct sltg_typelib *typelib, type_t *type); +static void add_coclass_typeinfo(struct sltg_typelib *typelib, type_t *type); + static void init_sltg_data(struct sltg_data *data) { data->size = 0; @@ -644,8 +650,8 @@ static int local_href(struct sltg_hrefmap *hrefmap, int typelib_href) return href << 2; } -static short write_var_desc(struct sltg_data *data, type_t *type, short flags, short base_offset, - int *size_instance, struct sltg_hrefmap *hrefmap) +static short write_var_desc(struct sltg_typelib *typelib, struct sltg_data *data, type_t *type, short flags, + short base_offset, int *size_instance, struct sltg_hrefmap *hrefmap) { short vt, vt_flags, desc_offset; @@ -737,10 +743,10 @@ static short write_var_desc(struct sltg_data *data, type_t *type, short flags, s chat("write_var_desc: vt VT_PTR | 0x0400\n"); vt = VT_PTR | 0x0400; append_data(data, &vt, sizeof(vt)); - write_var_desc(data, ref, 0, base_offset, size_instance, hrefmap); + write_var_desc(typelib, data, ref, 0, base_offset, size_instance, hrefmap); } else - write_var_desc(data, ref, 0x0e00, base_offset, size_instance, hrefmap); + write_var_desc(typelib, data, ref, 0x0e00, base_offset, size_instance, hrefmap); return desc_offset; } @@ -759,6 +765,33 @@ static short write_var_desc(struct sltg_data *data, type_t *type, short flags, s chat("write_var_desc: VT_USERDEFINED, type %p, name %s, real type %d, href %d\n", type, type->name, type_get_type(type), type->typelib_idx); + if (type->typelib_idx == -1) + { + chat("write_var_desc: trying to ref not added type\n"); + + switch (type_get_type(type)) + { + case TYPE_STRUCT: + add_structure_typeinfo(typelib, type); + break; + case TYPE_INTERFACE: + add_interface_typeinfo(typelib, type); + break; + case TYPE_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; + case TYPE_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + default: + error("write_var_desc: VT_USERDEFINED - unhandled type %d\n", + type_get_type(type)); + } + } + if (type->typelib_idx == -1) error("write_var_desc: trying to ref not added type\n"); @@ -816,6 +849,8 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) int member_offset, var_count = 0, var_data_size = 0, size_instance = 0; short *type_desc_offset = NULL; + if (type->typelib_idx != -1) return; + chat("add_structure_typeinfo: type %p, type->name %s\n", type, type->name); type->typelib_idx = typelib->block_count; @@ -825,8 +860,6 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) init_sltg_data(&data); - index_name = add_typeinfo_block(typelib, type, TKIND_RECORD); - if (type_struct_get_fields(type)) { int i = 0; @@ -841,13 +874,13 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) { short base_offset; - chat("add_structure_typeinfo: var %p, name %s, type %p\n", - var, var->name, var->declspec.type); + chat("add_structure_typeinfo: var %p (%s), type %p (%s)\n", + var, var->name, var->declspec.type, var->declspec.type->name); init_sltg_data(&var_data[i]); base_offset = var_data_size + (i + 1) * sizeof(struct sltg_variable); - type_desc_offset[i] = write_var_desc(&var_data[i], var->declspec.type, 0, base_offset, &size_instance, &hrefmap); + type_desc_offset[i] = write_var_desc(typelib, &var_data[i], var->declspec.type, 0, base_offset, &size_instance, &hrefmap); dump_var_desc(var_data[i].data, var_data[i].size); if (var_data[i].size > sizeof(short)) @@ -856,6 +889,8 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) } } + index_name = add_typeinfo_block(typelib, type, TKIND_RECORD); + init_typeinfo(&ti, type, TKIND_RECORD, &hrefmap); append_data(&data, &ti, sizeof(ti));

1 0

Rémi Bernon : winevulkan: Add a manual vkQueuePresent wrapper.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: de4edeaa24ad789705f10d8d6e5cf74f3e2d8479 URL: https://gitlab.winehq.org/wine/wine/-/commit/de4edeaa24ad789705f10d8d6e5cf7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 10 11:03:54 2023 +0100 winevulkan: Add a manual vkQueuePresent wrapper. --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 28 +++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 66 ++++------------------------------------- dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 35 insertions(+), 61 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7e3a7d04b19..7990336706e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -260,6 +260,7 @@ MANUAL_UNIX_THUNKS = { "vkGetPhysicalDeviceSurfaceFormats2KHR", "vkMapMemory", "vkMapMemory2KHR", + "vkQueuePresentKHR", "vkUnmapMemory", "vkUnmapMemory2KHR", } diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 571c1d54575..e906734a506 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1680,6 +1680,34 @@ void wine_vkDestroySwapchainKHR(VkDevice device_handle, VkSwapchainKHR swapchain free(swapchain); } +VkResult wine_vkQueuePresentKHR(VkQueue queue_handle, const VkPresentInfoKHR *present_info) +{ + VkSwapchainKHR swapchains_buffer[16], *swapchains = swapchains_buffer; + struct wine_queue *queue = wine_queue_from_handle(queue_handle); + VkPresentInfoKHR present_info_host = *present_info; + struct wine_device *device = queue->device; + VkResult res; + UINT i; + + if (present_info->swapchainCount > ARRAY_SIZE(swapchains_buffer) && + !(swapchains = malloc(present_info->swapchainCount * sizeof(*swapchains)))) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + for (i = 0; i < present_info->swapchainCount; i++) + { + struct wine_swapchain *swapchain = wine_swapchain_from_handle(present_info->pSwapchains[i]); + swapchains[i] = swapchain->host_swapchain; + } + + present_info_host.pSwapchains = swapchains; + + res = device->funcs.p_vkQueuePresentKHR(queue->host_queue, &present_info_host); + + if (swapchains != swapchains_buffer) free(swapchains); + + return res; +} + VkResult wine_vkAllocateMemory(VkDevice handle, const VkMemoryAllocateInfo *alloc_info, const VkAllocationCallbacks *allocator, VkDeviceMemory *ret) { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 9075b5ff11f..7ec0300e8cb 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -29299,57 +29299,7 @@ static inline const VkPresentRegionKHR *convert_VkPresentRegionKHR_array_win32_t return out; } -#ifdef _WIN64 -static inline const VkSwapchainKHR *convert_VkSwapchainKHR_array_win64_to_driver(struct conversion_context *ctx, const VkSwapchainKHR *in, uint32_t count) -{ - VkSwapchainKHR *out; - unsigned int i; - - if (!in || !count) return NULL; - - out = conversion_context_alloc(ctx, count * sizeof(*out)); - for (i = 0; i < count; i++) - { - out[i] = wine_swapchain_from_handle(in[i])->host_swapchain; - } - - return out; -} -#endif /* _WIN64 */ - -static inline const VkSwapchainKHR *convert_VkSwapchainKHR_array_win32_to_driver(struct conversion_context *ctx, const VkSwapchainKHR *in, uint32_t count) -{ - VkSwapchainKHR *out; - unsigned int i; - - if (!in || !count) return NULL; - - out = conversion_context_alloc(ctx, count * sizeof(*out)); - for (i = 0; i < count; i++) - { - out[i] = wine_swapchain_from_handle(in[i])->host_swapchain; - } - - return out; -} - -#ifdef _WIN64 -static inline void convert_VkPresentInfoKHR_win64_to_driver(struct conversion_context *ctx, const VkPresentInfoKHR *in, VkPresentInfoKHR *out) -{ - if (!in) return; - - out->sType = in->sType; - out->pNext = in->pNext; - out->waitSemaphoreCount = in->waitSemaphoreCount; - out->pWaitSemaphores = in->pWaitSemaphores; - out->swapchainCount = in->swapchainCount; - out->pSwapchains = convert_VkSwapchainKHR_array_win64_to_driver(ctx, in->pSwapchains, in->swapchainCount); - out->pImageIndices = in->pImageIndices; - out->pResults = in->pResults; -} -#endif /* _WIN64 */ - -static inline void convert_VkPresentInfoKHR_win32_to_driver(struct conversion_context *ctx, const VkPresentInfoKHR32 *in, VkPresentInfoKHR *out) +static inline void convert_VkPresentInfoKHR_win32_to_unwrapped_host(struct conversion_context *ctx, const VkPresentInfoKHR32 *in, VkPresentInfoKHR *out) { const VkBaseInStructure32 *in_header; VkBaseOutStructure *out_header = (void *)out; @@ -29361,7 +29311,7 @@ static inline void convert_VkPresentInfoKHR_win32_to_driver(struct conversion_co out->waitSemaphoreCount = in->waitSemaphoreCount; out->pWaitSemaphores = (const VkSemaphore *)UlongToPtr(in->pWaitSemaphores); out->swapchainCount = in->swapchainCount; - out->pSwapchains = convert_VkSwapchainKHR_array_win32_to_driver(ctx, (const VkSwapchainKHR *)UlongToPtr(in->pSwapchains), in->swapchainCount); + out->pSwapchains = (const VkSwapchainKHR *)UlongToPtr(in->pSwapchains); out->pImageIndices = (const uint32_t *)UlongToPtr(in->pImageIndices); out->pResults = (VkResult *)UlongToPtr(in->pResults); @@ -45145,16 +45095,10 @@ static NTSTATUS thunk32_vkQueueNotifyOutOfBandNV(void *args) static NTSTATUS thunk64_vkQueuePresentKHR(void *args) { struct vkQueuePresentKHR_params *params = args; - VkPresentInfoKHR pPresentInfo_host; - struct conversion_context local_ctx; - struct conversion_context *ctx = &local_ctx; TRACE("%p, %p\n", params->queue, params->pPresentInfo); - init_conversion_context(ctx); - convert_VkPresentInfoKHR_win64_to_driver(ctx, params->pPresentInfo, &pPresentInfo_host); - params->result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueuePresentKHR(wine_queue_from_handle(params->queue)->host_queue, &pPresentInfo_host); - free_conversion_context(ctx); + params->result = wine_vkQueuePresentKHR(params->queue, params->pPresentInfo); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -45174,8 +45118,8 @@ static NTSTATUS thunk32_vkQueuePresentKHR(void *args) TRACE("%#x, %#x\n", params->queue, params->pPresentInfo); init_conversion_context(ctx); - convert_VkPresentInfoKHR_win32_to_driver(ctx, (const VkPresentInfoKHR32 *)UlongToPtr(params->pPresentInfo), &pPresentInfo_host); - params->result = wine_queue_from_handle((VkQueue)UlongToPtr(params->queue))->device->funcs.p_vkQueuePresentKHR(wine_queue_from_handle((VkQueue)UlongToPtr(params->queue))->host_queue, &pPresentInfo_host); + convert_VkPresentInfoKHR_win32_to_unwrapped_host(ctx, (const VkPresentInfoKHR32 *)UlongToPtr(params->pPresentInfo), &pPresentInfo_host); + params->result = wine_vkQueuePresentKHR((VkQueue)UlongToPtr(params->queue), &pPresentInfo_host); free_conversion_context(ctx); return STATUS_SUCCESS; } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 5fe178d52b5..699a21c580e 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -64,6 +64,7 @@ VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physica VkResult wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, uint32_t *pSurfaceFormatCount, VkSurfaceFormat2KHR *pSurfaceFormats); VkResult wine_vkMapMemory(VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void **ppData); VkResult wine_vkMapMemory2KHR(VkDevice device, const VkMemoryMapInfoKHR *pMemoryMapInfo, void **ppData); +VkResult wine_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *pPresentInfo); void wine_vkUnmapMemory(VkDevice device, VkDeviceMemory memory); VkResult wine_vkUnmapMemory2KHR(VkDevice device, const VkMemoryUnmapInfoKHR *pMemoryUnmapInfo);

1 0

Hans Leidekker : msi/tests: Try restarting tests elevated.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: a6eb51f0e595b2e5ddc521fb61b10d72849dd0f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6eb51f0e595b2e5ddc521fb61b10d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 5 09:29:18 2024 +0200 msi/tests: Try restarting tests elevated. Wine starts processes non-elevated since e92ba2de43d7afbe0704b11b29f7c30f44dfaeca which means that many tests are skipped now. --- dlls/msi/tests/action.c | 105 ++++++++++++++++++++++++++++------------- dlls/msi/tests/automation.c | 4 +- dlls/msi/tests/install.c | 111 ++++++++++++++++++-------------------------- dlls/msi/tests/msi.c | 26 ++++++----- dlls/msi/tests/package.c | 6 ++- dlls/msi/tests/patch.c | 8 ++-- dlls/msi/tests/source.c | 10 ++-- dlls/msi/tests/utils.h | 3 +- 8 files changed, 153 insertions(+), 120 deletions(-)

1 0

Paul Gofman : winhttp/tests: Add some tests for actual connection caching.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 11b8243f062b651b25b3b62f771e32b7fe0d364c URL: https://gitlab.winehq.org/wine/wine/-/commit/11b8243f062b651b25b3b62f771e32… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 8 22:35:05 2024 -0600 winhttp/tests: Add some tests for actual connection caching. --- dlls/winhttp/tests/winhttp.c | 114 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 102 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1724612202a..5d0ccd11f52 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2197,6 +2197,12 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char okmsg_length0[] = +"HTTP/1.1 200 OK\r\n" +"Server: winetest\r\n" +"Content-length: 0\r\n" +"\r\n"; + static const char notokmsg[] = "HTTP/1.1 400 Bad Request\r\n" "\r\n"; @@ -2324,6 +2330,24 @@ static void create_websocket_accept(const char *key, char *buf, unsigned int buf CryptBinaryToStringA( (BYTE *)sha1, sizeof(sha1), CRYPT_STRING_BASE64, buf, &len); } +static int server_receive_request(int c, char *buffer, size_t buffer_size) +{ + int i, r; + + memset(buffer, 0, buffer_size); + for(i = 0; i < buffer_size - 1; i++) + { + r = recv(c, &buffer[i], 1, 0); + if (r != 1) + break; + if (i < 4) continue; + if (buffer[i - 2] == '\n' && buffer[i] == '\n' && + buffer[i - 3] == '\r' && buffer[i - 1] == '\r') + break; + } + return r; +} + static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; @@ -2357,18 +2381,7 @@ static DWORD CALLBACK server_thread(LPVOID param) do { if (c == -1) c = accept(s, NULL, NULL); - - memset(buffer, 0, sizeof buffer); - for(i = 0; i < sizeof buffer - 1; i++) - { - r = recv(c, &buffer[i], 1, 0); - if (r != 1) - break; - if (i < 4) continue; - if (buffer[i - 2] == '\n' && buffer[i] == '\n' && - buffer[i - 3] == '\r' && buffer[i - 1] == '\r') - break; - } + server_receive_request(c, buffer, sizeof(buffer)); if (strstr(buffer, "GET /basic")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -2569,6 +2582,23 @@ static DWORD CALLBACK server_thread(LPVOID param) } send(c, okmsg, sizeof(okmsg) - 1, 0); } + + if (strstr(buffer, "GET /cached")) + { + send(c, okmsg_length0, sizeof okmsg_length0 - 1, 0); + r = server_receive_request(c, buffer, sizeof(buffer)); + ok(r > 0, "got %d.\n", r); + ok(!!strstr(buffer, "GET /cached"), "request not found.\n"); + send(c, okmsg_length0, sizeof okmsg_length0 - 1, 0); + r = server_receive_request(c, buffer, sizeof(buffer)); + todo_wine ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0]); + } + if (strstr(buffer, "GET /notcached")) + { + send(c, okmsg, sizeof okmsg - 1, 0); + r = server_receive_request(c, buffer, sizeof(buffer)); + ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0] ); + } shutdown(c, 2); closesocket(c); c = -1; @@ -5884,6 +5914,65 @@ static void test_client_cert_authentication(void) WinHttpCloseHandle( ses ); } +static void test_connection_cache(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + char buffer[256]; + BOOL ret; + + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); + + con = WinHttpConnect(ses, L"localhost", port, 0); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); + + req = WinHttpOpenRequest(con, L"GET", L"/cached", NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %lu\n", GetLastError()); + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %lu\n", GetLastError()); + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); + ret = WinHttpReadData(req, buffer, sizeof buffer, &size); + ok(ret, "failed to read data %lu\n", GetLastError()); + ok(!size, "got size %lu.\n", size); + WinHttpCloseHandle(req); + + req = WinHttpOpenRequest(con, L"GET", L"/cached", NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); + ret = WinHttpSendRequest(req, L"Connection: close", ~0ul, NULL, 0, 0, 0); + ok(ret, "failed to send request %lu\n", GetLastError()); + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %lu\n", GetLastError()); + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); + ret = WinHttpReadData(req, buffer, sizeof buffer, &size); + ok(ret, "failed to read data %lu\n", GetLastError()); + ok(!size, "got size %lu.\n", size); + WinHttpCloseHandle(req); + + req = WinHttpOpenRequest(con, L"GET", L"/notcached", NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); + ret = WinHttpSendRequest(req, L"Connection: close", ~0ul, NULL, 0, 0, 0); + ok(ret, "failed to send request %lu\n", GetLastError()); + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %lu\n", GetLastError()); + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); + WinHttpCloseHandle(req); + + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + START_TEST (winhttp) { struct server_info si; @@ -5951,6 +6040,7 @@ START_TEST (winhttp) test_websocket(si.port); test_redirect(si.port); test_WinHttpGetProxyForUrl(si.port); + test_connection_cache(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, L"/quit");

1 0

Paul Gofman : winhttp: Do not cache connection if suggested by request headers.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: ff97d3976ec0ee5444afddecfca5198cf2e53a1c URL: https://gitlab.winehq.org/wine/wine/-/commit/ff97d3976ec0ee5444afddecfca519… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 8 22:45:08 2024 -0600 winhttp: Do not cache connection if suggested by request headers. --- dlls/winhttp/request.c | 20 +++++++++----------- dlls/winhttp/tests/winhttp.c | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1b6cb1e2a45..207f1ec5c61 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1922,7 +1922,7 @@ static DWORD refill_buffer( struct request *request, BOOL notify ) static void finished_reading( struct request *request ) { - BOOL close = FALSE, notify; + BOOL close = FALSE, close_request_headers; WCHAR connection[20]; DWORD size = sizeof(connection); @@ -1937,18 +1937,16 @@ static void finished_reading( struct request *request ) } else if (!wcscmp( request->version, L"HTTP/1.0" )) close = TRUE; - if (close) + size = sizeof(connection); + close_request_headers = + (!query_headers( request, WINHTTP_QUERY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, NULL, connection, &size, NULL ) + || !query_headers( request, WINHTTP_QUERY_PROXY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, NULL, connection, &size, NULL )) + && !wcsicmp( connection, L"close" ); + if (close || close_request_headers) { - size = sizeof(connection); - notify = (!query_headers( request, WINHTTP_QUERY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - NULL, connection, &size, NULL ) - || !query_headers( request, WINHTTP_QUERY_PROXY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - NULL, connection, &size, NULL )) - && !wcsicmp( connection, L"close" ); - - if (notify) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 0 ); + if (close_request_headers) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 0 ); netconn_release( request->netconn ); - if (notify) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 ); + if (close_request_headers) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 ); } else cache_connection( request->netconn ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5d0ccd11f52..ee01fd5ec72 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2591,7 +2591,7 @@ static DWORD CALLBACK server_thread(LPVOID param) ok(!!strstr(buffer, "GET /cached"), "request not found.\n"); send(c, okmsg_length0, sizeof okmsg_length0 - 1, 0); r = server_receive_request(c, buffer, sizeof(buffer)); - todo_wine ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0]); + ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0]); } if (strstr(buffer, "GET /notcached")) {

1 0

Paul Gofman : wow64: Support generic xstate in call_user_exception_dispatcher().
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 34e49897a39812837bc4c1cdcf4ca274185483c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/34e49897a39812837bc4c1cdcf4ca2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 8 16:52:19 2024 -0600 wow64: Support generic xstate in call_user_exception_dispatcher(). --- dlls/wow64/syscall.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 40eb5327934..9ad1194b21e 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -197,17 +197,12 @@ static void __attribute__((used)) call_user_exception_dispatcher( EXCEPTION_RECO ULONG context_ptr; /* 004 */ EXCEPTION_RECORD32 rec; /* 008 */ I386_CONTEXT context; /* 058 */ - CONTEXT_EX32 context_ex; /* 324 */ - BYTE xstate[sizeof(XSTATE)+64]; /* 33c */ - DWORD align; /* 4bc */ } *stack; I386_CONTEXT ctx = { CONTEXT_I386_ALL }; CONTEXT_EX *context_ex, *src_ex = NULL; - ULONG flags; + ULONG flags, context_length; C_ASSERT( offsetof(struct exc_stack_layout32, context) == 0x58 ); - C_ASSERT( offsetof(struct exc_stack_layout32, xstate) == 0x33c ); - C_ASSERT( sizeof(struct exc_stack_layout32) == 0x4c0 ); pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); @@ -231,29 +226,20 @@ static void __attribute__((used)) call_user_exception_dispatcher( EXCEPTION_RECO flags = ctx.ContextFlags; if (src_ex) flags |= CONTEXT_I386_XSTATE; - stack = (struct exc_stack_layout32 *)ULongToPtr( ctx.Esp & ~3 ) - 1; + RtlGetExtendedContextLength( flags, &context_length ); + + stack = (struct exc_stack_layout32 *)ULongToPtr( (ctx.Esp - offsetof(struct exc_stack_layout32, context) - context_length) & ~3 ); stack->rec_ptr = PtrToUlong( &stack->rec ); stack->context_ptr = PtrToUlong( &stack->context ); stack->rec = *rec; stack->context = ctx; RtlInitializeExtendedContext( &stack->context, flags, &context_ex ); + if (src_ex) RtlCopyExtendedContext( context_ex, WOW64_CONTEXT_XSTATE, src_ex ); + /* adjust Eip for breakpoints in software emulation (hardware exceptions already adjust Rip) */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT && (wow64info->CpuFlags & WOW64_CPUFLAGS_SOFTWARE)) stack->context.Eip--; - if (src_ex) - { - XSTATE *src_xs = (XSTATE *)((char *)src_ex + src_ex->XState.Offset); - XSTATE *dst_xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); - - dst_xs->Mask = src_xs->Mask & ~(ULONG64)3; - dst_xs->CompactionMask = src_xs->CompactionMask; - if ((dst_xs->Mask & 4) && - src_ex->XState.Length >= sizeof(XSTATE) && - context_ex->XState.Length >= sizeof(XSTATE)) - memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); - } - ctx.Esp = PtrToUlong( stack ); ctx.Eip = pLdrSystemDllInitBlock->pKiUserExceptionDispatcher; ctx.EFlags &= ~(0x100|0x400|0x40000);

1 0