- wine-gitlab - winehq.org

Re: [PATCH v5 0/7] MR5319: winemac.drv keyboard layout/dead key fixes
by Rémi Bernon (＠rbernon) 21 Jun '24

21 Jun '24

Rémi Bernon (@rbernon) commented about dlls/winemac.drv/keyboard.c: > &savedDeadKeyState, bufW_size, &len, bufW); > if (status != noErr) > { > - ERR_(key)("Couldn't translate keycode 0x%04x, status %d\n", keyc, status); > + ERR_(key)("Couldn't translate dead keycode 0x%04x, status %d\n", keyc, status); > goto done; > } > > + if (len >= 1) Same, doesn't seem to be necessary? If len is 0, and dead = TRUE, we just return 0 anyway? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5319#note_73909

1 0

[PATCH 0/3] MR5898: winex11, winemac, winewayland: Move surface code to the window surface source file.
by Rémi Bernon (＠rbernon) 21 Jun '24

21 Jun '24

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5898

3 5

[PATCH 0/5] MR5903: Cmd engine rewrite (part VIII)
by eric pouech (＠epo) 21 Jun '24

21 Jun '24

This is part VIII of cmd engine rewrite. It covers: - introduction of a token based parser. For now, it produces the same (degenerated) list of commands as we currently do. Note: I opted for a pull mode for the parser while the lexer is in push mode. Long term plan is to move the lexer into pull mode too (and also converge the two different current methods of argument/token access). - introduction of return codes. It's not obvious from current tests that lots of these codes are actually the kernel32 ones, but tests in later MRs will clearly show it. - starting changing 'exit' and 'goto' builtin implementations to use return code. All builtins will have to adopt that scheme for command chaining to be properly supported. - add delayed expansion for IF command. That's not needed for now (as single command execution already takes care of it), but will be needed when we move IF and FOR commands out of single command in yet to come MR. Includes some test to cover that part. (in case someone asks, it was needed in previous MR regarding the FOR command, as the delayed expansion was only called on the body of the FOR command, not the control block) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5903

2 5

[PATCH v2 0/1] MR5658: winevulkan: Make device memory wrapper available in callbacks.
by Arek Hiler (＠ivyl) 21 Jun '24

21 Jun '24

