- wine-gitlab - winehq.org

[PATCH v3 0/2] MR6904: ntdll.dll: Update NtQueryDirectoryFile to align with current Windows behaviour
by Eugene McArdle (＠eugenemcardle) 01 Dec '24

01 Dec '24

This PR updates the behaviour of `NtQueryDirectoryFile`, bringing it in line with current Windows behaviour. The need for this update was discovered when attempting to build the Unreal Engine with MSVC under Wine. In certain cases conditional include statements do not behave as expected, due to MSVC depending on undocumented behaviour of `NtQueryDirectoryFile`. We ran tests on multiple versions of Windows, and discovered that the behaviour has changed since the original Wine implementation, but the documentation has not. The source code for our test tool, and a set of results can be found [here](https://github.com/TensorWorks/NtQueryDirectoryFile-Test). As of Windows 8, calling `NtQueryDirectoryFile` with a re-used handle, a new mask, and setting the `RestartScan` flag to True, causes the cached results to be erased and a new scan to be performed with the updated mask. Currently, Wine performs as did earlier versions of Windows, where the changed mask is ignored, and the cache is reused. This can cause `NtQueryDirectoryFile` under Wine to falsely report that files exist, when they do not. This PR corrects this behaviour, invalidating the cache when required. Implementing this exposed further undocumented behaviour of `NtQueryDirectoryFile`, where a search for a non-existent file will return either `STATUS_NO_MORE_FILES` or `STATUS_NO_SUCH_FILE`, depending on whether or not the handle had been previously used regardless of the value of `RestartScan`. This was reflected in a `winetest` which allowed for the response to be either `STATUS_SUCCESS` or `STATUS_NO_MORE_FILES`. This test has been updated to only allow current Windows behaviour, and `NtQueryDirectoryFile` will return either `STATUS_NO_MORE_FILES` or `STATUS_NO_SUCH_FILE` as appropriate. This patch also adds unit tests for the new behaviour of `NtQueryDirectoryFile`. These tests pass when running `winetest` under Windows, and under Wine with these changes in place, but they will fail under older versions of Wine. -- v3: ntdll: Test updated NtQueryDirectoryFile behaviour if scan is reset with a new mask https://gitlab.winehq.org/wine/wine/-/merge_requests/6904

3 4

[PATCH v11 0/1] MR6884: Iphlpapi.dll: Included SendARP
by Thi Garlet (＠garlett) 01 Dec '24

01 Dec '24

Returns MAC address by: - search local interfaces, or - send UDP packed that does not need linux privilege, then search local cache solve https://bugs.winehq.org/show_bug.cgi?id=9418 files updated - /dlls/iphlpapi/iphlpapi_main.c - /dlls/iphlpapi/tests/iphlpapi.c -- v11: iphlpapi.c: Add SendARP https://gitlab.winehq.org/wine/wine/-/merge_requests/6884

3 2

Re: [PATCH v2 0/7] MR6911: ntdll: Add WaitCompletionPacket.
by Jinoh Kang (＠iamahuman) 01 Dec '24

01 Dec '24

Jinoh Kang (@iamahuman) commented about server/protocol.def: > +@REPLY > + obj_handle_t handle; /* wait completion packet handle */ > +@END > + > + > +/* Associate a wait completion packet */ > +@REQ(associate_wait_completion_packet) > + obj_handle_t packet; /* wait completion packet handle */ > + obj_handle_t completion; /* completion handle */ > + obj_handle_t target; /* target object handle */ > + apc_param_t ckey; /* completion key */ > + apc_param_t cvalue; /* completion value */ > + apc_param_t information; /* IO_STATUS_BLOCK information */ > + unsigned int status; /* completion status */ > +@REPLY > + int signaled; /* whether the object is already signaled */ I'd use "completed" instead of "signaled." I find signaled ambiguous, since: 1. The object's signaled status depends on the thread, and 2. The role of wait completion packet is to *complete* the wait, not signaling. Ditto for other places like `remove_signaled`. `cancel_completed` would work for me. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6911#note_89386

1 0

Re: [PATCH v2 0/7] MR6911: ntdll: Add WaitCompletionPacket.
by Jinoh Kang (＠iamahuman) 01 Dec '24

01 Dec '24

On Sun Dec 1 21:51:09 2024 +0000, Jinoh Kang wrote: > This looks wrong. Unless I've mistaken, this should be the thread that > *initiated* the wait (like, the one that created or associated the wait > completion packet), not `current`. I'd advise you to test WaitCompletionPacket againat waitable objects that use `get_wait_queue_thread()`, including keyed events, mutexes, and message queue objects (not exposed via Win32 API, only at win32k level). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6911#note_89385

1 0

Re: [PATCH v2 0/7] MR6911: ntdll: Add WaitCompletionPacket.
by Jinoh Kang (＠iamahuman) 01 Dec '24

01 Dec '24

Jinoh Kang (@iamahuman) commented about server/thread.c: > return 0; > } > > +int is_obj_signaled( struct object *obj ) > +{ > + struct wait_queue_entry wait_entry; > + struct thread_wait wait = {0}; > + > + if (!obj->ops->signaled) > + return 0; > + > + wait.thread = current; This looks wrong. Unless I've mistaken, this should be the thread that *initiated* the wait (like, the one that created or associated the wait completion packet), not `current`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6911#note_89384

1 0

Re: [PATCH v10 0/6] MR6569: winex11: Refactor window state/config tracker to fix race conditions.
by Robbert van der Helm (＠robbert-vdh) 01 Dec '24

01 Dec '24

On Sun Dec 1 20:18:56 2024 +0000, Rémi Bernon wrote: > Hi, I don't think this checks does what you describe. > This specific `if` is there for *unmanaged* windows, which are X > override-redirect windows which are fully under Wine control, and which > won't receive WM_STATE property changes. We clear the `wm_state_serial` > for them, in order to allow sending more window state changes without > waiting, as well as window configure requests. That if doesn't set > wm_state_serial, it clears it, and it shouldn't prevent the > `ConfigureNotify` to be processed, rather the other way around. > For *managed* windows, when Wine requests a window state change, the > Window Manager is supposed to change the `WM_STATE` property accordingly > once it is done, and we should then receive the corresponding > `PropertyNotify` event. We still process `ConfigureNotify` events, but > we don't apply them to the Win32 state until all the requested changes > have been processed. > If the `WM_STATE` property isn't modified or isn't present, then yes the > Win32 state will appear to be stuck forever. This is however a bug in > the window manager, according to the ICCCM, and we can really only > support ICCCM-compatible window manager (or just uncheck "allow the > window manager to manage the windows" in `winecfg`). > In any case, `ConfigureNotify` events are always processed, and applied > to the Win32 state when there's no reason to wait. XEMBED support may be > what makes a difference here, as we used only for systray embedded > windows. I don't think any other use case was very intended before or > well supported, and there's assumptions being made that embedded windows > are always systray windows > It's probably possible to support it better, and maybe even easier to do > so now that we track X parent and embedder windows without leaking them > into the Win32 space anymore. If there's a regression, please open a bug > on bugs.winehq.org, describe your use case with reproducible steps, and > we will try to fix it. Thanks for the detailed write up! I only ran into this commit after bisecting the changes between Wine 9.21 and 9.22, so I'm almost certainly missing some context! The problem I'm facing seems to be that as soon as `SWP_STATECHANGED` is set and `window_set_wm_state()` gets called, `data->wm_state_serial` gets stuck on a nonzero value since it's set to the X11 connection's next sequence number and is then never cleared again. That causes `window_update_client_config()` to always bail before it does anything, which in turn causes the `NtUserPostMessage( hwnd, WM_WINE_WINDOW_STATE_CHANGED, 0, 0 )` called from `X11DRV_ConfigureNotify()` to not do anything anymore. This doesn't seem to cause any problems under normal use cases, since normally once a window is mapped, its coordinates relative to the root window will never suddenly change (not sure if there's a spicy interaction with multiple monitors though). But in yabridge I have to reparent a Wine window to another window, and to make that work I've always had to send these `ConfigureNotify` events to inform Wine about the window's actual position on screen. Otherwise it thinks it's located in the top left corner of the screen, and all mouse events will be at an offset. I can open a regression bug report on bugs.winehq.org, but since what yabridge is doing is almost certainly not the ended way to interact with Wine, I thought I'd check here first. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6569#note_89383

