December 2023 - Wine-Commits

Rémi Bernon : winevulkan: Use "host" more consistently instead of "native".
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 288d2c2ef658b4041216fde295ba6d7e399dacb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/288d2c2ef658b4041216fde295ba6d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 17:08:37 2023 +0100 winevulkan: Use "host" more consistently instead of "native". We often use "native" to talk about Windows "native" code, which is confusing here. --- dlls/winevulkan/make_vulkan | 42 +- dlls/winevulkan/vulkan.c | 203 ++-- dlls/winevulkan/vulkan_private.h | 28 +- dlls/winevulkan/vulkan_thunks.c | 2114 +++++++++++++++++++------------------- dlls/winewayland.drv/vulkan.c | 2 +- include/wine/vulkan_driver.h | 2 +- 6 files changed, 1196 insertions(+), 1195 deletions(-)

1 0

Rémi Bernon : winex11: Use "host" instead of "native" in vulkan wrappers.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: c0042af5cc2f6d03e3875f4cd4a7c97315dd0ab2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0042af5cc2f6d03e3875f4cd4a7c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 24 21:31:38 2023 +0100 winex11: Use "host" instead of "native" in vulkan wrappers. --- dlls/winex11.drv/vulkan.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 101504a7887..8d1da4d0ddc 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -60,7 +60,7 @@ struct wine_vk_surface LONG ref; struct list entry; Window window; - VkSurfaceKHR surface; /* native surface */ + VkSurfaceKHR host_surface; HWND hwnd; DWORD hwnd_thread_id; }; @@ -295,7 +295,7 @@ static VkResult X11DRV_vkCreateSwapchainKHR(VkDevice device, return VK_ERROR_SURFACE_LOST_KHR; create_info_host = *create_info; - create_info_host.surface = x11_surface->surface; + create_info_host.surface = x11_surface->host_surface; return pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); } @@ -351,7 +351,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.dpy = gdi_display; create_info_host.window = x11_surface->window; - res = pvkCreateXlibSurfaceKHR(instance, &create_info_host, NULL /* allocator */, &x11_surface->surface); + res = pvkCreateXlibSurfaceKHR( instance, &create_info_host, NULL /* allocator */, &x11_surface->host_surface ); if (res != VK_SUCCESS) { ERR("Failed to create Xlib surface, res=%d\n", res); @@ -400,7 +400,7 @@ static void X11DRV_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ if (x11_surface) { - pvkDestroySurfaceKHR(instance, x11_surface->surface, NULL /* allocator */); + pvkDestroySurfaceKHR( instance, x11_surface->host_surface, NULL /* allocator */ ); wine_vk_surface_release(x11_surface); } @@ -465,10 +465,10 @@ static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(surface), flags); - return pvkGetDeviceGroupSurfacePresentModesKHR(device, x11_surface->surface, flags); + return pvkGetDeviceGroupSurfacePresentModesKHR( device, x11_surface->host_surface, flags ); } -static const char *wine_vk_native_fn_name(const char *name) +static const char *wine_vk_host_fn_name( const char *name ) { if (!strcmp(name, "vkCreateWin32SurfaceKHR")) return "vkCreateXlibSurfaceKHR"; @@ -484,8 +484,7 @@ static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) TRACE("%p, %s\n", device, debugstr_a(name)); - if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) - return NULL; + if (!pvkGetDeviceProcAddr( device, wine_vk_host_fn_name( name ) )) return NULL; if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) return proc_addr; @@ -499,8 +498,7 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); - if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) - return NULL; + if (!pvkGetInstanceProcAddr( instance, wine_vk_host_fn_name( name ) )) return NULL; if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) return proc_addr; @@ -524,7 +522,7 @@ static VkResult X11DRV_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice return VK_SUCCESS; } - return pvkGetPhysicalDevicePresentRectanglesKHR(phys_dev, x11_surface->surface, count, rects); + return pvkGetPhysicalDevicePresentRectanglesKHR( phys_dev, x11_surface->host_surface, count, rects ); } static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, @@ -534,7 +532,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevi TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); surface_info_host = *surface_info; - surface_info_host.surface = surface_from_handle(surface_info->surface)->surface; + surface_info_host.surface = surface_from_handle( surface_info->surface )->host_surface; if (pvkGetPhysicalDeviceSurfaceCapabilities2KHR) return pvkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, &surface_info_host, capabilities); @@ -556,7 +554,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevic if (!x11_surface->hwnd) return VK_ERROR_SURFACE_LOST_KHR; - return pvkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, x11_surface->surface, capabilities); + return pvkGetPhysicalDeviceSurfaceCapabilitiesKHR( phys_dev, x11_surface->host_surface, capabilities ); } static VkResult X11DRV_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice phys_dev, @@ -569,7 +567,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice ph TRACE("%p, %p, %p, %p\n", phys_dev, surface_info, count, formats); surface_info_host = *surface_info; - surface_info_host.surface = surface_from_handle(surface_info->surface)->surface; + surface_info_host.surface = surface_from_handle( surface_info->surface )->host_surface; if (pvkGetPhysicalDeviceSurfaceFormats2KHR) return pvkGetPhysicalDeviceSurfaceFormats2KHR(phys_dev, &surface_info_host, count, formats); @@ -601,7 +599,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice phy TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, formats); - return pvkGetPhysicalDeviceSurfaceFormatsKHR(phys_dev, x11_surface->surface, count, formats); + return pvkGetPhysicalDeviceSurfaceFormatsKHR( phys_dev, x11_surface->host_surface, count, formats ); } static VkResult X11DRV_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice phys_dev, @@ -611,7 +609,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevic TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, modes); - return pvkGetPhysicalDeviceSurfacePresentModesKHR(phys_dev, x11_surface->surface, count, modes); + return pvkGetPhysicalDeviceSurfacePresentModesKHR( phys_dev, x11_surface->host_surface, count, modes ); } static VkResult X11DRV_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice phys_dev, @@ -621,7 +619,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice phy TRACE("%p, %u, 0x%s, %p\n", phys_dev, index, wine_dbgstr_longlong(surface), supported); - return pvkGetPhysicalDeviceSurfaceSupportKHR(phys_dev, index, x11_surface->surface, supported); + return pvkGetPhysicalDeviceSurfaceSupportKHR( phys_dev, index, x11_surface->host_surface, supported ); } static VkBool32 X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, @@ -672,13 +670,13 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * return res; } -static VkSurfaceKHR X11DRV_wine_get_native_surface(VkSurfaceKHR surface) +static VkSurfaceKHR X11DRV_wine_get_host_surface( VkSurfaceKHR surface ) { struct wine_vk_surface *x11_surface = surface_from_handle(surface); TRACE("0x%s\n", wine_dbgstr_longlong(surface)); - return x11_surface->surface; + return x11_surface->host_surface; } static const struct vulkan_funcs vulkan_funcs = @@ -704,7 +702,7 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_vkGetSwapchainImagesKHR, X11DRV_vkQueuePresentKHR, - X11DRV_wine_get_native_surface, + X11DRV_wine_get_host_surface, }; static void *X11DRV_get_vk_device_proc_addr(const char *name)

