- Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Hold _ENV_LOCK when accessing environment variables.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 141aa0a2834b3e2d171607940a870460b5c033a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/141aa0a2834b3e2d171607940a8704… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 21 20:03:28 2023 +0100 msvcrt: Hold _ENV_LOCK when accessing environment variables. --- dlls/msvcrt/environ.c | 77 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 3c90ec4bf21..9e358d971f9 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "msvcrt.h" +#include "mtdll.h" #include <winnls.h> #include "wine/debug.h" @@ -220,9 +221,14 @@ static char * getenv_helper(const char *name) */ char * CDECL getenv(const char *name) { + char *ret; + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; - return getenv_helper(name); + _lock(_ENV_LOCK); + ret = getenv_helper(name); + _unlock(_ENV_LOCK); + return ret; } static wchar_t * wgetenv_helper(const wchar_t *name) @@ -242,9 +248,14 @@ static wchar_t * wgetenv_helper(const wchar_t *name) */ wchar_t * CDECL _wgetenv(const wchar_t *name) { + wchar_t *ret; + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; - return wgetenv_helper(name); + _lock(_ENV_LOCK); + ret = wgetenv_helper(name); + _unlock(_ENV_LOCK); + return ret; } static int putenv_helper(const char *name, const char *val, const char *eq) @@ -253,7 +264,10 @@ static int putenv_helper(const char *name, const char *val, const char *eq) char *env; int r; - if (env_init(FALSE, TRUE)) return -1; + _lock(_ENV_LOCK); + r = env_init(FALSE, TRUE); + _unlock(_ENV_LOCK); + if (r) return -1; if (eq) { @@ -279,7 +293,9 @@ static int putenv_helper(const char *name, const char *val, const char *eq) return -1; } + _lock(_ENV_LOCK); r = env_set(&env, &wenv); + _unlock(_ENV_LOCK); free(env); free(wenv); return r; @@ -303,7 +319,10 @@ static int wputenv_helper(const wchar_t *name, const wchar_t *val, const wchar_t char *env; int r; - if (env_init(TRUE, TRUE)) return -1; + _lock(_ENV_LOCK); + r = env_init(TRUE, TRUE); + _unlock(_ENV_LOCK); + if (r) return -1; if (eq) { @@ -329,7 +348,9 @@ static int wputenv_helper(const wchar_t *name, const wchar_t *val, const wchar_t return -1; } + _lock(_ENV_LOCK); r = env_set(&env, &wenv); + _unlock(_ENV_LOCK); free(env); free(wenv); return r; @@ -420,20 +441,25 @@ int CDECL _dupenv_s(char **buffer, size_t *numberOfElements, const char *varname if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; + _lock(_ENV_LOCK); if (!(e = getenv(varname))) { + _unlock(_ENV_LOCK); *buffer = NULL; if (numberOfElements) *numberOfElements = 0; return 0; } sz = strlen(e) + 1; - if (!(*buffer = malloc(sz))) + *buffer = malloc(sz); + if (*buffer) strcpy(*buffer, e); + _unlock(_ENV_LOCK); + + if (!*buffer) { if (numberOfElements) *numberOfElements = 0; return *_errno() = ENOMEM; } - strcpy(*buffer, e); if (numberOfElements) *numberOfElements = sz; return 0; } @@ -450,20 +476,25 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements, if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; + _lock(_ENV_LOCK); if (!(e = _wgetenv(varname))) { + _unlock(_ENV_LOCK); *buffer = NULL; if (numberOfElements) *numberOfElements = 0; return 0; } sz = wcslen(e) + 1; - if (!(*buffer = malloc(sz * sizeof(wchar_t)))) + *buffer = malloc(sz * sizeof(wchar_t)); + if (*buffer) wcscpy(*buffer, e); + _unlock(_ENV_LOCK); + + if (!*buffer) { if (numberOfElements) *numberOfElements = 0; return *_errno() = ENOMEM; } - wcscpy(*buffer, e); if (numberOfElements) *numberOfElements = sz; return 0; } @@ -482,12 +513,17 @@ int CDECL getenv_s(size_t *ret_len, char* buffer, size_t len, const char *varnam if (!MSVCRT_CHECK_PMT((buffer && len > 0) || (!buffer && !len))) return EINVAL; if (buffer) buffer[0] = 0; - if (!(e = getenv_helper(varname))) return 0; - *ret_len = strlen(e) + 1; - if (!len) return 0; - if (len < *ret_len) return ERANGE; + _lock(_ENV_LOCK); + e = getenv_helper(varname); + if (e) + { + *ret_len = strlen(e) + 1; + if (len >= *ret_len) strcpy(buffer, e); + } + _unlock(_ENV_LOCK); - strcpy(buffer, e); + if (!e || !len) return 0; + if (len < *ret_len) return ERANGE; return 0; } @@ -504,12 +540,17 @@ int CDECL _wgetenv_s(size_t *ret_len, wchar_t *buffer, size_t len, if (!MSVCRT_CHECK_PMT((buffer && len > 0) || (!buffer && !len))) return EINVAL; if (buffer) buffer[0] = 0; - if (!(e = wgetenv_helper(varname))) return 0; - *ret_len = wcslen(e) + 1; - if (!len) return 0; - if (len < *ret_len) return ERANGE; + _lock(_ENV_LOCK); + e = wgetenv_helper(varname); + if (e) + { + *ret_len = wcslen(e) + 1; + if (len >= *ret_len) wcscpy(buffer, e); + } + _unlock(_ENV_LOCK); - wcscpy(buffer, e); + if (!e || !len) return 0; + if (len < *ret_len) return ERANGE; return 0; }

