July 2023 - Wine-commits - list.winehq.org

Giovanni Mascellani : dxgi: Move buffer resizing to the worker thread.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 287c6fe92849a5d8e7b9970f06ff067723e5c9bb URL: https://gitlab.winehq.org/wine/wine/-/commit/287c6fe92849a5d8e7b9970f06ff06… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jun 22 16:24:53 2023 +0200 dxgi: Move buffer resizing to the worker thread. --- dlls/dxgi/swapchain.c | 100 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 80 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f140317781e..ea93efb5643 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1055,6 +1055,7 @@ struct d3d12_swapchain unsigned int vk_swapchain_width; unsigned int vk_swapchain_height; VkPresentModeKHR present_mode; + DXGI_SWAP_CHAIN_DESC1 backend_desc; uint32_t vk_image_index; @@ -1080,6 +1081,7 @@ struct d3d12_swapchain enum d3d12_swapchain_op_type { D3D12_SWAPCHAIN_OP_PRESENT, + D3D12_SWAPCHAIN_OP_RESIZE_BUFFERS, }; struct d3d12_swapchain_op @@ -1094,15 +1096,39 @@ struct d3d12_swapchain_op VkImage vk_image; unsigned int frame_number; } present; + struct + { + /* The resize buffers op takes ownership of the memory and + * images used to back the previous ID3D12Resource + * objects, so that they're only released once the worker + * thread is done with them. */ + VkDeviceMemory vk_memory; + VkImage vk_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + DXGI_SWAP_CHAIN_DESC1 desc; + } resize_buffers; }; }; -static void d3d12_swapchain_op_destroy(struct d3d12_swapchain_op *op) +static void d3d12_swapchain_op_destroy(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op) { + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + unsigned int i; + + if (op->type == D3D12_SWAPCHAIN_OP_RESIZE_BUFFERS) + { + assert(swapchain->vk_device); + + for (i = 0; i < DXGI_MAX_SWAP_CHAIN_BUFFERS; ++i) + vk_funcs->p_vkDestroyImage(swapchain->vk_device, op->resize_buffers.vk_images[i], NULL); + + vk_funcs->p_vkFreeMemory(swapchain->vk_device, op->resize_buffers.vk_memory, NULL); + } + heap_free(op); } static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op); +static HRESULT d3d12_swapchain_op_resize_buffers_execute(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op); static DWORD WINAPI d3d12_swapchain_worker_proc(void *data) { @@ -1125,9 +1151,13 @@ static DWORD WINAPI d3d12_swapchain_worker_proc(void *data) case D3D12_SWAPCHAIN_OP_PRESENT: d3d12_swapchain_op_present_execute(swapchain, op); break; + + case D3D12_SWAPCHAIN_OP_RESIZE_BUFFERS: + d3d12_swapchain_op_resize_buffers_execute(swapchain, op); + break; } - d3d12_swapchain_op_destroy(op); + d3d12_swapchain_op_destroy(swapchain, op); if (!SetEvent(swapchain->worker_event)) ERR("Cannot set event, last error %ld.\n", GetLastError()); @@ -1702,7 +1732,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s HRESULT hr; if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, - swapchain->vk_surface, &swapchain->desc, &vk_swapchain_format))) + swapchain->vk_surface, &swapchain->backend_desc, &vk_swapchain_format))) return hr; if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical_device, @@ -1712,28 +1742,28 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s return hresult_from_vk_result(vr); } - image_count = swapchain->desc.BufferCount; + image_count = swapchain->backend_desc.BufferCount; image_count = max(image_count, surface_caps.minImageCount); if (surface_caps.maxImageCount) image_count = min(image_count, surface_caps.maxImageCount); - if (image_count != swapchain->desc.BufferCount) + if (image_count != swapchain->backend_desc.BufferCount) { - WARN("Buffer count %u is not supported (%u-%u).\n", swapchain->desc.BufferCount, + WARN("Buffer count %u is not supported (%u-%u).\n", swapchain->backend_desc.BufferCount, surface_caps.minImageCount, surface_caps.maxImageCount); } - width = swapchain->desc.Width; - height = swapchain->desc.Height; + width = swapchain->backend_desc.Width; + height = swapchain->backend_desc.Height; width = max(width, surface_caps.minImageExtent.width); width = min(width, surface_caps.maxImageExtent.width); height = max(height, surface_caps.minImageExtent.height); height = min(height, surface_caps.maxImageExtent.height); - if (width != swapchain->desc.Width || height != swapchain->desc.Height) + if (width != swapchain->backend_desc.Width || height != swapchain->backend_desc.Height) { WARN("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", - swapchain->desc.Width, swapchain->desc.Height, + swapchain->backend_desc.Width, swapchain->backend_desc.Height, surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height); } @@ -1751,7 +1781,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT; if (!(usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) || !(usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) WARN("Transfer not supported for swapchain images.\n"); - if (swapchain->desc.BufferUsage & DXGI_USAGE_SHADER_INPUT) + if (swapchain->backend_desc.BufferUsage & DXGI_USAGE_SHADER_INPUT) { usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_SAMPLED_BIT; if (!(usage & VK_IMAGE_USAGE_SAMPLED_BIT)) @@ -1908,7 +1938,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) LIST_FOR_EACH_ENTRY_SAFE(op, op2, &swapchain->worker_ops, struct d3d12_swapchain_op, entry) { - d3d12_swapchain_op_destroy(op); + d3d12_swapchain_op_destroy(swapchain, op); } d3d12_swapchain_destroy_vulkan_resources(swapchain); @@ -2409,13 +2439,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain4 *iface, return S_OK; } +static HRESULT d3d12_swapchain_op_resize_buffers_execute(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op) +{ + d3d12_swapchain_destroy_vulkan_resources(swapchain); + + swapchain->backend_desc = op->resize_buffers.desc; + + return d3d12_swapchain_create_vulkan_resources(swapchain); +} + static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags) { DXGI_SWAP_CHAIN_DESC1 *desc, new_desc; + struct d3d12_swapchain_op *op; unsigned int i; ULONG refcount; - HRESULT hr; if (flags) FIXME("Ignoring flags %#x.\n", flags); @@ -2459,20 +2498,40 @@ static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, if (!dxgi_validate_swapchain_desc(&new_desc)) return DXGI_ERROR_INVALID_CALL; - swapchain->current_buffer_index = 0; - if (desc->Width == new_desc.Width && desc->Height == new_desc.Height && desc->Format == new_desc.Format && desc->BufferCount == new_desc.BufferCount) + { + swapchain->current_buffer_index = 0; return S_OK; + } + + if (!(op = heap_alloc_zero(sizeof(*op)))) + { + WARN("Cannot allocate memory.\n"); + return E_OUTOFMEMORY; + } + + op->type = D3D12_SWAPCHAIN_OP_RESIZE_BUFFERS; + op->resize_buffers.vk_memory = swapchain->vk_memory; + swapchain->vk_memory = VK_NULL_HANDLE; + memcpy(&op->resize_buffers.vk_images, &swapchain->vk_images, sizeof(swapchain->vk_images)); + memset(&swapchain->vk_images, 0, sizeof(swapchain->vk_images)); + op->resize_buffers.desc = new_desc; + + EnterCriticalSection(&swapchain->worker_cs); + list_add_tail(&swapchain->worker_ops, &op->entry); + WakeAllConditionVariable(&swapchain->worker_cv); + LeaveCriticalSection(&swapchain->worker_cs); + + WaitForSingleObject(swapchain->worker_event, INFINITE); + + swapchain->current_buffer_index = 0; - d3d12_swapchain_destroy_vulkan_resources(swapchain); d3d12_swapchain_destroy_d3d12_resources(swapchain); - swapchain->desc = new_desc; - if (FAILED(hr = d3d12_swapchain_create_d3d12_resources(swapchain))) - return hr; + swapchain->desc = new_desc; - return d3d12_swapchain_create_vulkan_resources(swapchain); + return d3d12_swapchain_create_d3d12_resources(swapchain); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain4 *iface, @@ -3039,6 +3098,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI swapchain->window = window; swapchain->desc = *swapchain_desc; + swapchain->backend_desc = *swapchain_desc; swapchain->fullscreen_desc = *fullscreen_desc; swapchain->present_mode = VK_PRESENT_MODE_FIFO_KHR;

