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

Sven Baars : wow64win: Always use NtUserSetWindowLongPtr() for GWLP_HINSTANCE and GWLP_WNDPROC.
by Alexandre Julliard July 13, 2023

July 13, 2023

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

Giovanni Mascellani : dxgi: Acquire and release the Vulkan queue inside d3d12_swapchain_queue_present().
by Alexandre Julliard July 13, 2023

July 13, 2023

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: Do not allow vkd3d_acquire_vk_queue() to fail.
by Alexandre Julliard July 13, 2023

July 13, 2023

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: Introduce a worker thread for the D3D12 swapchain.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: f07859d75b39164f92b78ead7828c28924fe5c7e URL: https://gitlab.winehq.org/wine/wine/-/commit/f07859d75b39164f92b78ead7828c2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jun 22 11:03:42 2023 +0200 dxgi: Introduce a worker thread for the D3D12 swapchain. In the following commits the worker thread will be used for actual presenting and buffer resizing. In this way the worker thread can wait on the vkd3d queue without blocking or even deadlocking the application. --- dlls/dxgi/swapchain.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 34678a3a3a7..8a84ea30065 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1024,6 +1024,11 @@ struct d3d12_swapchain VkDevice vk_device; VkPhysicalDevice vk_physical_device; + HANDLE worker_thread; + CRITICAL_SECTION worker_cs; + CONDITION_VARIABLE worker_cv; + bool worker_running; + /* D3D12 side of the swapchain (frontend): these objects are * visible to the IDXGISwapChain client, so they must never be * recreated, except when ResizeBuffers*() is called. */ @@ -1070,6 +1075,26 @@ struct d3d12_swapchain uint32_t frame_latency; }; +static DWORD WINAPI d3d12_swapchain_worker_proc(void *data) +{ + struct d3d12_swapchain *swapchain = data; + + EnterCriticalSection(&swapchain->worker_cs); + + while (swapchain->worker_running) + { + if (!SleepConditionVariableCS(&swapchain->worker_cv, &swapchain->worker_cs, INFINITE)) + { + ERR("Cannot sleep on condition variable, last error %ld.\n", GetLastError()); + break; + } + } + + LeaveCriticalSection(&swapchain->worker_cs); + + return 0; +} + static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) { switch (vk_format) @@ -1808,6 +1833,23 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; void *vulkan_module = vk_funcs->vulkan_module; + DWORD ret; + + EnterCriticalSection(&swapchain->worker_cs); + swapchain->worker_running = false; + WakeAllConditionVariable(&swapchain->worker_cv); + LeaveCriticalSection(&swapchain->worker_cs); + + if (swapchain->worker_thread) + { + if ((ret = WaitForSingleObject(swapchain->worker_thread, INFINITE)) != WAIT_OBJECT_0) + ERR("Failed to wait for worker thread, return value %ld.\n", ret); + + if (!CloseHandle(swapchain->worker_thread)) + ERR("Failed to close worker thread, last error %ld.\n", GetLastError()); + } + + DeleteCriticalSection(&swapchain->worker_cs); d3d12_swapchain_destroy_vulkan_resources(swapchain); d3d12_swapchain_destroy_d3d12_resources(swapchain); @@ -2996,6 +3038,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI wined3d_private_store_init(&swapchain->private_store); + InitializeCriticalSection(&swapchain->worker_cs); + InitializeConditionVariable(&swapchain->worker_cv); + swapchain->worker_running = true; + surface_desc.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; surface_desc.pNext = NULL; surface_desc.flags = 0; @@ -3069,6 +3115,14 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI IWineDXGIFactory_AddRef(swapchain->factory = factory); + if (!(swapchain->worker_thread = CreateThread(NULL, 0, d3d12_swapchain_worker_proc, swapchain, 0, NULL))) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to create worker thread, hr %#lx.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + return S_OK; }

1 0