1 0

Hans Leidekker : wineusb.sys: Add support for URB_FUNCTION_VENDOR_DEVICE.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: b313c4095ff2262d8c3076562442cb95dc059e34 URL: https://gitlab.winehq.org/wine/wine/-/commit/b313c4095ff2262d8c3076562442cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 8 12:30:49 2023 +0100 wineusb.sys: Add support for URB_FUNCTION_VENDOR_DEVICE. --- dlls/wineusb.sys/unixlib.c | 9 ++++++++- dlls/wineusb.sys/wineusb.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index 95220dd3828..401993dc543 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -362,6 +362,7 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) break; } + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; @@ -539,10 +540,11 @@ static NTSTATUS usb_submit_urb(void *args) return STATUS_SUCCESS; } + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; - uint8_t req_type = LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_INTERFACE; + uint8_t req_type = LIBUSB_REQUEST_TYPE_VENDOR; struct transfer_ctx *transfer_ctx; unsigned char *buffer; @@ -551,6 +553,11 @@ static NTSTATUS usb_submit_urb(void *args) transfer_ctx->irp = irp; transfer_ctx->transfer_buffer = params->transfer_buffer; + if (urb->UrbHeader.Function == URB_FUNCTION_VENDOR_DEVICE) + req_type |= LIBUSB_RECIPIENT_DEVICE; + else + req_type |= LIBUSB_RECIPIENT_INTERFACE; + if (req->TransferFlags & USBD_TRANSFER_DIRECTION_IN) req_type |= LIBUSB_ENDPOINT_IN; if (req->TransferFlags & ~USBD_TRANSFER_DIRECTION_IN) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 801393cacf6..29d28ee002d 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -556,6 +556,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: case URB_FUNCTION_SELECT_CONFIGURATION: + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct usb_submit_urb_params params = @@ -586,6 +587,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) break; } + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest;

1 0

Hans Leidekker : winhttp: Use an unsigned integer for number values in query_headers().
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 75b41873e630c4c3ffd85976eceaf33ceaf7640a URL: https://gitlab.winehq.org/wine/wine/-/commit/75b41873e630c4c3ffd85976eceaf3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 22 15:09:40 2023 +0100 winhttp: Use an unsigned integer for number values in query_headers(). --- dlls/winhttp/request.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 6ea71734cff..aed26d98c07 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -734,15 +734,15 @@ static DWORD query_headers( struct request *request, DWORD level, const WCHAR *n if (!header || (request_only && !header->is_request)) return ERROR_WINHTTP_HEADER_NOT_FOUND; if (level & WINHTTP_QUERY_FLAG_NUMBER) { - if (!buffer || sizeof(int) > *buflen) ret = ERROR_INSUFFICIENT_BUFFER; + if (!buffer || sizeof(DWORD) > *buflen) ret = ERROR_INSUFFICIENT_BUFFER; else { - int *number = buffer; - *number = wcstol( header->value, NULL, 10 ); - TRACE("returning number: %d\n", *number); + DWORD *number = buffer; + *number = wcstoul( header->value, NULL, 10 ); + TRACE("returning number: %lu\n", *number); ret = ERROR_SUCCESS; } - *buflen = sizeof(int); + *buflen = sizeof(DWORD); } else if (level & WINHTTP_QUERY_FLAG_SYSTEMTIME) {