1 0

Giovanni Mascellani : dxgi: Remove the worker event, which is now useless.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 060e9f7694d9d9af38421eda0071e03021bf2b3c URL: https://gitlab.winehq.org/wine/wine/-/commit/060e9f7694d9d9af38421eda0071e0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 23 16:21:33 2023 +0200 dxgi: Remove the worker event, which is now useless. --- dlls/dxgi/swapchain.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ea93efb5643..81cb6dcd575 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1029,7 +1029,6 @@ struct d3d12_swapchain CONDITION_VARIABLE worker_cv; bool worker_running; struct list worker_ops; - HANDLE worker_event; /* D3D12 side of the swapchain (frontend): these objects are * visible to the IDXGISwapChain client, so they must never be @@ -1159,9 +1158,6 @@ static DWORD WINAPI d3d12_swapchain_worker_proc(void *data) d3d12_swapchain_op_destroy(swapchain, op); - if (!SetEvent(swapchain->worker_event)) - ERR("Cannot set event, last error %ld.\n", GetLastError()); - EnterCriticalSection(&swapchain->worker_cs); } else if (!SleepConditionVariableCS(&swapchain->worker_cv, &swapchain->worker_cs, INFINITE)) @@ -1931,9 +1927,6 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) ERR("Failed to close worker thread, last error %ld.\n", GetLastError()); } - if (!CloseHandle(swapchain->worker_event)) - ERR("Failed to close worker event, last error %ld.\n", GetLastError()); - DeleteCriticalSection(&swapchain->worker_cs); LIST_FOR_EACH_ENTRY_SAFE(op, op2, &swapchain->worker_ops, struct d3d12_swapchain_op, entry) @@ -2243,8 +2236,6 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, WakeAllConditionVariable(&swapchain->worker_cv); LeaveCriticalSection(&swapchain->worker_cs); - WaitForSingleObject(swapchain->worker_event, INFINITE); - ++swapchain->frame_number; if ((frame_latency_event = swapchain->frame_latency_event)) { @@ -2523,8 +2514,6 @@ static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, WakeAllConditionVariable(&swapchain->worker_cv); LeaveCriticalSection(&swapchain->worker_cs); - WaitForSingleObject(swapchain->worker_event, INFINITE); - swapchain->current_buffer_index = 0; d3d12_swapchain_destroy_d3d12_resources(swapchain); @@ -3194,14 +3183,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI swapchain->worker_running = true; list_init(&swapchain->worker_ops); - if (!(swapchain->worker_event = CreateEventA(NULL, FALSE, FALSE, NULL))) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - WARN("Failed to create worker event, hr %#lx.\n", hr); - d3d12_swapchain_destroy(swapchain); - return hr; - } - surface_desc.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; surface_desc.pNext = NULL; surface_desc.flags = 0;

