wine-commits June 2023

wine-commits@winehq.org

1 participants
633 discussions

Giovanni Mascellani : dxgi: Move Vulkan-specific code to d3d12_swapchain_create_vulkan_swapchain().
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 4e88f44270e57e6536134c3323645733b71dcac0 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e88f44270e57e6536134c33236457… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 15:16:13 2023 +0200 dxgi: Move Vulkan-specific code to d3d12_swapchain_create_vulkan_swapchain(). --- dlls/dxgi/swapchain.c | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 1d86e79d5e5..0b8d09d8b96 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1558,32 +1558,10 @@ static HRESULT d3d12_swapchain_create_image_resources(struct d3d12_swapchain *sw static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain) { - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkSwapchainKHR vk_swapchain = swapchain->vk_swapchain; ID3D12CommandQueue *queue = swapchain->command_queue; - VkDevice vk_device = swapchain->vk_device; - uint32_t image_count, queue_family_index; - VkResult vr; + uint32_t queue_family_index; HRESULT hr; - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) - { - WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - if (image_count > ARRAY_SIZE(swapchain->vk_swapchain_images)) - { - FIXME("Unsupported Vulkan swapchain image count %u.\n", image_count); - return E_FAIL; - } - swapchain->buffer_count = image_count; - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, - &image_count, swapchain->vk_swapchain_images)) < 0) - { - WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - queue_family_index = vkd3d_get_vk_queue_family_index(queue); if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain))) @@ -1772,6 +1750,24 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s if (swapchain->vk_swapchain) vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + if (image_count > ARRAY_SIZE(swapchain->vk_swapchain_images)) + { + FIXME("Unsupported Vulkan swapchain image count %u.\n", image_count); + return E_FAIL; + } + swapchain->buffer_count = image_count; + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, + &image_count, swapchain->vk_swapchain_images)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + swapchain->vk_swapchain = vk_swapchain; swapchain->vk_swapchain_width = width; swapchain->vk_swapchain_height = height;

1 0