1 0

Hans Leidekker : ntoskrnl: Stub EtwRegisterClassicProvider() and EtwUnregister().
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 860a6d762f1eb9a3b2977061f15e7c5ba5144349 URL: https://gitlab.winehq.org/wine/wine/-/commit/860a6d762f1eb9a3b2977061f15e7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 9 11:35:01 2023 +0100 ntoskrnl: Stub EtwRegisterClassicProvider() and EtwUnregister(). --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 22 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ebff0a3f3aa..45b8e1ab1c1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -27,6 +27,7 @@ #include "excpt.h" #include "winreg.h" #include "ntsecapi.h" +#include "evntprov.h" #include "ddk/csq.h" #include "wine/server.h" #include "wine/heap.h" @@ -4599,6 +4600,25 @@ void WINAPI KeLowerIrql(KIRQL new) #endif +typedef void (WINAPI *PETW_CLASSIC_CALLBACK)( + const GUID *guid, UCHAR control_code, void *enable_context, void *callback_context); + +NTSTATUS WINAPI EtwRegisterClassicProvider(const GUID *provider, ULONG type, PETW_CLASSIC_CALLBACK callback, + void *context, REGHANDLE *handle) +{ + FIXME("provider %s, type %lu, enable_callback %p, context %p, handle %p\n", debugstr_guid(provider), type, + callback, context, handle); + + *handle = 0xdeadbeef; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI EtwUnregister(REGHANDLE handle) +{ + FIXME("handle %I64x\n", handle); + return STATUS_SUCCESS; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f3559c89b2e..aa7831eac5f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1,3 +1,5 @@ +@ stdcall EtwRegisterClassicProvider(ptr long ptr ptr ptr) +@ stdcall EtwUnregister(int64) @ stdcall -arch=!i386 ExAcquireFastMutex(ptr) @ stdcall -fastcall ExAcquireFastMutexUnsafe(ptr) @ stub ExAcquireRundownProtection

1 0