1 0

[PATCH 0/2] MR6939: include: Enable format attributes for debug traces in Clang MSVC mode.
by Jacek Caban (＠jacek) 01 Dec '24

01 Dec '24

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

2 2

Re: [PATCH v10 0/6] MR6569: winex11: Refactor window state/config tracker to fix race conditions.
by Rémi Bernon (＠rbernon) 01 Dec '24

01 Dec '24

On Sun Dec 1 18:46:02 2024 +0000, Robbert van der Helm wrote: > Hi! > This specific check causes `ConfigureNotify` events to no longer be > processed by top level windows (i.e. managed) windows. as > `wm_state_serial` will be set but never cleared again. For the last > couple years I've been sending `ConfigureNotify` events to a reparented > window to embed Wine windows into other X11 windows, but this specific > check breaks that for Wine 9.22. Wine's XEmbed support (which never > worked quite as well as the reparent+`ConfigureNotify` approach) also > does not seem to work anymore with recent Wine releases. > My question is: is this check necessary to prevent other undesirable > interactions and if so, what's the current best way to send X11 window > configuration events to Wine windows? > More context: https://github.com/robbert-vdh/yabridge/issues/382#issuecomment-2510155844 Hi, I don't think this checks does what you describe. This specific `if` is there for *unmanaged* windows, which are X override-redirect windows which are fully under Wine control, and which won't receive WM_STATE property changes. We clear the `wm_state_serial` for them, in order to allow sending more window state changes without waiting, as well as window configure requests. That if doesn't set wm_state_serial, it clears it, and it shouldn't prevent the `ConfigureNotify` to be processed, rather the other way around. For *managed* windows, when Wine requests a window state change, the Window Manager is supposed to change the `WM_STATE` property accordingly once it is done, and we should then receive the corresponding `PropertyNotify` event. We still process `ConfigureNotify` events, but we don't apply them to the Win32 state until all the requested changes have been processed. If the `WM_STATE` property isn't modified or isn't present, then yes the Win32 state will appear to be stuck forever. This is however a bug in the window manager, according to the ICCCM, and we can really only support ICCCM-compatible window manager (or just uncheck "allow the window manager to manage the windows" in `winecfg`). In any case, `ConfigureNotify` events are always processed, and applied to the Win32 state when there's no reason to wait. XEMBED support may be what makes a difference here, as we used only for systray embedded windows. I don't think any other use case was very intended before or well supported, and there's assumptions being made that embedded windows are always systray windows It's probably possible to support it better, and maybe even easier to do so now that we track X parent and embedder windows without leaking them into the Win32 space anymore. If there's a regression, please open a bug on bugs.winehq.org, describe your use case with reproducible steps, and we will try to fix it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6569#note_89382