1 0

Giovanni Mascellani : dxgi: Do not allow vkd3d_acquire_vk_queue() to fail.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 3dad51fba8b9c835732820677477cb04ba50f588 URL: https://gitlab.winehq.org/wine/wine/-/commit/3dad51fba8b9c835732820677477cb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Jul 2 22:06:11 2023 +0200 dxgi: Do not allow vkd3d_acquire_vk_queue() to fail. The implementation even asserts its return value. --- dlls/dxgi/swapchain.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 81cb6dcd575..e70e4b042c1 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1663,16 +1663,9 @@ static void d3d12_swapchain_destroy_vulkan_resources(struct d3d12_swapchain *swa if (swapchain->command_queue) { - if ((vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) - { - vk_funcs->p_vkQueueWaitIdle(vk_queue); - - vkd3d_release_vk_queue(swapchain->command_queue); - } - else - { - WARN("Failed to acquire Vulkan queue.\n"); - } + vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); + vk_funcs->p_vkQueueWaitIdle(vk_queue); + vkd3d_release_vk_queue(swapchain->command_queue); } if (swapchain->vk_device) @@ -2147,11 +2140,7 @@ static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapch if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, op->present.sync_interval))) return hr; - if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) - { - ERR("Failed to acquire Vulkan queue.\n"); - return E_FAIL; - } + vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image); if (vr == VK_ERROR_OUT_OF_DATE_KHR) @@ -2164,11 +2153,7 @@ static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapch if (FAILED(hr = d3d12_swapchain_create_vulkan_resources(swapchain))) return hr; - if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) - { - ERR("Failed to acquire Vulkan queue.\n"); - return E_FAIL; - } + vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image)) < 0) ERR("Failed to present after recreating swapchain, vr %d.\n", vr);