Alexandros Frantzis : winewayland.drv: Implement vkCreateSwapchainKHR.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 249c21cfdd528aaa63022b2da9e2857179093110 URL: https://gitlab.winehq.org/wine/wine/-/commit/249c21cfdd528aaa63022b2da9e285… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Sep 17 12:21:29 2021 +0300 winewayland.drv: Implement vkCreateSwapchainKHR. --- dlls/winewayland.drv/vulkan.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 8cc37c9dcc9..1b8ac8713c2 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -52,6 +52,7 @@ typedef struct VkWaylandSurfaceCreateInfoKHR } VkWaylandSurfaceCreateInfoKHR; static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); +static VkResult (*pvkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); static VkResult (*pvkCreateWaylandSurfaceKHR)(VkInstance, const VkWaylandSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); @@ -226,6 +227,49 @@ static VkResult wayland_vkCreateInstance(const VkInstanceCreateInfo *create_info return res; } +static VkResult wayland_vkCreateSwapchainKHR(VkDevice device, + const VkSwapchainCreateInfoKHR *create_info, + const VkAllocationCallbacks *allocator, + VkSwapchainKHR *swapchain) +{ + VkResult res; + VkSwapchainCreateInfoKHR create_info_host; + struct wine_vk_surface *wine_vk_surface; + + TRACE("%p %p %p %p\n", device, create_info, allocator, swapchain); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + wine_vk_surface = wine_vk_surface_from_handle(create_info->surface); + if (!wine_vk_surface_is_valid(wine_vk_surface)) + return VK_ERROR_SURFACE_LOST_KHR; + + create_info_host = *create_info; + create_info_host.surface = wine_vk_surface->native; + + /* 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 + * 1x1 to accommodate them. */ + if (create_info_host.imageExtent.width == 0 || + create_info_host.imageExtent.height == 0) + { + create_info_host.imageExtent.width = 1; + create_info_host.imageExtent.height = 1; + } + + res = pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, + swapchain); + if (res != VK_SUCCESS) + { + ERR("Failed to create vulkan wayland swapchain, res=%d\n", res); + return res; + } + + TRACE("Created swapchain=0x%s\n", wine_dbgstr_longlong(*swapchain)); + return res; +} + static VkResult wayland_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *create_info, const VkAllocationCallbacks *allocator, @@ -554,6 +598,7 @@ static void wine_vk_init(void) #define LOAD_FUNCPTR(f) if (!(p##f = dlsym(vulkan_handle, #f))) goto fail #define LOAD_OPTIONAL_FUNCPTR(f) p##f = dlsym(vulkan_handle, #f) LOAD_FUNCPTR(vkCreateInstance); + LOAD_FUNCPTR(vkCreateSwapchainKHR); LOAD_FUNCPTR(vkCreateWaylandSurfaceKHR); LOAD_FUNCPTR(vkDestroyInstance); LOAD_FUNCPTR(vkDestroySurfaceKHR); @@ -578,6 +623,7 @@ fail: static const struct vulkan_funcs vulkan_funcs = { .p_vkCreateInstance = wayland_vkCreateInstance, + .p_vkCreateSwapchainKHR = wayland_vkCreateSwapchainKHR, .p_vkCreateWin32SurfaceKHR = wayland_vkCreateWin32SurfaceKHR, .p_vkDestroyInstance = wayland_vkDestroyInstance, .p_vkDestroySurfaceKHR = wayland_vkDestroySurfaceKHR,

1 0

Alexandros Frantzis : winewayland.drv: Implement vkGetSwapchainImagesKHR.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: ca5f7fe4c7ee5aeb5a9fffe2c4892788af26322e URL: https://gitlab.winehq.org/wine/wine/-/commit/ca5f7fe4c7ee5aeb5a9fffe2c48927… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Sep 20 12:59:01 2021 +0300 winewayland.drv: Implement vkGetSwapchainImagesKHR. This is a simple passthrough implementation to the native Vulkan driver. --- dlls/winewayland.drv/vulkan.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 14ac6dcc7f0..5ecf3787656 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -67,6 +67,7 @@ static VkResult (*pvkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSur static VkResult (*pvkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkPresentModeKHR *); static VkResult (*pvkGetPhysicalDeviceSurfaceSupportKHR)(VkPhysicalDevice, uint32_t, VkSurfaceKHR, VkBool32 *); static VkBool32 (*pvkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice, uint32_t, struct wl_display *); +static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); static void *vulkan_handle; static const struct vulkan_funcs vulkan_funcs; @@ -624,6 +625,14 @@ static VkBool32 wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysica process_wayland.wl_display); } +static VkResult wayland_vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapchain, + uint32_t *count, VkImage *images) +{ + TRACE("%p, 0x%s %p %p\n", device, wine_dbgstr_longlong(swapchain), count, images); + + return pvkGetSwapchainImagesKHR(device, swapchain, count, images); +} + static VkSurfaceKHR wayland_wine_get_native_surface(VkSurfaceKHR surface) { return wine_vk_surface_from_handle(surface)->native; @@ -655,6 +664,7 @@ static void wine_vk_init(void) LOAD_FUNCPTR(vkGetPhysicalDeviceSurfacePresentModesKHR); LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceSupportKHR); LOAD_FUNCPTR(vkGetPhysicalDeviceWaylandPresentationSupportKHR); + LOAD_FUNCPTR(vkGetSwapchainImagesKHR); #undef LOAD_FUNCPTR #undef LOAD_OPTIONAL_FUNCPTR @@ -683,6 +693,7 @@ static const struct vulkan_funcs vulkan_funcs = .p_vkGetPhysicalDeviceSurfacePresentModesKHR = wayland_vkGetPhysicalDeviceSurfacePresentModesKHR, .p_vkGetPhysicalDeviceSurfaceSupportKHR = wayland_vkGetPhysicalDeviceSurfaceSupportKHR, .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_vkGetSwapchainImagesKHR = wayland_vkGetSwapchainImagesKHR, .p_wine_get_native_surface = wayland_wine_get_native_surface, };