Giovanni Mascellani : dxgi: Move non-Vulkan-specific code out of d3d12_swapchain_create_vulkan_swapchain().
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: a7ff40a3248a5c6aa3d5b6f6d3be97e36ea78a17 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7ff40a3248a5c6aa3d5b6f6d3be97… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 15:02:00 2023 +0200 dxgi: Move non-Vulkan-specific code out of d3d12_swapchain_create_vulkan_swapchain(). --- dlls/dxgi/swapchain.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index deb7e50026d..1d86e79d5e5 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1687,12 +1687,6 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s VkResult vr; HRESULT hr; - if (!(swapchain->vk_format = vkd3d_get_vk_format(swapchain->desc.Format))) - { - WARN("Invalid format %#x.\n", swapchain->desc.Format); - return DXGI_ERROR_INVALID_CALL; - } - if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, swapchain->vk_surface, &swapchain->desc, &vk_swapchain_format))) return hr; @@ -1784,6 +1778,22 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX; + return S_OK; +} + +static HRESULT d3d12_swapchain_create_resources(struct d3d12_swapchain *swapchain) +{ + HRESULT hr; + + if (!(swapchain->vk_format = vkd3d_get_vk_format(swapchain->desc.Format))) + { + WARN("Invalid format %#x.\n", swapchain->desc.Format); + return DXGI_ERROR_INVALID_CALL; + } + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + return hr; + return d3d12_swapchain_create_buffers(swapchain); } @@ -1970,7 +1980,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha d3d12_swapchain_destroy_buffers(swapchain, FALSE); swapchain->present_mode = present_mode; - return d3d12_swapchain_create_vulkan_swapchain(swapchain); + return d3d12_swapchain_create_resources(swapchain); } static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) @@ -2077,7 +2087,7 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, TRACE("Recreating Vulkan swapchain.\n"); d3d12_swapchain_destroy_buffers(swapchain, FALSE); - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + if (FAILED(hr = d3d12_swapchain_create_resources(swapchain))) return hr; if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) @@ -2356,7 +2366,7 @@ static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, d3d12_swapchain_destroy_buffers(swapchain, TRUE); swapchain->desc = new_desc; - return d3d12_swapchain_create_vulkan_swapchain(swapchain); + return d3d12_swapchain_create_resources(swapchain); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain4 *iface, @@ -3038,7 +3048,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI ID3D12CommandQueue_AddRef(swapchain->command_queue = queue); ID3D12Device_AddRef(swapchain->device = device); - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + if (FAILED(hr = d3d12_swapchain_create_resources(swapchain))) { d3d12_swapchain_destroy(swapchain); return hr;

1 0

Giovanni Mascellani : dxgi: Factor out d3d12_swapchain_create_image_resources().
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 6cb23836e7cb69599519a5030889eb7d5b5ed840 URL: https://gitlab.winehq.org/wine/wine/-/commit/6cb23836e7cb69599519a5030889eb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 14:50:05 2023 +0200 dxgi: Factor out d3d12_swapchain_create_image_resources(). --- dlls/dxgi/swapchain.c | 73 ++++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 7d368c88687..deb7e50026d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1513,45 +1513,13 @@ static HRESULT d3d12_swapchain_create_command_buffers(struct d3d12_swapchain *sw return S_OK; } -static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain) +static HRESULT d3d12_swapchain_create_image_resources(struct d3d12_swapchain *swapchain) { - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; struct vkd3d_image_resource_create_info resource_info; - VkSwapchainKHR vk_swapchain = swapchain->vk_swapchain; - ID3D12CommandQueue *queue = swapchain->command_queue; - VkDevice vk_device = swapchain->vk_device; ID3D12Device *device = swapchain->device; - uint32_t image_count, queue_family_index; unsigned int i; - VkResult vr; HRESULT hr; - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) - { - WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - if (image_count > ARRAY_SIZE(swapchain->vk_swapchain_images)) - { - FIXME("Unsupported Vulkan swapchain image count %u.\n", image_count); - return E_FAIL; - } - swapchain->buffer_count = image_count; - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, - &image_count, swapchain->vk_swapchain_images)) < 0) - { - WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - - queue_family_index = vkd3d_get_vk_queue_family_index(queue); - - if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain))) - return hr; - - if (FAILED(hr = d3d12_swapchain_create_command_buffers(swapchain, queue_family_index))) - return hr; - if (swapchain->buffers[0]) return S_OK; @@ -1588,6 +1556,45 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain) return S_OK; } +static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkSwapchainKHR vk_swapchain = swapchain->vk_swapchain; + ID3D12CommandQueue *queue = swapchain->command_queue; + VkDevice vk_device = swapchain->vk_device; + uint32_t image_count, queue_family_index; + VkResult vr; + HRESULT hr; + + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + if (image_count > ARRAY_SIZE(swapchain->vk_swapchain_images)) + { + FIXME("Unsupported Vulkan swapchain image count %u.\n", image_count); + return E_FAIL; + } + swapchain->buffer_count = image_count; + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, + &image_count, swapchain->vk_swapchain_images)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + queue_family_index = vkd3d_get_vk_queue_family_index(queue); + + if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain))) + return hr; + + if (FAILED(hr = d3d12_swapchain_create_command_buffers(swapchain, queue_family_index))) + return hr; + + return d3d12_swapchain_create_image_resources(swapchain); +} + static VkResult d3d12_swapchain_acquire_next_vulkan_image(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs;

1 0

Giovanni Mascellani : dxgi: Store Vulkan formats in the swapchain object.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 237062d01feaeaf614ffb353f6736b7aa72ea36a URL: https://gitlab.winehq.org/wine/wine/-/commit/237062d01feaeaf614ffb353f6736b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 14:46:58 2023 +0200 dxgi: Store Vulkan formats in the swapchain object. --- dlls/dxgi/swapchain.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4aa0066cf32..7d368c88687 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1073,6 +1073,8 @@ struct d3d12_swapchain unsigned int vk_swapchain_width; unsigned int vk_swapchain_height; VkPresentModeKHR present_mode; + VkFormat vk_format; + uint32_t vk_image_index; struct dxgi_vk_funcs vk_funcs; @@ -1255,7 +1257,7 @@ static BOOL d3d12_swapchain_is_present_mode_supported(struct d3d12_swapchain *sw return supported; } -static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, VkFormat vk_format) +static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDeviceSize image_offset[DXGI_MAX_SWAP_CHAIN_BUFFERS]; @@ -1276,7 +1278,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; image_info.imageType = VK_IMAGE_TYPE_2D; - image_info.format = vk_format; + image_info.format = swapchain->vk_format; image_info.extent.width = swapchain->desc.Width; image_info.extent.height = swapchain->desc.Height; image_info.extent.depth = 1; @@ -1511,8 +1513,7 @@ static HRESULT d3d12_swapchain_create_command_buffers(struct d3d12_swapchain *sw return S_OK; } -static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, - VkFormat vk_swapchain_format, VkFormat vk_format) +static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; struct vkd3d_image_resource_create_info resource_info; @@ -1545,7 +1546,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, queue_family_index = vkd3d_get_vk_queue_family_index(queue); - if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, vk_format))) + if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain))) return hr; if (FAILED(hr = d3d12_swapchain_create_command_buffers(swapchain, queue_family_index))) @@ -1562,7 +1563,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, resource_info.desc.Height = swapchain->desc.Height; resource_info.desc.DepthOrArraySize = 1; resource_info.desc.MipLevels = 1; - resource_info.desc.Format = dxgi_format_from_vk_format(vk_format); + resource_info.desc.Format = dxgi_format_from_vk_format(swapchain->vk_format); resource_info.desc.SampleDesc.Count = 1; resource_info.desc.SampleDesc.Quality = 0; resource_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; @@ -1671,15 +1672,15 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkSwapchainCreateInfoKHR vk_swapchain_desc; VkDevice vk_device = swapchain->vk_device; - VkFormat vk_format, vk_swapchain_format; unsigned int width, height, image_count; VkSurfaceCapabilitiesKHR surface_caps; + VkFormat vk_swapchain_format; VkSwapchainKHR vk_swapchain; VkImageUsageFlags usage; VkResult vr; HRESULT hr; - if (!(vk_format = vkd3d_get_vk_format(swapchain->desc.Format))) + if (!(swapchain->vk_format = vkd3d_get_vk_format(swapchain->desc.Format))) { WARN("Invalid format %#x.\n", swapchain->desc.Format); return DXGI_ERROR_INVALID_CALL; @@ -1776,7 +1777,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX; - return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); + return d3d12_swapchain_create_buffers(swapchain); } static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain4(IDXGISwapChain4 *iface)

1 0

Giovanni Mascellani : dxgi: Rename d3d12_swapchain_prepare_command_buffers().
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 565917d5d253067ac1c70a7235c01dad6ac08fac URL: https://gitlab.winehq.org/wine/wine/-/commit/565917d5d253067ac1c70a7235c01d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 14:18:58 2023 +0200 dxgi: Rename d3d12_swapchain_prepare_command_buffers(). --- dlls/dxgi/swapchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index aabbb9943c3..4aa0066cf32 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1454,7 +1454,7 @@ static VkResult d3d12_swapchain_record_swapchain_blit(struct d3d12_swapchain *sw return vr; } -static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *swapchain, +static HRESULT d3d12_swapchain_create_command_buffers(struct d3d12_swapchain *swapchain, uint32_t queue_family_index) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1548,7 +1548,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, vk_format))) return hr; - if (FAILED(hr = d3d12_swapchain_prepare_command_buffers(swapchain, queue_family_index))) + if (FAILED(hr = d3d12_swapchain_create_command_buffers(swapchain, queue_family_index))) return hr; if (swapchain->buffers[0])

1 0

Giovanni Mascellani : dxgi: Document some struct d3d12_swapchain fields.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: eec9c3a2f63555604dd6e357bb3280e82e14ff5b URL: https://gitlab.winehq.org/wine/wine/-/commit/eec9c3a2f63555604dd6e357bb3280… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 30 14:41:39 2023 +0200 dxgi: Document some struct d3d12_swapchain fields. --- dlls/dxgi/swapchain.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0ba9db96108..aabbb9943c3 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1044,26 +1044,37 @@ struct d3d12_swapchain struct wined3d_swapchain_state *state; struct wined3d_swapchain_state_parent state_parent; - VkSwapchainKHR vk_swapchain; VkSurfaceKHR vk_surface; VkFence vk_fence; VkInstance vk_instance; VkDevice vk_device; VkPhysicalDevice vk_physical_device; + + /* D3D12 side of the swapchain: these objects are visible to the + * IDXGISwapChain client, so they must never be recreated, except + * when ResizeBuffers*() is called. */ + unsigned int buffer_count; VkDeviceMemory vk_memory; - VkCommandPool vk_cmd_pool; VkImage vk_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + unsigned int current_buffer_index; + + /* Vulkan side of the swapchain: these objects are also destroyed + * and recreated when the Vulkan swapchain becomes out of date or + * when the synchronization interval is changed; this operation + * should be transparent to the IDXGISwapChain client (except for + * timings: recreating the Vulkan swapchain creates a noticeable + * delay, unfortunately). */ + VkSwapchainKHR vk_swapchain; + VkCommandPool vk_cmd_pool; VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; VkCommandBuffer vk_cmd_buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; VkSemaphore vk_semaphores[DXGI_MAX_SWAP_CHAIN_BUFFERS]; - ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; - unsigned int buffer_count; unsigned int vk_swapchain_width; unsigned int vk_swapchain_height; VkPresentModeKHR present_mode; - uint32_t vk_image_index; - unsigned int current_buffer_index; + struct dxgi_vk_funcs vk_funcs; ID3D12CommandQueue *command_queue;

1 0

Rémi Bernon : server: Don't reset cursor clipping on foreground thread exit.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 88cbc08b7fcb90c6048f5868c82e3c2165dcc1cd URL: https://gitlab.winehq.org/wine/wine/-/commit/88cbc08b7fcb90c6048f5868c82e3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 31 11:11:10 2023 +0200 server: Don't reset cursor clipping on foreground thread exit. It will be reset on foreground input changes, when it happens. --- dlls/user32/tests/input.c | 2 -- server/queue.c | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 197a82db251..2ce129dae45 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -5282,7 +5282,6 @@ static void test_ClipCursor_process(void) InflateRect( &clip_rect, +1, +1 ); ok_ret( 1, DestroyWindow( hwnd ) ); ok_ret( 1, GetClipCursor( &rect ) ); - todo_wine ok_rect( clip_rect, rect ); /* intentionally leaking clipping rect */ @@ -5339,7 +5338,6 @@ static void test_ClipCursor_desktop( char **argv ) /* as foreground window is now transient, cursor clipping isn't reset */ InflateRect( &clip_rect, +1, +1 ); ok_ret( 1, GetClipCursor( &rect ) ); - todo_wine ok_rect( clip_rect, rect ); /* intentionally leaking clipping rect */ diff --git a/server/queue.c b/server/queue.c index e27727a3173..0c7d2c50a49 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1093,12 +1093,13 @@ static void thread_input_dump( struct object *obj, int verbose ) static void thread_input_destroy( struct object *obj ) { struct thread_input *input = (struct thread_input *)obj; + struct desktop *desktop; empty_msg_list( &input->msg_list ); - if (input->desktop) + if ((desktop = input->desktop)) { - if (input->desktop->foreground_input == input) set_foreground_input( input->desktop, NULL ); - release_object( input->desktop ); + if (desktop->foreground_input == input) desktop->foreground_input = NULL; + release_object( desktop ); } }

1 0

Rémi Bernon : winex11: Reset clipping by calling NtUserClipCursor directly.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: b863d3ab141a5243c6024a75185f9869b2f4e667 URL: https://gitlab.winehq.org/wine/wine/-/commit/b863d3ab141a5243c6024a75185f98… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 19:53:23 2023 +0200 winex11: Reset clipping by calling NtUserClipCursor directly. --- dlls/winex11.drv/event.c | 4 ++-- dlls/winex11.drv/mouse.c | 11 ----------- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 701d0c1faf6..edb7a1bf983 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -814,7 +814,7 @@ static void focus_out( Display *display , HWND hwnd ) if (is_virtual_desktop()) { - if (hwnd == NtUserGetDesktopWindow()) reset_clipping_window(); + if (hwnd == NtUserGetDesktopWindow()) NtUserClipCursor( NULL ); return; } if (hwnd != NtUserGetForegroundWindow()) return; @@ -858,7 +858,7 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) if (event->detail == NotifyPointer) { - if (!hwnd && event->window == x11drv_thread_data()->clip_window) reset_clipping_window(); + if (!hwnd && event->window == x11drv_thread_data()->clip_window) NtUserClipCursor( NULL ); return TRUE; } if (!hwnd) return FALSE; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b17e8b12d25..fc35081652c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -469,17 +469,6 @@ static void ungrab_clipping_window(void) send_notify_message( NtUserGetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, 0 ); } -/*********************************************************************** - * reset_clipping_window - * - * Forcibly reset the window clipping on external events. - */ -void reset_clipping_window(void) -{ - ungrab_clipping_window(); - NtUserClipCursor( NULL ); /* make sure the clip rectangle is reset too */ -} - /*********************************************************************** * retry_grab_clipping_window * diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4fa4fb59c90..2e290295860 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2687,7 +2687,7 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, { release_win_data( data ); unmap_window( hwnd ); - if (NtUserIsWindowRectFullScreen( &old_window_rect )) reset_clipping_window(); + if (NtUserIsWindowRectFullScreen( &old_window_rect )) NtUserClipCursor( NULL ); if (!(data = get_win_data( hwnd ))) return; } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 22b61e1b5b0..9f6ba45d175 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -686,7 +686,6 @@ extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_request( HWND hwnd, BOOL fullscreen, BOOL reset ) DECLSPEC_HIDDEN; -extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN; extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : winex11: Rely on win32u to reset clipping on display mode change.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 5bdbbee6f4a874159f2e527f39f071547c513ee4 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bdbbee6f4a874159f2e527f39f071… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 19:50:57 2023 +0200 winex11: Rely on win32u to reset clipping on display mode change. --- dlls/winex11.drv/desktop.c | 1 - dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 168029367d3..b58dc050bd3 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -446,7 +446,6 @@ void X11DRV_resize_desktop(void) NtUserSetWindowPos( hwnd, 0, virtual_rect.left, virtual_rect.top, virtual_rect.right - virtual_rect.left, virtual_rect.bottom - virtual_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); - ungrab_clipping_window(); if (old_virtual_rect.left != virtual_rect.left || old_virtual_rect.top != virtual_rect.top) send_message_timeout( HWND_BROADCAST, WM_X11DRV_DESKTOP_RESIZED, old_virtual_rect.left, diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index c34f5fde77e..b17e8b12d25 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -455,7 +455,7 @@ static BOOL grab_clipping_window( const RECT *clip ) * * Release the pointer grab on the clip window. */ -void ungrab_clipping_window(void) +static void ungrab_clipping_window(void) { Display *display = thread_init_display(); Window clip_window = init_clip_window(); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3fe072c901e..22b61e1b5b0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -686,7 +686,6 @@ extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_request( HWND hwnd, BOOL fullscreen, BOOL reset ) DECLSPEC_HIDDEN; -extern void ungrab_clipping_window(void) DECLSPEC_HIDDEN; extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : win32u: Reset cursor clipping rectangle on display mode change.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 18cb55583a50aabf60467316dd23b7c2763ea271 URL: https://gitlab.winehq.org/wine/wine/-/commit/18cb55583a50aabf60467316dd23b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 19:50:57 2023 +0200 win32u: Reset cursor clipping rectangle on display mode change. --- dlls/win32u/sysparams.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 832b56eb380..99042c85923 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2698,6 +2698,7 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod if (!adapter_get_current_settings( adapter, &current_mode )) WARN( "Failed to get primary adapter current display settings.\n" ); adapter_release( adapter ); + NtUserClipCursor( NULL ); send_notify_message( NtUserGetDesktopWindow(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), FALSE ); send_message_timeout( HWND_BROADCAST, WM_DISPLAYCHANGE, current_mode.dmBitsPerPel,

1 0

← Newer
1
...
56
57
58
59
60
61
62
63
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2023