1 0

Giovanni Mascellani : dxgi: Acquire and release the Vulkan queue inside d3d12_swapchain_queue_present().
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 23a1642673fdc28380c0eff076734a9f712f8b4e URL: https://gitlab.winehq.org/wine/wine/-/commit/23a1642673fdc28380c0eff076734a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Jul 2 22:10:20 2023 +0200 dxgi: Acquire and release the Vulkan queue inside d3d12_swapchain_queue_present(). --- dlls/dxgi/swapchain.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e70e4b042c1..d3140c83c39 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2068,13 +2068,14 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return d3d12_swapchain_create_vulkan_resources(swapchain); } -static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue, VkImage vk_src_image) +static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkImage vk_src_image) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkPresentInfoKHR present_info; VkCommandBuffer vk_cmd_buffer; VkSubmitInfo submit_info; VkImage vk_dst_image; + VkQueue vk_queue; VkResult vr; if (swapchain->vk_image_index == INVALID_VK_IMAGE_INDEX) @@ -2098,6 +2099,8 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, vk_cmd_buffer, vk_dst_image, vk_src_image)) < 0 ) return vr; + vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submit_info.pNext = NULL; submit_info.waitSemaphoreCount = 0; @@ -2111,6 +2114,7 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) { ERR("Failed to blit swapchain buffer, vr %d.\n", vr); + vkd3d_release_vk_queue(swapchain->command_queue); return vr; } @@ -2128,39 +2132,32 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, if ((vr = vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info)) >= 0) swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX; + vkd3d_release_vk_queue(swapchain->command_queue); + return vr; } static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op) { - VkQueue vk_queue; VkResult vr; HRESULT hr; if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, op->present.sync_interval))) return hr; - vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); - - vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image); + vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { - vkd3d_release_vk_queue(swapchain->command_queue); - TRACE("Recreating Vulkan swapchain.\n"); d3d12_swapchain_destroy_vulkan_resources(swapchain); if (FAILED(hr = d3d12_swapchain_create_vulkan_resources(swapchain))) return hr; - vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); - - if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image)) < 0) + if ((vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image)) < 0) ERR("Failed to present after recreating swapchain, vr %d.\n", vr); } - vkd3d_release_vk_queue(swapchain->command_queue); - if (vr < 0) { ERR("Failed to queue present, vr %d.\n", vr);

1 0