1 0

Alexandros Frantzis : winewayland.drv: Implement vkGetPhysicalDeviceWin32PresentationSupportKHR.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 03f5fcd9efd09b60ae0f540cdb958dbd9eff4960 URL: https://gitlab.winehq.org/wine/wine/-/commit/03f5fcd9efd09b60ae0f540cdb958d… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Sep 20 12:45:12 2021 +0300 winewayland.drv: Implement vkGetPhysicalDeviceWin32PresentationSupportKHR. This is a simple passthrough implementation to the corresponding Vulkan Wayland extension. --- dlls/winewayland.drv/vulkan.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index d8386e9ac01..14ac6dcc7f0 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -66,6 +66,7 @@ static VkResult (*pvkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, cons static VkResult (*pvkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *); static VkResult (*pvkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkPresentModeKHR *); static VkResult (*pvkGetPhysicalDeviceSurfaceSupportKHR)(VkPhysicalDevice, uint32_t, VkSurfaceKHR, VkBool32 *); +static VkBool32 (*pvkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice, uint32_t, struct wl_display *); static void *vulkan_handle; static const struct vulkan_funcs vulkan_funcs; @@ -166,6 +167,8 @@ static const char *wine_vk_native_fn_name(const char *name) { if (!strcmp(name, "vkCreateWin32SurfaceKHR")) return "vkCreateWaylandSurfaceKHR"; + if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) + return "vkGetPhysicalDeviceWaylandPresentationSupportKHR"; return name; } @@ -612,6 +615,15 @@ static VkResult wayland_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice ph supported); } +static VkBool32 wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, + uint32_t index) +{ + TRACE("%p %u\n", phys_dev, index); + + return pvkGetPhysicalDeviceWaylandPresentationSupportKHR(phys_dev, index, + process_wayland.wl_display); +} + static VkSurfaceKHR wayland_wine_get_native_surface(VkSurfaceKHR surface) { return wine_vk_surface_from_handle(surface)->native; @@ -642,6 +654,7 @@ static void wine_vk_init(void) LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceFormatsKHR); LOAD_FUNCPTR(vkGetPhysicalDeviceSurfacePresentModesKHR); LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceSupportKHR); + LOAD_FUNCPTR(vkGetPhysicalDeviceWaylandPresentationSupportKHR); #undef LOAD_FUNCPTR #undef LOAD_OPTIONAL_FUNCPTR @@ -669,6 +682,7 @@ static const struct vulkan_funcs vulkan_funcs = .p_vkGetPhysicalDeviceSurfaceFormatsKHR = wayland_vkGetPhysicalDeviceSurfaceFormatsKHR, .p_vkGetPhysicalDeviceSurfacePresentModesKHR = wayland_vkGetPhysicalDeviceSurfacePresentModesKHR, .p_vkGetPhysicalDeviceSurfaceSupportKHR = wayland_vkGetPhysicalDeviceSurfaceSupportKHR, + .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR, .p_wine_get_native_surface = wayland_wine_get_native_surface, };

1 0