With [`VK_EXT_device_address_binding_report`](https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_device_address_binding_report.html) we can get [debug_util](https://registry.khronos.org/vulkan/specs/1.3-extensions/man/ht… callbacks used to track memory bindings. Since it's the host's implementation that starts the callback we have to be sure that we have a way of converting it to the client side's variant before it's added to the handle map - i.e. we don't know the host handle at that time yet. This is [used by vkd3d-proton](https://github.com/HansKristian-Work/vkd3d-proton/pull/1962). Requires Mesa with https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28649. before (note the missing BIND for VkDevice which actually means `VkDeviceMemory`): ``` vkd3d-proton % VKD3D_TEST_FILTER=create_placed_resource_size VKD3D_CONFIG=fault VKD3D_DEBUG=trace ~/src/wine/build/wine ./tests/d3d12.exe 2>&1 | grep vkd3d_address_binding_callback trace:vkd3d-proton:vkd3d_address_binding_callback: BIND || VkBuffer || VA ffff800100200000 || size 0000000001000000. trace:vkd3d-proton:vkd3d_address_binding_callback: BIND || VkImage || VA ffff800100200000 || size 000000000019a000. trace:vkd3d-proton:vkd3d_address_binding_callback: UNBIND || VkImage || VA ffff800100200000 || size 000000000019a000. trace:vkd3d-proton:vkd3d_address_binding_callback: UNBIND || VkBuffer || VA ffff800100200000 || size 0000000001000000. :trace:vkd3d-proton:vkd3d_address_binding_callback: UNBIND || VkDevice || VA ffff800100200000 || size 0000000001000000. 232285.553:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: BIND || VkBuffer || VA ffff800100200000 || size 0000000001000000. 232285.553:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: UNBIND || VkBuffer || VA ffff800100200000 || size 0000000001000000. 232285.553:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: UNBIND || VkDevice || VA ffff800100200000 || size 0000000001000000. ``` after: ``` % VKD3D_TEST_FILTER=create_placed_resource_size VKD3D_CONFIG=fault VKD3D_DEBUG=trace ~/src/wine/build/wine ./tests/d3d12.exe 2>&1 | grep vkd3d_address_binding_callback 232338.036:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: BIND || VkDevice || VA ffff800100200000 || size 0000000001000000. 232338.036:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: BIND || VkBuffer || VA ffff800100200000 || size 0000000001000000. 232338.037:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: BIND || VkImage || VA ffff800100200000 || size 000000000019a000. 232338.037:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: UNBIND || VkImage || VA ffff800100200000 || size 000000000019a000. 232338.037:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: UNBIND || VkBuffer || VA ffff800100200000 || size 0000000001000000. 232338.037:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: UNBIND || VkDevice || VA ffff800100200000 || size 0000000001000000. 232338.037:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: BIND || VkDevice || VA ffff800100200000 || size 0000000001000000. 232338.037:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: BIND || VkBuffer || VA ffff800100200000 || size 0000000001000000. 232338.037:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: UNBIND || VkBuffer || VA ffff800100200000 || size 0000000001000000. 232338.037:0020:0024:trace:vkd3d-proton:vkd3d_address_binding_callback: UNBIND || VkDevice || VA ffff800100200000 || size 0000000001000000. ``` [The spec guarantees](https://registry.khronos.org/vulkan/specs/1.3-extensions/html/v… the following: > An application can receive multiple callbacks if multiple VkDebugUtilsMessengerEXT objects are created. A callback will always be executed in the same thread as the originating Vulkan call. As of TLS I went with a suggestion from IRC: ``` <ivyl_> There's an issue with how we handle callbacks related to VK_EXT_debug_utils and VK_EXT_debug_report. In wine_vkAllocateMemory() we call device->funcs.p_vkAllocateMemory() which may execute callback. <ivyl_> At this point we still don't have handle mapping added because we don't know what host_memory handle will be. <ivyl_> AFAIU there's a spec guarantee that callback will be executed in the same thread as the call causing it, so I was thinking about maybe keeping `memory` in a tls (if enable_wrapper_list) and using that? <ivyl_> but that's I don't see any precedent of using thread local storage on the unix side <ivyl_> tls value would be short-lived in such case - only for the duration of the call to `device->funcs.p_vkAllocateMemory()` <jacekc_> we usually use teb on unix side, see ntuser_thread_info ``` -- v2: winevulkan: Make device memory wrapper available in callbacks. https://gitlab.winehq.org/wine/wine/-/merge_requests/5658

4 4

[PATCH 0/6] MR5891: include: Add some interface definitions in Windows.Graphics.Capture namespace
by Biswapriyo Nath (＠Biswa96) 21 Jun '24

21 Jun '24

Required for gstreamer in Windows https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/1.24.4/subproject… -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5891

3 7

[PATCH 0/1] MR5900: apisetschema: Add api-ms-win-appmodel-runtime-internal-l1-1-1.
by Zhiyi Zhang (＠zhiyi) 21 Jun '24

21 Jun '24

Required for React Native apps. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5900

2 2

[PATCH 0/1] MR5899: bcp47langs: Add stub dll.
by Zhiyi Zhang (＠zhiyi) 21 Jun '24

21 Jun '24

Required for React Native apps. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5899

2 2

[PATCH v4 0/2] MR5761: comclt32: Allow ctrl-tab and tab hotkeys for propsheets
by Fabian Maurer (＠DarkShadow44) 21 Jun '24

21 Jun '24

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56103 -- v4: comclt32: Allow hotkeys for propsheet navigation. comctl32/tests: Add test for propsheet hotkey navigation. https://gitlab.winehq.org/wine/wine/-/merge_requests/5761

4 5

[PATCH 0/2] MR5897: include: Add a couple of CRT declarations.
by Rémi Bernon (＠rbernon) 21 Jun '24

21 Jun '24

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5897

2 2

[PATCH 0/2] MR5851: Draft: dxgi: Handle D3D12 swapchain Present() commands by calling a dedicated present function in vkd3d.
by Conor McCarthy (＠cmccarthy) 21 Jun '24

21 Jun '24

The current implementation enqueues the vkQueuePresentKHR() command after waiting on a fence which was enqueued where this command should go. However, this occurs in a worker thread to avoid deadlock, so an arbitrary number of additional commands may be enqueued before vkQueuePresentKHR(). I haven't found a specific scenario where this is a problem, but it is not desirable if we can avoid it. This new implementation is just an RFC; it won't build because the vkd3d function is missing. That can be found [here](https://gitlab.winehq.org/cmccarthy/vkd3d/-/blob/present/libs/vkd3d/c… but I haven't raised an MR. The DXGI side meets all requirements: vkAcquireNextImageKHR() blocks there, but the driver unblocks it so deadlock is not possible. The vkd3d function waits only for the command queue op mutex and cannot deadlock either. The overall implementation should be less fragile, and doesn't need a worker thread. A few days ago I saw a performance increase in HZD from reverting DXGI to before the worker was added, but have never seen this again. Performance differences are minimal between old, current and this one. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5851

4 6

Re: [PATCH v2 0/1] MR5706: comctl32/rebar: Hide chevron if the full width of rebar is displayed
by Zhiyi Zhang (＠zhiyi) 21 Jun '24

21 Jun '24

@IDocin -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5706#note_73883

1 0

Re: [PATCH v3 0/4] MR5830: dxgi: Fix some d3d12 swapchain issues.
by Conor McCarthy (＠cmccarthy) 21 Jun '24

21 Jun '24

On Fri Jun 21 05:51:22 2024 +0000, Conor McCarthy wrote: > changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/5830/diffs?diff_id=118898&start_sha=0a098294aa1607350d8e382416546fe945fac98b#b8e9f5f67cc13143a0928d1e76d7519d0bab1bc3_1773_1764) I removed this from the MR as I think it should be separate. We need one semaphore per Vulkan image. Indexing the semaphore array is an issue because we have no `vk_image_index`, but `frame_number % swapchain->buffer_count` may be ok. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5830#note_73880

1 0

Re: [PATCH v3 0/4] MR5830: dxgi: Fix some d3d12 swapchain issues.
by Conor McCarthy (＠cmccarthy) 21 Jun '24

21 Jun '24

On Mon Jun 17 17:07:40 2024 +0000, Elizabeth Figura wrote: > Without doing any research myself... the other side is going to try to > enter the logic immediately [within SleepConditionVariableCS()] assuming > it's waiting, and I think usually wakes are fast enough [at least on > Linux] that the other thread will generally start executing before you > even return from the wake function. > Besides a poorly communicated warning that doesn't apply here, the first > comment in [1] also claims that it defeats a "wait morphing" > optimization, where instead of actually waking threads they're just > moved from the CV waitqueue to the mutex wait queue [if their associated > mutex is locked [by the calling thread?]]. That's not something we > currently implement in Wine; it may be possible to implement later though... > [1] https://stackoverflow.com/questions/52503361/unlock-the-mutex-after-conditi… I do see a small but measurable performance gain in HZD. It's only 0.7%, but that shoud be weighed that against the very simple change needed to gain it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5830#note_73878

1 0

Re: [PATCH v3 0/4] MR5830: dxgi: Fix some d3d12 swapchain issues.
by Conor McCarthy (＠cmccarthy) 21 Jun '24

21 Jun '24

On Fri Jun 21 05:51:23 2024 +0000, Conor McCarthy wrote: > changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/5830/diffs?diff_id=118898&start_sha=0a098294aa1607350d8e382416546fe945fac98b#b8e9f5f67cc13143a0928d1e76d7519d0bab1bc3_1282_1269) I replaced this with a wait for the blit before returning from `d3d12_swapchain_present()`. After a call to Present() returns, the client can render to the next buffer in sequence, so we must wait for completion of the blit read of that buffer. The old version using `vkAcquireNextImageKHR()` is not strict enough. HZD with vsync has frame pacing issues in some parts of the benchmark even on the old implementation, and this makes it a little bit worse. We can't really avoid that though, and the best fix is to improve frame times in vkd3d. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5830#note_73879

1 0

[PATCH v2 0/4] MR5830: dxgi: Fix some d3d12 swapchain issues.
by Conor McCarthy (＠cmccarthy) 21 Jun '24

21 Jun '24

The last commit fixes glitches in Horizon Zero Dawn with vsync on, for reasons stated in the comment there. The wined3d implementation already blocks the client's call to `Present()` when `vkAcquireNextImageKHR()` blocks, so is roughly equivalent to this when frame latency and buffer count are equal. It has a frame latency implementation which unblocks after calling `vkQueuePresentKHR()`, rather than waiting for its execution to complete. I think the d3d12 implementation is supposed to do the latter, though using `KHR_present_wait` may be unnecessary overkill. Waiting on queue execution comes with a performance cost either way, so without a compelling reason for a strict implementation, something similar to wined3d makes sense. Another potential issue is after the call to `ID3D12CommandQueue_Signal()` in `d3d12_swapchain_present()`, the client is free to enqueue more commands when `Present()` returns, so by the time the signal is executed and the swapchain worker blits the image and calls `vkQueuePresentKHR()`, these commands are not necessarily enqueued immediately after the `Signal()`. This may not always be harmless. -- v2: dxgi: Wait for completion of a pending read of the next buffer before returning from d3d12_swapchain_Present(). dxgi: Wake the condition variable after leaving the critical section in d3d12_swapchain_resize_buffers(). dxgi: Wake the condition variable after leaving the critical section in d3d12_swapchain_present(). https://gitlab.winehq.org/wine/wine/-/merge_requests/5830

2 4

[PATCH 0/2] MR5895: ntdll: Don't write partial strings with RTL_QUERY_REGISTRY_DIRECT.
by Alex Henrie (＠alexhenrie) 21 Jun '24

21 Jun '24

The new tests revealed only one case where too-small buffers were not already being handled correctly. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5895

3 3

[PATCH 0/5] MR5894: ntdll: Do not fill the IOSB or signal completion on failure.
by Elizabeth Figura (＠zfigura) 21 Jun '24

21 Jun '24

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5894

2 5

Re: [PATCH v2 0/1] MR5886: maintainers: Remove myself as a winegstreamer maintainer.
by Alfred Agrell (＠Alcaro) 20 Jun '24

20 Jun '24

Huh. Okay. I've seen some of those discussions, and something in them did indeed feel strange. (I never understood the context well enough to determine exactly what, and it's not my place to question that, anyways.) I'll miss you 💔 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5886#note_73870

1 0

Re: [PATCH v2 0/2] MR5877: winex11: Create a global vulkan instance for xrandr. - approved
by Alexandre Julliard (＠julliard) 20 Jun '24

20 Jun '24

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5877

1 0

Re: [PATCH v2 0/4] MR5887: mshtml: Add support for using apply and call on (legacy) builtin function objects. - approved
by Alexandre Julliard (＠julliard) 20 Jun '24

20 Jun '24

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5887

1 0

Re: [PATCH v43 0/8] MR3103: server: Create and use a desktop shared mapping for GetCursorPos. - approved
by Alexandre Julliard (＠julliard) 20 Jun '24

20 Jun '24

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3103

1 0

Re: [PATCH v2 0/4] MR5889: Cmd engine rewrite (part VII) - approved
by Alexandre Julliard (＠julliard) 20 Jun '24

20 Jun '24

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5889

1 0

Re: [PATCH v4 0/2] MR5879: winegstreamer: Implement stubs for h264 encoder. - approved
by Alexandre Julliard (＠julliard) 20 Jun '24

20 Jun '24

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5879

1 0

Re: [PATCH v2 0/1] MR5886: maintainers: Remove myself as a winegstreamer maintainer. - approved
by Alexandre Julliard (＠julliard) 20 Jun '24

20 Jun '24

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5886

1 0

Re: [PATCH v2 0/1] MR5888: ntdll: Fix handling of non-string types with RTL_QUERY_REGISTRY_DIRECT. - approved
by Alexandre Julliard (＠julliard) 20 Jun '24

20 Jun '24

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5888

1 0

2025

2024

2023

2022

wine-gitlab