Giovanni Mascellani : dxgi: Wait before acquiring the Vulkan queue for presenting.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: e77a9eda74fde4a81467843c0030dadba8e9bbbb URL: https://gitlab.winehq.org/wine/wine/-/commit/e77a9eda74fde4a81467843c0030da… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Jul 2 22:32:23 2023 +0200 dxgi: Wait before acquiring the Vulkan queue for presenting. The reason is explained in upstream commit b2a1f6b5e4f59fbc7f91ada7e565639dcf4e8e7f, which also applies to earlier vkd3d versions. --- dlls/dxgi/swapchain.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index d3140c83c39..64c5958f780 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1056,6 +1056,8 @@ struct d3d12_swapchain VkPresentModeKHR present_mode; DXGI_SWAP_CHAIN_DESC1 backend_desc; + ID3D12Fence *present_fence; + uint32_t vk_image_index; struct dxgi_vk_funcs vk_funcs; @@ -1930,6 +1932,9 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) d3d12_swapchain_destroy_vulkan_resources(swapchain); d3d12_swapchain_destroy_d3d12_resources(swapchain); + if (swapchain->present_fence) + ID3D12Fence_Release(swapchain->present_fence); + if (swapchain->frame_latency_event) CloseHandle(swapchain->frame_latency_event); @@ -2068,7 +2073,8 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return d3d12_swapchain_create_vulkan_resources(swapchain); } -static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkImage vk_src_image) +static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkImage vk_src_image, + uint64_t frame_number) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkPresentInfoKHR present_info; @@ -2077,6 +2083,7 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkImage vk_dst_image; VkQueue vk_queue; VkResult vr; + HRESULT hr; if (swapchain->vk_image_index == INVALID_VK_IMAGE_INDEX) { @@ -2099,6 +2106,12 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, vk_cmd_buffer, vk_dst_image, vk_src_image)) < 0 ) return vr; + if (FAILED(hr = ID3D12Fence_SetEventOnCompletion(swapchain->present_fence, frame_number + 1, NULL))) + { + ERR("Failed to wait for present event, hr %#lx.\n", hr); + return VK_ERROR_UNKNOWN; + } + vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; @@ -2145,7 +2158,7 @@ static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapch if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, op->present.sync_interval))) return hr; - vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image); + vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image, op->present.frame_number); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { TRACE("Recreating Vulkan swapchain.\n"); @@ -2154,7 +2167,7 @@ static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapch if (FAILED(hr = d3d12_swapchain_create_vulkan_resources(swapchain))) return hr; - if ((vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image)) < 0) + if ((vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image, op->present.frame_number)) < 0) ERR("Failed to present after recreating swapchain, vr %d.\n", vr); } @@ -2233,6 +2246,13 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, } } + if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue, + swapchain->present_fence, swapchain->frame_number))) + { + ERR("Failed to signal present fence, hf %#lx.\n", hr); + return hr; + } + swapchain->current_buffer_index = (swapchain->current_buffer_index + 1) % swapchain->desc.BufferCount; return S_OK; } @@ -3236,6 +3256,14 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } } + if (FAILED(hr = ID3D12Device_CreateFence(device, 0, 0, + &IID_ID3D12Fence, (void **)&swapchain->present_fence))) + { + WARN("Failed to create present fence, hr %#lx.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + IWineDXGIFactory_AddRef(swapchain->factory = factory); if (!(swapchain->worker_thread = CreateThread(NULL, 0, d3d12_swapchain_worker_proc, swapchain, 0, NULL)))

1 0

Jinoh Kang : ntdll: Fail loudly if RtlActivateActivationContextEx fails to allocate memory.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 86893ce299223d6dbb2a58cd06d2b8ca8dec26c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/86893ce299223d6dbb2a58cd06d2b8… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 13 23:17:11 2023 +0900 ntdll: Fail loudly if RtlActivateActivationContextEx fails to allocate memory. Many built-in callers of ActivateActCtx() just assume that it will always succeed. If it ever fails, then DeactivateActCtx() will notice that the cookie is invalid and raise an exception anyway. --- dlls/ntdll/actctx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 73f852f2547..853ac34d12e 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -5423,9 +5423,7 @@ NTSTATUS WINAPI RtlActivateActivationContextEx( ULONG flags, TEB *teb, HANDLE ha ACTIVATION_CONTEXT_STACK *actctx_stack = teb->ActivationContextStackPointer; RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; - if (!(frame = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*frame) ))) - return STATUS_NO_MEMORY; - + frame = RtlAllocateHeap( GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(*frame) ); frame->Previous = actctx_stack->ActiveFrame; frame->ActivationContext = handle; frame->Flags = 0;