Alexandros Frantzis : winewayland.drv: Implement vkDestroySwapchainKHR.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: ec9a111f3e87cebdbf78dcc847102df9557237dd URL: https://gitlab.winehq.org/wine/wine/-/commit/ec9a111f3e87cebdbf78dcc847102d… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Sep 17 12:35:30 2021 +0300 winewayland.drv: Implement vkDestroySwapchainKHR. --- dlls/winewayland.drv/vulkan.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 1b8ac8713c2..51ab89ce051 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -56,6 +56,7 @@ static VkResult (*pvkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKH static VkResult (*pvkCreateWaylandSurfaceKHR)(VkInstance, const VkWaylandSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); +static void (*pvkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); @@ -366,6 +367,18 @@ static void wayland_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surfac wine_vk_surface_destroy(wine_vk_surface); } +static void wayland_vkDestroySwapchainKHR(VkDevice device, + VkSwapchainKHR swapchain, + const VkAllocationCallbacks *allocator) +{ + TRACE("%p, 0x%s %p\n", device, wine_dbgstr_longlong(swapchain), allocator); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + pvkDestroySwapchainKHR(device, swapchain, NULL /* allocator */); +} + static VkResult wayland_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties* properties) @@ -602,6 +615,7 @@ static void wine_vk_init(void) LOAD_FUNCPTR(vkCreateWaylandSurfaceKHR); LOAD_FUNCPTR(vkDestroyInstance); LOAD_FUNCPTR(vkDestroySurfaceKHR); + LOAD_FUNCPTR(vkDestroySwapchainKHR); LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties); LOAD_FUNCPTR(vkGetDeviceProcAddr); LOAD_FUNCPTR(vkGetInstanceProcAddr); @@ -627,6 +641,7 @@ static const struct vulkan_funcs vulkan_funcs = .p_vkCreateWin32SurfaceKHR = wayland_vkCreateWin32SurfaceKHR, .p_vkDestroyInstance = wayland_vkDestroyInstance, .p_vkDestroySurfaceKHR = wayland_vkDestroySurfaceKHR, + .p_vkDestroySwapchainKHR = wayland_vkDestroySwapchainKHR, .p_vkEnumerateInstanceExtensionProperties = wayland_vkEnumerateInstanceExtensionProperties, .p_vkGetDeviceProcAddr = wayland_vkGetDeviceProcAddr, .p_vkGetInstanceProcAddr = wayland_vkGetInstanceProcAddr,

1 0

Alexandros Frantzis : winewayland.drv: Implement vkGetPhysicalDeviceSurfacePresentModesKHR.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: c35be65ddaa040fb6959ea8fa0d52f9c30e5d95d URL: https://gitlab.winehq.org/wine/wine/-/commit/c35be65ddaa040fb6959ea8fa0d52f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Sep 20 12:40:48 2021 +0300 winewayland.drv: Implement vkGetPhysicalDeviceSurfacePresentModesKHR. This is a simple passthrough implementation to the native Vulkan driver, with the addition of a VkSurfaceKHR invalidation check. --- dlls/winewayland.drv/vulkan.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 51ab89ce051..d8386e9ac01 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -64,6 +64,7 @@ static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *); static VkResult (*pvkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, uint32_t *, VkSurfaceFormat2KHR *); static VkResult (*pvkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *); +static VkResult (*pvkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkPresentModeKHR *); static VkResult (*pvkGetPhysicalDeviceSurfaceSupportKHR)(VkPhysicalDevice, uint32_t, VkSurfaceKHR, VkBool32 *); static void *vulkan_handle; @@ -579,6 +580,22 @@ static VkResult wayland_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice ph count, formats); } +static VkResult wayland_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice phys_dev, + VkSurfaceKHR surface, + uint32_t *count, + VkPresentModeKHR *modes) +{ + struct wine_vk_surface *wine_vk_surface = wine_vk_surface_from_handle(surface); + + TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, modes); + + if (!wine_vk_surface_is_valid(wine_vk_surface)) + return VK_ERROR_SURFACE_LOST_KHR; + + return pvkGetPhysicalDeviceSurfacePresentModesKHR(phys_dev, wine_vk_surface->native, + count, modes); +} + static VkResult wayland_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice phys_dev, uint32_t index, VkSurfaceKHR surface, @@ -623,6 +640,7 @@ static void wine_vk_init(void) LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilitiesKHR); LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDeviceSurfaceFormats2KHR); LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceFormatsKHR); + LOAD_FUNCPTR(vkGetPhysicalDeviceSurfacePresentModesKHR); LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceSupportKHR); #undef LOAD_FUNCPTR #undef LOAD_OPTIONAL_FUNCPTR @@ -649,6 +667,7 @@ static const struct vulkan_funcs vulkan_funcs = .p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR = wayland_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, .p_vkGetPhysicalDeviceSurfaceFormats2KHR = wayland_vkGetPhysicalDeviceSurfaceFormats2KHR, .p_vkGetPhysicalDeviceSurfaceFormatsKHR = wayland_vkGetPhysicalDeviceSurfaceFormatsKHR, + .p_vkGetPhysicalDeviceSurfacePresentModesKHR = wayland_vkGetPhysicalDeviceSurfacePresentModesKHR, .p_vkGetPhysicalDeviceSurfaceSupportKHR = wayland_vkGetPhysicalDeviceSurfaceSupportKHR, .p_wine_get_native_surface = wayland_wine_get_native_surface, };