Giovanni Mascellani : dxgi: Move presentation to the worker thread.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 8cc427978f8e5491c13bfc3952e35174cb41e924 URL: https://gitlab.winehq.org/wine/wine/-/commit/8cc427978f8e5491c13bfc3952e351… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jun 22 12:52:46 2023 +0200 dxgi: Move presentation to the worker thread. The main thread still waits for the worker thread, in order to keep buffer resizing synchronized with presentation. As soon as buffer presentation is offloaded to the worker thread too the wait can be dropped. --- dlls/dxgi/swapchain.c | 156 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 128 insertions(+), 28 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8a84ea30065..f140317781e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1028,6 +1028,8 @@ struct d3d12_swapchain CRITICAL_SECTION worker_cs; 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 @@ -1075,6 +1077,33 @@ struct d3d12_swapchain uint32_t frame_latency; }; +enum d3d12_swapchain_op_type +{ + D3D12_SWAPCHAIN_OP_PRESENT, +}; + +struct d3d12_swapchain_op +{ + struct list entry; + enum d3d12_swapchain_op_type type; + union + { + struct + { + unsigned int sync_interval; + VkImage vk_image; + unsigned int frame_number; + } present; + }; +}; + +static void d3d12_swapchain_op_destroy(struct d3d12_swapchain_op *op) +{ + heap_free(op); +} + +static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op); + static DWORD WINAPI d3d12_swapchain_worker_proc(void *data) { struct d3d12_swapchain *swapchain = data; @@ -1083,7 +1112,29 @@ static DWORD WINAPI d3d12_swapchain_worker_proc(void *data) while (swapchain->worker_running) { - if (!SleepConditionVariableCS(&swapchain->worker_cv, &swapchain->worker_cs, INFINITE)) + if (!list_empty(&swapchain->worker_ops)) + { + struct d3d12_swapchain_op *op = LIST_ENTRY(list_head(&swapchain->worker_ops), struct d3d12_swapchain_op, entry); + + list_remove(&op->entry); + + LeaveCriticalSection(&swapchain->worker_cs); + + switch (op->type) + { + case D3D12_SWAPCHAIN_OP_PRESENT: + d3d12_swapchain_op_present_execute(swapchain, op); + break; + } + + d3d12_swapchain_op_destroy(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)) { ERR("Cannot sleep on condition variable, last error %ld.\n", GetLastError()); break; @@ -1833,6 +1884,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; void *vulkan_module = vk_funcs->vulkan_module; + struct d3d12_swapchain_op *op, *op2; DWORD ret; EnterCriticalSection(&swapchain->worker_cs); @@ -1849,8 +1901,16 @@ 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) + { + d3d12_swapchain_op_destroy(op); + } + d3d12_swapchain_destroy_vulkan_resources(swapchain); d3d12_swapchain_destroy_d3d12_resources(swapchain); @@ -2055,29 +2115,13 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, return vr; } -static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, - unsigned int sync_interval, unsigned int flags) +static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op) { - HANDLE frame_latency_event; VkQueue vk_queue; VkResult vr; HRESULT hr; - if (sync_interval > 4) - { - WARN("Invalid sync interval %u.\n", sync_interval); - return DXGI_ERROR_INVALID_CALL; - } - - if (flags & ~DXGI_PRESENT_TEST) - FIXME("Unimplemented flags %#x.\n", flags); - if (flags & DXGI_PRESENT_TEST) - { - WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); - return S_OK; - } - - if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, sync_interval))) + 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))) @@ -2086,8 +2130,7 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return E_FAIL; } - vr = d3d12_swapchain_queue_present(swapchain, vk_queue, - swapchain->vk_images[swapchain->current_buffer_index]); + vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { vkd3d_release_vk_queue(swapchain->command_queue); @@ -2104,8 +2147,7 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return E_FAIL; } - if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue, - swapchain->vk_images[swapchain->current_buffer_index])) < 0) + 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); } @@ -2117,12 +2159,11 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return hresult_from_vk_result(vr); } - ++swapchain->frame_number; - if ((frame_latency_event = swapchain->frame_latency_event)) + if (swapchain->frame_latency_fence) { - /* Bias the frame number to avoid underflowing in - * SetEventOnCompletion(). */ - uint64_t number = swapchain->frame_number + DXGI_MAX_SWAP_CHAIN_BUFFERS; + /* Use the same bias as d3d12_swapchain_present(). Add one to + * account for the "++swapchain->frame_numer" there. */ + uint64_t number = op->present.frame_number + DXGI_MAX_SWAP_CHAIN_BUFFERS + 1; if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue, swapchain->frame_latency_fence, number))) @@ -2130,6 +2171,56 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, ERR("Failed to signal frame latency fence, hr %#lx.\n", hr); return hr; } + } + + return S_OK; +} + +static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, + unsigned int sync_interval, unsigned int flags) +{ + struct d3d12_swapchain_op *op; + HANDLE frame_latency_event; + HRESULT hr; + + if (sync_interval > 4) + { + WARN("Invalid sync interval %u.\n", sync_interval); + return DXGI_ERROR_INVALID_CALL; + } + + if (flags & ~DXGI_PRESENT_TEST) + FIXME("Unimplemented flags %#x.\n", flags); + if (flags & DXGI_PRESENT_TEST) + { + WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); + return S_OK; + } + + if (!(op = heap_alloc_zero(sizeof(*op)))) + { + WARN("Cannot allocate memory.\n"); + return E_OUTOFMEMORY; + } + + op->type = D3D12_SWAPCHAIN_OP_PRESENT; + op->present.sync_interval = sync_interval; + op->present.vk_image = swapchain->vk_images[swapchain->current_buffer_index]; + op->present.frame_number = swapchain->frame_number; + + 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->frame_number; + if ((frame_latency_event = swapchain->frame_latency_event)) + { + /* Bias the frame number to avoid underflowing in + * SetEventOnCompletion(). */ + uint64_t number = swapchain->frame_number + DXGI_MAX_SWAP_CHAIN_BUFFERS; if (FAILED(hr = ID3D12Fence_SetEventOnCompletion(swapchain->frame_latency_fence, number - swapchain->frame_latency, frame_latency_event))) @@ -3041,6 +3132,15 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI InitializeCriticalSection(&swapchain->worker_cs); InitializeConditionVariable(&swapchain->worker_cv); 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;