1 0

Sven Baars : wow64win: Always use NtUserSetWindowLongPtr() for GWLP_HINSTANCE and GWLP_WNDPROC.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 94d61d1b280d0ef15474c0cf44f534d5d44eba1f URL: https://gitlab.winehq.org/wine/wine/-/commit/94d61d1b280d0ef15474c0cf44f534… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Jul 12 09:07:50 2023 +0200 wow64win: Always use NtUserSetWindowLongPtr() for GWLP_HINSTANCE and GWLP_WNDPROC. --- dlls/user32/tests/win.c | 9 +++++++++ dlls/wow64win/user.c | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 31d14480861..a3216da9f46 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7293,6 +7293,15 @@ static void test_SetWindowLong(void) "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%Ix\n", retval); ok(IsWindowUnicode(hwndMain), "hwndMain should now be Unicode\n"); + /* Make sure nothing changes if we set the same proc */ + retval = SetWindowLongPtrW(hwndMain, GWLP_WNDPROC, (LONG_PTR)old_window_procW); + todo_wine + ok((WNDPROC)retval == main_window_procA, "unexpected proc 0x%Ix\n", retval); + retval = GetWindowLongPtrW(hwndMain, GWLP_WNDPROC); + ok((WNDPROC)retval == old_window_procW, "unexpected proc 0x%Ix\n", retval); + retval = GetWindowLongPtrA(hwndMain, GWLP_WNDPROC); + ok((WNDPROC)retval == main_window_procA, "unexpected proc 0x%Ix\n", retval); + /* set it back to ANSI */ SetWindowLongPtrA(hwndMain, GWLP_WNDPROC, 0); } diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 8065a05f44a..602ccfa79b9 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3832,6 +3832,13 @@ NTSTATUS WINAPI wow64_NtUserSetWindowLong( UINT *args ) LONG newval = get_ulong( &args ); BOOL ansi = get_ulong( &args ); + switch (offset) + { + case GWLP_HINSTANCE: + case GWLP_WNDPROC: + return NtUserSetWindowLongPtr( hwnd, offset, (ULONG)newval, ansi ); + } + return NtUserSetWindowLong( hwnd, offset, newval, ansi ); }

1 0

