February 2025 - wine-gitlab

[PATCH v3 0/6] MR6866: Draft: ntdll: On macOS x86_64, swap GSBASE between the TEB and macOS TSD when entering/leaving PE code.
by Brendan Shanks (＠bshanks) 17 Mar '25

17 Mar '25

x86_64 Windows and macOS both use `%gs` to access thread-specific data (Windows TEB, macOS TSD). To date, Wine has worked around this conflict by filling the most important TEB fields (`0x30`/`Self`, `0x58`/`ThreadLocalStorage`) in the macOS TSD structure (Apple reserved the fields for our use). This was sufficient for most Windows apps. CrossOver's Wine had an additional hack to handle `0x60`/`ProcessEnvironmentBlock`, and binary patches for certain CEF binaries which directly accessed `0x8`/`StackBase`. Additionally, Apple's libd3dshared could activate a special mode in Rosetta 2 where code executing in certain regions would use the Windows TEB when accessing `%gs`. Now that the PE separation is complete, GSBASE can be swapped when entering/exiting PE code. This is done in the syscall dispatcher, unix-call dispatcher, and for user-mode callbacks. GSBASE also needs to be set to the macOS TSD when entering signal handlers (in `init_handler()`), and then restored to the Windows TEB when exiting (in `leave_handler()`). There is a special-case needed in `usr1_handler`: when inside a syscall (on the kernel stack), GSBASE may need to be reset to either the TEB or the TSD. The only way to tell is to determine what GSBASE was set to on entry to the signal handler. --- macOS does not have a public API for setting GSBASE, but the private `_thread_set_tsd_base()` works and was added in macOS 10.12. `_thread_set_tsd_base()` is a small thunk that sets `%esi`, `%eax`, and does the `syscall`: https://github.com/apple-oss-distributions/xnu/blob/8d741a5de7ff4191bf97d57…. The syscall instruction itself clobbers `%rcx` and `%r11`. I've tried to save as few registers as possible when calling `_thread_set_tsd_base()`, but there may be room for improvement there. --- I've tested this successfully on macOS 15 (Apple Silicon and Intel) with several apps and games, including the `cefclient.exe` CEF sample. I still need to test this patch on macOS 10.13, and I'd also like to do some performance testing. --- I also tested an alternate implementation strategy for this which took advantage of the expanded "full" thread state which is passed to signal handlers when a process has set a user LDT. The full thread state includes GSBASE, so GSBASE is set back to whatever is in the sigcontext on return (like every other field in the context). This would avoid needing to explicitly reset GSBASE in `leave_handler()`, and avoid the special-case in `usr1_handler()`. This strategy was simpler, but I'm not using it for 2 reasons: - the "full" thread state is only available starting with macOS 10.15, and we still support 10.13. - more crucially, Rosetta 2 doesn't seem to correctly implement the GS.base field of the full thread state. It's set to 0 on entry, and isn't read on exit. -- v3: ntdll: Remove x86_64 Mac-specific TEB access workarounds that are no longer needed. ntdll: On macOS x86_64, swap GSBASE between the TEB and macOS TSD when entering/leaving PE code. ntdll: Ensure init_handler runs in signal handlers before any compiler-generated memset calls. ntdll: Remove ugly fallback method for getting a thread's GSBASE on macOS. ntdll: Leave kernel stack before accessing %gs in x86_64 syscall dispatcher. ntdll: Do %gs accesses before switching to kernel stack in x86_64 syscall dispatcher. https://gitlab.winehq.org/wine/wine/-/merge_requests/6866

5 11

[PATCH 0/1] MR3857: d3d11/tests: Properly mark the indexed sample position test as succeeding with the Vulkan backend.
by Henri Verbeet (＠hverbeet) 16 Mar '25

16 Mar '25

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

4 4

[PATCH v3 0/2] MR3833: iphlpapi/tests: Quadruple the buffer size in a GetAdaptersAddresses() test.
by Hans Leidekker (＠hans) 16 Mar '25

16 Mar '25

As shown by the testbot, doubling is not always sufficient. -- v3: iphlpapi/tests: Call GetExtendedTcp/UdpTable() in a loop. https://gitlab.winehq.org/wine/wine/-/merge_requests/3833

3 4

[PATCH v2 0/2] MR3833: iphlpapi/tests: Quadruple the buffer size in a GetAdaptersAddresses() test.
by Hans Leidekker (＠hans) 16 Mar '25

16 Mar '25

As shown by the testbot, doubling is not always sufficient. -- v2: iphlpapi/tests: Call GetExtendedTcp/UdpTable() in a loop. iphlpapi/tests: Call GetAdaptersAddresses() in a loop. https://gitlab.winehq.org/wine/wine/-/merge_requests/3833

4 6

[PATCH 0/1] MR3838: kernel32/tests: Allow a 0 removed entry count in the completion test.
by Francois Gouget (＠fgouget) 16 Mar '25

16 Mar '25

This matches the ntdll:file fix. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54554 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3838

3 2

[PATCH 0/1] MR3837: quartz/tests: Fix segfault in changed3ddevice test.
by Alfred Agrell (＠Alcaro) 16 Mar '25

16 Mar '25

Fixes regression from https://gitlab.winehq.org/wine/wine/-/merge_requests/3792 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3837

4 4

[PATCH 0/1] MR3835: winscard/tests: Skip tests when SCardListReadersA() returns an empty list.
by Hans Leidekker (＠hans) 16 Mar '25

16 Mar '25

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

3 2

[PATCH 0/1] MR3834: wpcap/tests: Accept another return value from pcap_can_set_rfmon().
by Hans Leidekker (＠hans) 16 Mar '25

16 Mar '25

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

3 2

[PATCH 0/2] MR3833: iphlpapi/tests: Quadruple the buffer size in a GetAdaptersAddresses() test.
by Hans Leidekker (＠hans) 16 Mar '25

16 Mar '25

As shown by the testbot, doubling is not always sufficient. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3833

4 6

[PATCH 0/2] MR3822: user32/tests: Account for ignored messages during wait.
by Esme Povirk (＠madewokherd) 15 Mar '25

15 Mar '25

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53435 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3822

3 4

2025

2024

2023

2022

wine-gitlab February 2025