1 0

Rémi Bernon : winevulkan: Remove unnecessary dispatch from make_vulkan.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: ecc54b84ad9008aeb4eb91449bccb2f182d7d086 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecc54b84ad9008aeb4eb91449bccb2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 4 14:06:07 2023 +0100 winevulkan: Remove unnecessary dispatch from make_vulkan. --- dlls/winevulkan/make_vulkan | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 794ed44e72e..e345c0d3287 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -180,11 +180,11 @@ class ThunkType(Enum): # - loader_thunk (default: ThunkType.PUBLIC): sets whether to create a thunk for unix funcs. FUNCTION_OVERRIDES = { # Global functions - "vkCreateInstance" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE, "extra_param" : "client_ptr"}, - "vkEnumerateInstanceExtensionProperties" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, - "vkEnumerateInstanceLayerProperties" : {"dispatch" : False, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, - "vkEnumerateInstanceVersion" : {"dispatch" : False, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, - "vkGetInstanceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, + "vkCreateInstance" : {"driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE, "extra_param" : "client_ptr"}, + "vkEnumerateInstanceExtensionProperties" : {"driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, + "vkEnumerateInstanceLayerProperties" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, + "vkEnumerateInstanceVersion" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, + "vkGetInstanceProcAddr" : {"driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, # Instance functions "vkCreateDevice" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE, "extra_param" : "client_ptr"},