Alexandre Julliard : inetcomm: Use nameless unions/structs.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 6431b9584b3bb957c7d819b0d1ce652bdb68a254 URL: https://gitlab.winehq.org/wine/wine/-/commit/6431b9584b3bb957c7d819b0d1ce65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:57:54 2023 +0200 inetcomm: Use nameless unions/structs. --- dlls/inetcomm/mimeintl.c | 1 - dlls/inetcomm/mimeole.c | 11 +++++------ dlls/inetcomm/pop3transport.c | 1 - dlls/inetcomm/protocol.c | 5 ++--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 0ac695afb39..1e5b1a0ce90 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index dd2c00b01fa..5a2225b2fdf 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -20,7 +20,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> @@ -267,7 +266,7 @@ static HRESULT WINAPI sub_stream_Seek( sub_stream_t *This = impl_from_IStream(iface); LARGE_INTEGER new_pos; - TRACE("(%08lx.%08lx, %lx, %p)\n", dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + TRACE("(%08lx.%08lx, %lx, %p)\n", dlibMove.HighPart, dlibMove.LowPart, dwOrigin, plibNewPosition); switch(dwOrigin) { @@ -314,7 +313,7 @@ static HRESULT WINAPI sub_stream_CopyTo( ULARGE_INTEGER totalBytesRead; ULARGE_INTEGER totalBytesWritten; - TRACE("(%p)->(%p, %ld, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten); + TRACE("(%p)->(%p, %ld, %p, %p)\n", iface, pstm, cb.LowPart, pcbRead, pcbWritten); totalBytesRead.QuadPart = 0; totalBytesWritten.QuadPart = 0; @@ -324,7 +323,7 @@ static HRESULT WINAPI sub_stream_CopyTo( if ( cb.QuadPart >= sizeof(tmpBuffer) ) copySize = sizeof(tmpBuffer); else - copySize = cb.u.LowPart; + copySize = cb.LowPart; hr = IStream_Read(iface, tmpBuffer, copySize, &bytesRead); if (FAILED(hr)) break; @@ -2063,7 +2062,7 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc zero.QuadPart = 0; hr = IStream_Seek(stm, zero, STREAM_SEEK_CUR, &cur); - start = cur.u.LowPart; + start = cur.LowPart; do { hr = IStream_Read(stm, overlap, PARSER_BUF_SIZE, &read); @@ -2218,7 +2217,7 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) zero.QuadPart = 0; IStream_Seek(pStm, zero, STREAM_SEEK_END, &cur); - offsets.cbBodyEnd = cur.u.LowPart; + offsets.cbBodyEnd = cur.LowPart; MimeBody_set_offsets(root_body->mime_body, &offsets); list_add_head(&This->body_tree, &root_body->entry); diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 7901b831cb5..6dbbab1fa3f 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index c98139ad49e..155adace482 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <assert.h> @@ -316,7 +315,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if assert(pstgmed->tymed == TYMED_ISTREAM); while(1) { - hres = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read); + hres = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &read); if(FAILED(hres)) return hres; if(!read) @@ -567,7 +566,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Seek(IInternetProtocol *iface, LARGE_INTE DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; }

1 0

Alexandre Julliard : inetcpl.cpl: Use nameless unions/structs.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: ed412aeb81128187d08506d31378164680268013 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed412aeb81128187d08506d3137816… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:58:05 2023 +0200 inetcpl.cpl: Use nameless unions/structs. --- dlls/inetcpl.cpl/inetcpl.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index a2feccb3eb1..770a93ef007 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -19,7 +19,6 @@ * */ -#define NONAMELESSUNION #define COBJMACROS #define CONST_VTABLE @@ -108,25 +107,25 @@ static void display_cpl_sheets(HWND parent) /* Fill out all PROPSHEETPAGE */ psp[id].dwSize = sizeof (PROPSHEETPAGEW); psp[id].hInstance = hcpl; - psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_GENERAL); + psp[id].pszTemplate = MAKEINTRESOURCEW(IDD_GENERAL); psp[id].pfnDlgProc = general_dlgproc; id++; psp[id].dwSize = sizeof (PROPSHEETPAGEW); psp[id].hInstance = hcpl; - psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_SECURITY); + psp[id].pszTemplate = MAKEINTRESOURCEW(IDD_SECURITY); psp[id].pfnDlgProc = security_dlgproc; id++; psp[id].dwSize = sizeof (PROPSHEETPAGEW); psp[id].hInstance = hcpl; - psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONTENT); + psp[id].pszTemplate = MAKEINTRESOURCEW(IDD_CONTENT); psp[id].pfnDlgProc = content_dlgproc; id++; psp[id].dwSize = sizeof (PROPSHEETPAGEW); psp[id].hInstance = hcpl; - psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTIONS); + psp[id].pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTIONS); psp[id].pfnDlgProc = connections_dlgproc; id++; @@ -135,10 +134,10 @@ static void display_cpl_sheets(HWND parent) psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = parent; psh.hInstance = hcpl; - psh.u.pszIcon = MAKEINTRESOURCEW(ICO_MAIN); + psh.pszIcon = MAKEINTRESOURCEW(ICO_MAIN); psh.pszCaption = MAKEINTRESOURCEW(IDS_CPL_NAME); psh.nPages = id; - psh.u3.ppsp = psp; + psh.ppsp = psp; psh.pfnCallback = propsheet_callback; /* display the dialog */