1 0

Giovanni Mascellani : dxgi: Move buffer resizing to the worker thread.
by Alexandre Julliard July 13, 2023

July 13, 2023

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 July 13, 2023

July 13, 2023

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

Hans Lehnert : wininet: Handle http headers correctly when length is 0.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: b5dcfdad5f2f91bac16e62342fed171dbeb15c08 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5dcfdad5f2f91bac16e62342fed17… Author: Hans Lehnert <hans.lehnert(a)gmail.com> Date: Wed Jul 12 20:31:39 2023 -0700 wininet: Handle http headers correctly when length is 0. In HttpSendRequestW and HttpSendRequestExW, if the header pointer is not null but the length parameter is 0, the header length should be derived from the string length instead. In HttpSendRequestA and HttpSendRequestExA, on the same scenario, the function should fail instead. --- dlls/wininet/http.c | 25 +++++++++++++++++++---- dlls/wininet/tests/http.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b646ddf5b69..ac3a1955270 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1274,7 +1274,7 @@ BOOL WINAPI HttpAddRequestHeadersW(HINTERNET hHttpRequest, TRACE("%p, %s, %lu, %08lx\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); - if (!lpszHeader) + if (!lpszHeader) return TRUE; request = (http_request_t*) get_handle_object( hHttpRequest ); @@ -4063,13 +4063,13 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel, info_mod &= ~ modifier_flags[i].val; } } - + if (info_mod) { TRACE(" Unknown (%08lx)", info_mod); } TRACE("\n"); } - + request = (http_request_t*) get_handle_object( hHttpRequest ); if (NULL == request || request->hdr.htype != WH_HHTTPREQ) { @@ -5043,8 +5043,13 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } /* add the headers the caller supplied */ - if( lpszHeaders && dwHeaderLength ) + if (lpszHeaders) + { + if (dwHeaderLength == 0) + dwHeaderLength = lstrlenW(lpszHeaders); + HTTP_HttpAddRequestHeadersW(request, lpszHeaders, dwHeaderLength, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE); + } do { @@ -5551,6 +5556,12 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest, BuffersInW.dwStructSize = sizeof(LPINTERNET_BUFFERSW); if (lpBuffersIn->lpcszHeader) { + if (lpBuffersIn->dwHeadersLength == 0 && *lpBuffersIn->lpcszHeader != '\0') + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + headerlen = MultiByteToWideChar(CP_ACP,0,lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength,0,0); header = malloc(headerlen * sizeof(WCHAR)); @@ -5773,6 +5784,12 @@ BOOL WINAPI HttpSendRequestA(HINTERNET hHttpRequest, LPCSTR lpszHeaders, DWORD nLen=dwHeaderLength; if(lpszHeaders!=NULL) { + if (dwHeaderLength == 0 && *lpszHeaders != '\0') + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + nLen=MultiByteToWideChar(CP_ACP,0,lpszHeaders,dwHeaderLength,NULL,0); szHeaders = malloc(nLen * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP,0,lpszHeaders,dwHeaderLength,szHeaders,nLen); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6edab2141ae..026672c6536 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6574,6 +6574,57 @@ static void test_large_content(int port) close_connection(); } +static void test_header_length(int port) +{ + test_request_t req; + BOOL ret; + char buf[1000]; + char header[] = "Test-Header: winetest"; + WCHAR wheader[] = L"Test-Header: winetest"; + INTERNET_BUFFERSA buffer_in; + INTERNET_BUFFERSW wbuffer_in; + + open_simple_request(&req, "localhost", port, "GET", "/echo_request"); + + ret = HttpSendRequestA(req.request, header, 0, NULL, 0); + ok(ret == FALSE, "HttpSendRequestA should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER\n"); + + ret = HttpSendRequestW(req.request, wheader, 0, NULL, 0); + ok(ret, "HttpSendRequestW failed: %lu\n", GetLastError()); + test_status_code(req.request, 200); + + receive_simple_request(req.request, buf, sizeof(buf)); + ok(strstr(buf, header) != NULL, "custom header was not sent: %s\n", buf); + + close_request(&req); + + open_simple_request(&req, "localhost", port, "GET", "/echo_request"); + + ZeroMemory(&buffer_in, sizeof(buffer_in)); + buffer_in.dwStructSize = sizeof(buffer_in); + buffer_in.lpcszHeader = header; + ret = HttpSendRequestExA(req.request, &buffer_in, NULL, 0, 0); + ok(ret == FALSE, "HttpSendRequestExA should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER\n"); + + ZeroMemory(&wbuffer_in, sizeof(wbuffer_in)); + wbuffer_in.dwStructSize = sizeof(wbuffer_in); + wbuffer_in.lpcszHeader = wheader; + ret = HttpSendRequestExW(req.request, &wbuffer_in, NULL, 0, 0); + ok(ret, "HttpSendRequestExW failed: %lu\n", GetLastError()); + + ret = HttpEndRequestW(req.request, NULL, 0, 0); + ok(ret, "HttpEndRequestW failed: %lu\n", GetLastError()); + + test_status_code(req.request, 200); + + receive_simple_request(req.request, buf, sizeof(buf)); + ok(strstr(buf, header) != NULL, "custom header was not sent: %s\n", buf); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -6640,6 +6691,7 @@ static void test_http_connection(void) test_persistent_connection(si.port); test_remove_dot_segments(si.port); test_large_content(si.port); + test_header_length(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Alexandre Julliard : include: Add some new information classes.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 2436da5cef2ba436664bdfa429b6c3420148954e URL: https://gitlab.winehq.org/wine/wine/-/commit/2436da5cef2ba436664bdfa429b6c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 18:27:19 2023 +0200 include: Add some new information classes. --- dlls/kernelbase/process.c | 14 +++--- dlls/ntdll/unix/file.c | 12 +++--- dlls/wow64/sync.c | 4 +- include/winternl.h | 108 +++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 117 insertions(+), 21 deletions(-)

1 0

Alexandre Julliard : configure: Always disable winegstreamer if gst/gst.h is broken.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 96edde17d0d552b8d8453a621929c1fe29376027 URL: https://gitlab.winehq.org/wine/wine/-/commit/96edde17d0d552b8d8453a621929c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 21:23:23 2023 +0200 configure: Always disable winegstreamer if gst/gst.h is broken. --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index 8a7ed527eba..4d3108303b8 100755 --- a/configure +++ b/configure @@ -17175,6 +17175,7 @@ else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } ac_glib2_broken=yes + enable_winegstreamer=${enable_winegstreamer:-no} as_fn_append wine_notices "|glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built." fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 70138a7566b..c9ed1c8c431 100644 --- a/configure.ac +++ b/configure.ac @@ -1595,6 +1595,7 @@ then AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], [AC_MSG_RESULT([no]) ac_glib2_broken=yes + enable_winegstreamer=${enable_winegstreamer:-no} WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes],

1 0