1 0

Rémi Bernon : winewayland: Use "host" intead of "native" in vulkan wrappers.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 87e8b8a164bb766396e3271c13bd265beb2213c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/87e8b8a164bb766396e3271c13bd26… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 24 21:30:25 2023 +0100 winewayland: Use "host" intead of "native" in vulkan wrappers. --- dlls/winewayland.drv/vulkan.c | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 5c8d05e16ec..86eb65afa46 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -81,13 +81,13 @@ static struct list wine_vk_swapchain_list = LIST_INIT(wine_vk_swapchain_list); struct wine_vk_surface { struct wayland_client_surface *client; - VkSurfaceKHR native; + VkSurfaceKHR host_surface; }; struct wine_vk_swapchain { struct list entry; - VkSwapchainKHR native; + VkSwapchainKHR host_swapchain; HWND hwnd; VkExtent2D extent; }; @@ -143,7 +143,7 @@ static struct wine_vk_swapchain *wine_vk_swapchain_from_handle(VkSwapchainKHR ha LIST_FOR_EACH_ENTRY(wine_vk_swapchain, &wine_vk_swapchain_list, struct wine_vk_swapchain, entry) { - if (wine_vk_swapchain->native == handle) + if (wine_vk_swapchain->host_swapchain == handle) { pthread_mutex_unlock(&wine_vk_swapchain_mutex); return wine_vk_swapchain; @@ -197,7 +197,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo return VK_SUCCESS; } -static const char *wine_vk_native_fn_name(const char *name) +static const char *wine_vk_host_fn_name(const char *name) { if (!strcmp(name, "vkCreateWin32SurfaceKHR")) return "vkCreateWaylandSurfaceKHR"; @@ -347,7 +347,7 @@ static VkResult wayland_vkCreateSwapchainKHR(VkDevice device, wine_vk_swapchain->extent = create_info->imageExtent; create_info_host = *create_info; - create_info_host.surface = wine_vk_surface->native; + create_info_host.surface = wine_vk_surface->host_surface; /* Some apps do not properly handle a 0x0 image extent in capabilities, * and erroneously try to create a swapchain with it, so use the minimum @@ -368,7 +368,7 @@ static VkResult wayland_vkCreateSwapchainKHR(VkDevice device, return res; } - wine_vk_swapchain->native = *swapchain; + wine_vk_swapchain->host_swapchain = *swapchain; pthread_mutex_lock(&wine_vk_swapchain_mutex); list_add_head(&wine_vk_swapchain_list, &wine_vk_swapchain->entry); @@ -429,7 +429,7 @@ static VkResult wayland_vkCreateWin32SurfaceKHR(VkInstance instance, res = pvkCreateWaylandSurfaceKHR(instance, &create_info_host, NULL /* allocator */, - &wine_vk_surface->native); + &wine_vk_surface->host_surface); if (res != VK_SUCCESS) { ERR("Failed to create vulkan wayland surface, res=%d\n", res); @@ -470,7 +470,7 @@ static void wayland_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surfac /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ if (!wine_vk_surface) return; - pvkDestroySurfaceKHR(instance, wine_vk_surface->native, NULL /* allocator */); + pvkDestroySurfaceKHR(instance, wine_vk_surface->host_surface, NULL /* allocator */); wine_vk_surface_destroy(wine_vk_surface); } @@ -549,7 +549,7 @@ static VkResult wayland_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, if (!wine_vk_surface_is_valid(wine_vk_surface)) return VK_ERROR_SURFACE_LOST_KHR; - return pvkGetDeviceGroupSurfacePresentModesKHR(device, wine_vk_surface->native, flags); + return pvkGetDeviceGroupSurfacePresentModesKHR(device, wine_vk_surface->host_surface, flags); } static void *wayland_vkGetDeviceProcAddr(VkDevice device, const char *name) @@ -558,9 +558,9 @@ static void *wayland_vkGetDeviceProcAddr(VkDevice device, const char *name) TRACE("%p, %s\n", device, debugstr_a(name)); - /* Do not return the driver function if the corresponding native function + /* Do not return the driver function if the corresponding host function * is not available. */ - if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + if (!pvkGetDeviceProcAddr(device, wine_vk_host_fn_name(name))) return NULL; if ((proc_addr = get_vulkan_driver_device_proc_addr(&vulkan_funcs, name))) @@ -575,9 +575,9 @@ static void *wayland_vkGetInstanceProcAddr(VkInstance instance, const char *name TRACE("%p, %s\n", instance, debugstr_a(name)); - /* Do not return the driver function if the corresponding native function + /* Do not return the driver function if the corresponding host function * is not available. */ - if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + if (!pvkGetInstanceProcAddr(instance, wine_vk_host_fn_name(name))) return NULL; if ((proc_addr = get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name))) @@ -594,7 +594,7 @@ static VkResult wayland_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, rects); - return pvkGetPhysicalDevicePresentRectanglesKHR(phys_dev, wine_vk_surface->native, + return pvkGetPhysicalDevicePresentRectanglesKHR(phys_dev, wine_vk_surface->host_surface, count, rects); } @@ -609,7 +609,7 @@ static VkResult wayland_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDev TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); surface_info_host = *surface_info; - surface_info_host.surface = wine_vk_surface->native; + surface_info_host.surface = wine_vk_surface->host_surface; if (pvkGetPhysicalDeviceSurfaceCapabilities2KHR) { @@ -645,7 +645,7 @@ static VkResult wayland_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevi TRACE("%p, 0x%s, %p\n", phys_dev, wine_dbgstr_longlong(surface), capabilities); - res = pvkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, wine_vk_surface->native, + res = pvkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, wine_vk_surface->host_surface, capabilities); if (res == VK_SUCCESS) res = wine_vk_surface_update_caps(wine_vk_surface, capabilities); @@ -670,7 +670,7 @@ static VkResult wayland_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice p return VK_ERROR_SURFACE_LOST_KHR; surface_info_host = *surface_info; - surface_info_host.surface = wine_vk_surface->native; + surface_info_host.surface = wine_vk_surface->host_surface; if (pvkGetPhysicalDeviceSurfaceFormats2KHR) { @@ -718,7 +718,7 @@ static VkResult wayland_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice ph if (!wine_vk_surface_is_valid(wine_vk_surface)) return VK_ERROR_SURFACE_LOST_KHR; - return pvkGetPhysicalDeviceSurfaceFormatsKHR(phys_dev, wine_vk_surface->native, + return pvkGetPhysicalDeviceSurfaceFormatsKHR(phys_dev, wine_vk_surface->host_surface, count, formats); } @@ -734,7 +734,7 @@ static VkResult wayland_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevi if (!wine_vk_surface_is_valid(wine_vk_surface)) return VK_ERROR_SURFACE_LOST_KHR; - return pvkGetPhysicalDeviceSurfacePresentModesKHR(phys_dev, wine_vk_surface->native, + return pvkGetPhysicalDeviceSurfacePresentModesKHR(phys_dev, wine_vk_surface->host_surface, count, modes); } @@ -750,7 +750,7 @@ static VkResult wayland_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice ph if (!wine_vk_surface_is_valid(wine_vk_surface)) return VK_ERROR_SURFACE_LOST_KHR; - return pvkGetPhysicalDeviceSurfaceSupportKHR(phys_dev, index, wine_vk_surface->native, + return pvkGetPhysicalDeviceSurfaceSupportKHR(phys_dev, index, wine_vk_surface->host_surface, supported); } @@ -782,9 +782,9 @@ static VkResult wayland_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR return check_queue_present(present_info, res); } -static VkSurfaceKHR wayland_wine_get_native_surface(VkSurfaceKHR surface) +static VkSurfaceKHR wayland_wine_get_host_surface(VkSurfaceKHR surface) { - return wine_vk_surface_from_handle(surface)->native; + return wine_vk_surface_from_handle(surface)->host_surface; } static void wine_vk_init(void) @@ -849,7 +849,7 @@ static const struct vulkan_funcs vulkan_funcs = .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR, .p_vkGetSwapchainImagesKHR = wayland_vkGetSwapchainImagesKHR, .p_vkQueuePresentKHR = wayland_vkQueuePresentKHR, - .p_wine_get_host_surface = wayland_wine_get_native_surface, + .p_wine_get_host_surface = wayland_wine_get_host_surface, }; /**********************************************************************

1 0

Rémi Bernon : winevulkan: Omit defaults in make_vulkan FUNCTION_OVERRIDES.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 60cb635e7b747ff124677f2fc0999949581683de URL: https://gitlab.winehq.org/wine/wine/-/commit/60cb635e7b747ff124677f2fc09999… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 4 14:02:46 2023 +0100 winevulkan: Omit defaults in make_vulkan FUNCTION_OVERRIDES. --- dlls/winevulkan/make_vulkan | 135 ++++++++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 68 deletions(-)

1 0

Rémi Bernon : winemac: Use "host" instead of "native" in vulkan wrappers.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: ec1910da6a5faba0e1f801c8af63e768eaf1289f URL: https://gitlab.winehq.org/wine/wine/-/commit/ec1910da6a5faba0e1f801c8af63e7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 24 21:33:03 2023 +0100 winemac: Use "host" instead of "native" in vulkan wrappers. --- dlls/winemac.drv/vulkan.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 00f5e8465ab..22d47155861 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -56,7 +56,7 @@ struct wine_vk_surface { macdrv_metal_device device; macdrv_metal_view view; - VkSurfaceKHR surface; /* native surface */ + VkSurfaceKHR host_surface; /* host surface */ }; typedef struct VkMacOSSurfaceCreateInfoMVK @@ -194,7 +194,7 @@ static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface if (!surface) return; - pvkDestroySurfaceKHR(instance, surface->surface, NULL /* allocator */); + pvkDestroySurfaceKHR(instance, surface->host_surface, NULL /* allocator */); if (surface->view) macdrv_view_release_metal_view(surface->view); @@ -243,7 +243,7 @@ static VkResult macdrv_vkCreateSwapchainKHR(VkDevice device, FIXME("Support for allocation callbacks not implemented yet\n"); create_info_host = *create_info; - create_info_host.surface = surface_from_handle(create_info->surface)->surface; + create_info_host.surface = surface_from_handle(create_info->surface)->host_surface; return pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); @@ -301,7 +301,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.flags = 0; /* reserved */ create_info_host.pLayer = macdrv_view_get_metal_layer(mac_surface->view); - res = pvkCreateMetalSurfaceEXT(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); + res = pvkCreateMetalSurfaceEXT(instance, &create_info_host, NULL /* allocator */, &mac_surface->host_surface); } else { @@ -311,7 +311,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.flags = 0; /* reserved */ create_info_host.pView = macdrv_view_get_metal_layer(mac_surface->view); - res = pvkCreateMacOSSurfaceMVK(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); + res = pvkCreateMacOSSurfaceMVK(instance, &create_info_host, NULL /* allocator */, &mac_surface->host_surface); } if (res != VK_SUCCESS) { @@ -419,7 +419,7 @@ static VkResult macdrv_vkEnumerateInstanceExtensionProperties(const char *layer_ return res; } -static const char *wine_vk_native_fn_name(const char *name) +static const char *wine_vk_host_fn_name(const char *name) { const char *create_surface_name = pvkCreateMetalSurfaceEXT ? "vkCreateMetalSurfaceEXT" : "vkCreateMacOSSurfaceMVK"; @@ -427,7 +427,7 @@ static const char *wine_vk_native_fn_name(const char *name) if (!strcmp(name, "vkCreateWin32SurfaceKHR")) return create_surface_name; /* We just need something where non-NULL is returned if the correct extension is enabled. - * So since there is no native equivalent of this function check for the create + * So since there is no host equivalent of this function check for the create * surface function. */ if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) @@ -442,7 +442,7 @@ static void *macdrv_vkGetDeviceProcAddr(VkDevice device, const char *name) TRACE("%p, %s\n", device, debugstr_a(name)); - if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + if (!pvkGetDeviceProcAddr(device, wine_vk_host_fn_name(name))) return NULL; if ((proc_addr = macdrv_get_vk_device_proc_addr(name))) @@ -457,7 +457,7 @@ static void *macdrv_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); - if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + if (!pvkGetInstanceProcAddr(instance, wine_vk_host_fn_name(name))) return NULL; if ((proc_addr = macdrv_get_vk_instance_proc_addr(instance, name))) @@ -474,7 +474,7 @@ static VkResult macdrv_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevi TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); surface_info_host = *surface_info; - surface_info_host.surface = surface_from_handle(surface_info->surface)->surface; + surface_info_host.surface = surface_from_handle(surface_info->surface)->host_surface; return pvkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, &surface_info_host, capabilities); } @@ -486,7 +486,7 @@ static VkResult macdrv_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevic TRACE("%p, 0x%s, %p\n", phys_dev, wine_dbgstr_longlong(surface), capabilities); - return pvkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, mac_surface->surface, + return pvkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, mac_surface->host_surface, capabilities); } @@ -498,7 +498,7 @@ static VkResult macdrv_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice ph TRACE("%p, %p, %p, %p\n", phys_dev, surface_info, count, formats); surface_info_host = *surface_info; - surface_info_host.surface = surface_from_handle(surface_info->surface)->surface; + surface_info_host.surface = surface_from_handle(surface_info->surface)->host_surface; return pvkGetPhysicalDeviceSurfaceFormats2KHR(phys_dev, &surface_info_host, count, formats); } @@ -510,7 +510,7 @@ static VkResult macdrv_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice phy TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, formats); - return pvkGetPhysicalDeviceSurfaceFormatsKHR(phys_dev, mac_surface->surface, + return pvkGetPhysicalDeviceSurfaceFormatsKHR(phys_dev, mac_surface->host_surface, count, formats); } @@ -521,7 +521,7 @@ static VkResult macdrv_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevic TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, modes); - return pvkGetPhysicalDeviceSurfacePresentModesKHR(phys_dev, mac_surface->surface, count, + return pvkGetPhysicalDeviceSurfacePresentModesKHR(phys_dev, mac_surface->host_surface, count, modes); } @@ -532,7 +532,7 @@ static VkResult macdrv_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice phy TRACE("%p, %u, 0x%s, %p\n", phys_dev, index, wine_dbgstr_longlong(surface), supported); - return pvkGetPhysicalDeviceSurfaceSupportKHR(phys_dev, index, mac_surface->surface, + return pvkGetPhysicalDeviceSurfaceSupportKHR(phys_dev, index, mac_surface->host_surface, supported); } @@ -580,13 +580,13 @@ static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * return res; } -static VkSurfaceKHR macdrv_wine_get_native_surface(VkSurfaceKHR surface) +static VkSurfaceKHR macdrv_wine_get_host_surface(VkSurfaceKHR surface) { struct wine_vk_surface *mac_surface = surface_from_handle(surface); TRACE("0x%s\n", wine_dbgstr_longlong(surface)); - return mac_surface->surface; + return mac_surface->host_surface; } static const struct vulkan_funcs vulkan_funcs = @@ -612,7 +612,7 @@ static const struct vulkan_funcs vulkan_funcs = macdrv_vkGetSwapchainImagesKHR, macdrv_vkQueuePresentKHR, - macdrv_wine_get_native_surface, + macdrv_wine_get_host_surface, }; static void *macdrv_get_vk_device_proc_addr(const char *name)