1 0

[PATCH 0/1] MR6938: Draft: winewayland.drv: Implement support for xdg-toplevel-icon.
by Etaash Mathamsetty (＠etaash.mathamsetty) 01 Dec '24

01 Dec '24

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

2 1

Re: [PATCH v10 0/6] MR6569: winex11: Refactor window state/config tracker to fix race conditions.
by Robbert van der Helm (＠robbert-vdh) 01 Dec '24

01 Dec '24

Robbert van der Helm (@robbert-vdh) commented about dlls/winex11.drv/window.c: > if (!data->embedded) XIconifyWindow( data->display, data->whole_window, data->vis.screen ); > break; > } > + > + /* override redirect windows won't receive WM_STATE property changes */ > + if (!data->managed) data->wm_state_serial = 0; Hi! This specific check causes `ConfigureNotify` events to no longer be processed by top level windows (i.e. managed) windows. as `wm_state_serial` will be set but never cleared again. For the last couple years I've been sending `ConfigureNotify` events to a reparented window to embed Wine windows into other X11 windows, but this specific check breaks that for Wine 9.22. Wine's XEmbed support (which never worked quite as well as the reparent+`ConfigureNotify` approach) also does not seem to work anymore with recent Wine releases. My question is: is this check necessary to prevent other undesirable interactions and if so, what's the current best way to send X11 window configuration events to Wine windows? More context: https://github.com/robbert-vdh/yabridge/issues/382#issuecomment-2510155844 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6569#note_89380

1 0

2025

2024

2023

2022

wine-gitlab