1 0

Alexandre Julliard : inetmib1: Use nameless unions/structs.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 962622e67d95e73eb765d6a1ef03108f13ed9cc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/962622e67d95e73eb765d6a1ef0310… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:58:25 2023 +0200 inetmib1: Use nameless unions/structs. --- dlls/inetmib1/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 5d925183505..6a662c2f72a 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -21,8 +21,6 @@ #include <stdlib.h> #include <limits.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winsock2.h" @@ -672,7 +670,7 @@ static void mib2IpStatsInit(void) } static struct structToAsnValue mib2IpMap[] = { - { FIELD_OFFSET(MIB_IPSTATS, u.dwForwarding), copyInt }, /* 1 */ + { FIELD_OFFSET(MIB_IPSTATS, dwForwarding), copyInt }, /* 1 */ { FIELD_OFFSET(MIB_IPSTATS, dwDefaultTTL), copyInt }, /* 2 */ { FIELD_OFFSET(MIB_IPSTATS, dwInReceives), copyInt }, /* 3 */ { FIELD_OFFSET(MIB_IPSTATS, dwInHdrErrors), copyInt }, /* 4 */ @@ -833,8 +831,8 @@ static struct structToAsnValue mib2IpRouteMap[] = { { FIELD_OFFSET(MIB_IPFORWARDROW, dwForwardMetric3), copyInt }, { FIELD_OFFSET(MIB_IPFORWARDROW, dwForwardMetric4), copyInt }, { FIELD_OFFSET(MIB_IPFORWARDROW, dwForwardNextHop), copyIpAddr }, - { FIELD_OFFSET(MIB_IPFORWARDROW, u1.dwForwardType), copyInt }, - { FIELD_OFFSET(MIB_IPFORWARDROW, u2.dwForwardProto), copyInt }, + { FIELD_OFFSET(MIB_IPFORWARDROW, dwForwardType), copyInt }, + { FIELD_OFFSET(MIB_IPFORWARDROW, dwForwardProto), copyInt }, { FIELD_OFFSET(MIB_IPFORWARDROW, dwForwardAge), copyInt }, { FIELD_OFFSET(MIB_IPFORWARDROW, dwForwardMask), copyIpAddr }, { FIELD_OFFSET(MIB_IPFORWARDROW, dwForwardMetric5), copyInt }, @@ -930,7 +928,7 @@ static struct structToAsnValue mib2IpNetMap[] = { { FIELD_OFFSET(MIB_IPNETROW, dwIndex), copyInt }, { FIELD_OFFSET(MIB_IPNETROW, dwPhysAddrLen), copyIpNetPhysAddr }, { FIELD_OFFSET(MIB_IPNETROW, dwAddr), copyIpAddr }, - { FIELD_OFFSET(MIB_IPNETROW, u.dwType), copyInt }, + { FIELD_OFFSET(MIB_IPNETROW, dwType), copyInt }, }; static void mib2IpNetInit(void) @@ -1085,7 +1083,7 @@ static void mib2TcpInit(void) } static struct structToAsnValue mib2TcpMap[] = { - { FIELD_OFFSET(MIB_TCPSTATS, u.dwRtoAlgorithm), copyInt }, + { FIELD_OFFSET(MIB_TCPSTATS, dwRtoAlgorithm), copyInt }, { FIELD_OFFSET(MIB_TCPSTATS, dwRtoMin), copyInt }, { FIELD_OFFSET(MIB_TCPSTATS, dwRtoMax), copyInt }, { FIELD_OFFSET(MIB_TCPSTATS, dwMaxConn), copyInt },

1 0