1 0

Paul Gofman : winhttp: Handle chunked requests.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 0080205dbd15e873204496df6411b1eee50ff482 URL: https://gitlab.winehq.org/wine/wine/-/commit/0080205dbd15e873204496df6411b1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Dec 1 21:30:30 2023 -0600 winhttp: Handle chunked requests. --- dlls/winhttp/request.c | 10 ++++++-- dlls/winhttp/tests/winhttp.c | 55 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index aed26d98c07..84af8e58988 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2216,8 +2216,10 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD struct connect *connect = request->connect; struct session *session = connect->session; DWORD ret, len, buflen, content_length; + WCHAR encoding[20]; char *wire_req; int bytes_sent; + BOOL chunked; TRACE( "request state %d.\n", request->state ); @@ -2245,7 +2247,11 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD if (request->creds[TARGET_SERVER][SCHEME_BASIC].username) do_authorization( request, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC ); - if (total_len || (request->verb && (!wcscmp( request->verb, L"POST" ) || !wcscmp( request->verb, L"PUT" )))) + buflen = sizeof(encoding); + chunked = !query_headers( request, WINHTTP_QUERY_FLAG_REQUEST_HEADERS | WINHTTP_QUERY_TRANSFER_ENCODING, + NULL, encoding, &buflen, NULL ) && !wcsicmp( encoding, L"chunked" ); + if (!chunked && (total_len || (request->verb && (!wcscmp( request->verb, L"POST" ) + || !wcscmp( request->verb, L"PUT" ))))) { WCHAR length[21]; /* decimal long int + null */ swprintf( length, ARRAY_SIZE(length), L"%ld", total_len ); @@ -2311,7 +2317,7 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD | WINHTTP_QUERY_FLAG_NUMBER, NULL, &content_length, &buflen, NULL )) content_length = total_len; - if (content_length <= optional_len) + if (!chunked && content_length <= optional_len) { netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); request->read_reply_status = read_reply( request ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ce2ce795209..09abc4c5854 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2541,9 +2541,21 @@ static DWORD CALLBACK server_thread(LPVOID param) ok(!!strstr(buffer, "Cookie: 111\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); send(c, okmsg, sizeof(okmsg) - 1, 0); } - if (strstr(buffer, "PUT /test")) + + if (strstr(buffer, "PUT /test") || strstr(buffer, "POST /test")) { - ok(!!strstr(buffer, "Content-Length: 0\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + if (strstr(buffer, "Transfer-Encoding: chunked\r\n")) + { + ok(!strstr(buffer, "Content-Length:"), "Unexpected Content-Length in request %s.\n", debugstr_a(buffer)); + r = recv(c, buffer, sizeof(buffer), 0); + ok(r == 4, "got %d.\n", r); + buffer[r] = 0; + ok(!strcmp(buffer, "post"), "got %s.\n", debugstr_a(buffer)); + } + else + { + ok(!!strstr(buffer, "Content-Length: 0\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + } send(c, okmsg, sizeof(okmsg) - 1, 0); } shutdown(c, 2); @@ -2653,6 +2665,44 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) WinHttpCloseHandle(ses); } +static void test_chunked_request(int port) +{ + static const WCHAR *methods[] = {L"POST", L"PUT"}; + HINTERNET ses, con, req; + char buffer[0x100]; + unsigned int i; + DWORD count; + 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()); + for (i = 0; i < ARRAY_SIZE(methods); ++i) + { + req = WinHttpOpenRequest(con, methods[i], L"/test", NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); + + ret = WinHttpAddRequestHeaders(req, L"Transfer-Encoding: chunked", -1, WINHTTP_ADDREQ_FLAG_ADD); + ok(ret, "failed to add header %lu\n", GetLastError()); + + strcpy(buffer, "post"); + ret = WinHttpSendRequest(req, NULL, 0, buffer, 4, 4, 0); + ok(ret, "failed to send request %lu\n", GetLastError()); + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %lu\n", GetLastError()); + count = 0; + memset(buffer, 0, sizeof(buffer)); + ret = WinHttpReadData(req, buffer, sizeof buffer, &count); + ok(ret, "failed to read data %lu\n", GetLastError()); + ok(!count, "got count %ld\n", count); + WinHttpCloseHandle(req); + } + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + static void test_basic_authentication(int port) { HINTERNET ses, con, req; @@ -5824,6 +5874,7 @@ START_TEST (winhttp) test_connection_info(si.port); test_basic_request(si.port, NULL, L"/basic"); test_basic_request(si.port, L"PUT", L"/test"); + test_chunked_request(si.port); test_no_headers(si.port); test_no_content(si.port); test_head_request(si.port);