1 0

Rémi Bernon : win32u: Implement opt-in auto-repeat for WM_(SYS)KEYDOWN messages.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 7b03cbda5d6f21d1ff49d838df03f28fc4ec215a URL: https://gitlab.winehq.org/wine/wine/-/commit/7b03cbda5d6f21d1ff49d838df03f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 11 16:17:14 2023 +0200 win32u: Implement opt-in auto-repeat for WM_(SYS)KEYDOWN messages. --- dlls/win32u/message.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 4 ++++ 2 files changed, 51 insertions(+) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index e897ead329e..3c59eb8ee1d 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2292,6 +2292,22 @@ static void send_parent_notify( HWND hwnd, WORD event, WORD idChild, POINT pt ) } } + +static void handle_keyboard_repeat_message( HWND hwnd ) +{ + struct user_thread_info *thread_info = get_user_thread_info(); + MSG *msg = &thread_info->key_repeat_msg; + UINT speed; + + msg->lParam = (msg->lParam & ~(LPARAM)0xffff) + ((msg->lParam + 1) & 0xffff); + + if (NtUserSystemParametersInfo( SPI_GETKEYBOARDSPEED, 0, &speed, 0 )) + NtUserSetSystemTimer( hwnd, SYSTEM_TIMER_KEY_REPEAT, 400 / (speed + 1) ); + + NtUserPostMessage( hwnd, msg->message, msg->wParam, msg->lParam ); +} + + /*********************************************************************** * process_keyboard_message * @@ -2371,6 +2387,33 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, if (ImmProcessKey( msg->hwnd, NtUserGetKeyboardLayout(0), msg->wParam, msg->lParam, 0 )) msg->wParam = VK_PROCESSKEY; + /* set/kill timers for key auto-repeat */ + if (remove && keyboard_auto_repeat_enabled) + { + struct user_thread_info *thread_info = get_user_thread_info(); + + switch (msg->message) + { + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + { + UINT delay; + + if (msg->wParam == VK_PROCESSKEY) break; + + thread_info->key_repeat_msg = *msg; + if (NtUserSystemParametersInfo( SPI_GETKEYBOARDDELAY, 0, &delay, 0 )) + NtUserSetSystemTimer( msg->hwnd, SYSTEM_TIMER_KEY_REPEAT, (delay + 1) * 250 ); + break; + } + + case WM_KEYUP: + case WM_SYSKEYUP: + kill_system_timer( thread_info->key_repeat_msg.hwnd, SYSTEM_TIMER_KEY_REPEAT ); + break; + } + } + return TRUE; } @@ -3565,6 +3608,10 @@ LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) case SYSTEM_TIMER_TRACK_MOUSE: update_mouse_tracking_info( msg->hwnd ); return 0; + + case SYSTEM_TIMER_KEY_REPEAT: + handle_keyboard_repeat_message( msg->hwnd ); + return 0; } } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index d91829860b5..943384efc30 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -32,6 +32,9 @@ enum system_timer_id { SYSTEM_TIMER_TRACK_MOUSE = 0xfffa, SYSTEM_TIMER_CARET = 0xffff, + + /* not compatible with native */ + SYSTEM_TIMER_KEY_REPEAT = 0xfff0, }; struct rawinput_thread_data @@ -126,6 +129,7 @@ struct user_thread_info struct received_message_info *receive_info; /* Message being currently received */ struct user_key_state_info *key_state; /* Cache of global key state */ struct imm_thread_data *imm_thread_data; /* IMM thread data */ + MSG key_repeat_msg; /* Last WM_KEYDOWN message to repeat */ HKL kbd_layout; /* Current keyboard layout */ UINT kbd_layout_id; /* Current keyboard layout ID */ struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */

1 0