1 0

Zhiyi Zhang : tasklist: Fix a possible buffer overrun (Coverity).
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 1a6deb1cc3a40757b14910f84d882c108d56909b URL: https://gitlab.winehq.org/wine/wine/-/commit/1a6deb1cc3a40757b14910f84d882c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 23:16:05 2023 +0800 tasklist: Fix a possible buffer overrun (Coverity). process_entry->szExeFile has length of MAX_PATH but info->image_name only has 32. --- programs/tasklist/tasklist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c index 4f866f6b727..6bbb9921d4f 100644 --- a/programs/tasklist/tasklist.c +++ b/programs/tasklist/tasklist.c @@ -176,7 +176,7 @@ static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, stru info->pid_value = process_entry->th32ProcessID; info->memory_usage_value = memory_counters.WorkingSetSize / 1024; info->session_id_value = session_id; - wcscpy(info->image_name, process_entry->szExeFile); + lstrcpynW(info->image_name, process_entry->szExeFile, ARRAY_SIZE(info->image_name)); swprintf(info->pid, ARRAY_SIZE(info->pid), L"%u", process_entry->th32ProcessID); wcscpy(info->session_name, session_id == 0 ? L"Services" : L"Console"); swprintf(info->session_number, ARRAY_SIZE(info->session_number), L"%u", session_id);

1 0

Zhiyi Zhang : shell32: Fix a memory leak (Coverity).
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 2169dd9a550df42dd3cc10d6d53f8f48745de0bc URL: https://gitlab.winehq.org/wine/wine/-/commit/2169dd9a550df42dd3cc10d6d53f8f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 23:54:28 2023 +0800 shell32: Fix a memory leak (Coverity). --- dlls/shell32/dde.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 976dc2e394a..eea8b8ec4ce 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -165,6 +165,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, { free(groups_data); free(programs); + FindClose(hfind); return NULL; } groups_data = new_groups_data;

1 0

Zhiyi Zhang : wininet: Fix a use-after-free (Coverity).
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: d36f50c43841bb1e5abdc684724a6be355f94ade URL: https://gitlab.winehq.org/wine/wine/-/commit/d36f50c43841bb1e5abdc684724a6b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 23:23:02 2023 +0800 wininet: Fix a use-after-free (Coverity). pEntry could be freed after cache_container_unlock_index(pContainer, pHeader). --- dlls/wininet/urlcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 8e43eaae9f3..7975071ce91 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2550,8 +2550,8 @@ BOOL WINAPI UnlockUrlCacheEntryFileA(LPCSTR lpszUrlName, DWORD dwReserved) pEntry = (entry_header*)((LPBYTE)pHeader + pHashEntry->offset); if (pEntry->signature != URL_SIGNATURE) { - cache_container_unlock_index(pContainer, pHeader); FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->signature, sizeof(DWORD))); + cache_container_unlock_index(pContainer, pHeader); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; }

1 0