- wine-gitlab - winehq.org

[PATCH 0/4] MR6866: Draft: ntdll: On macOS x86_64, swap GSBASE between the TEB and macOS TSD when entering/leaving PE code.
by Brendan Shanks (＠bshanks) 28 Nov '24

28 Nov '24

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. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6866

5 16

[PATCH 0/1] MR6914: win32u: Use LCD-optimezed rendering mode for text drawing.
by JiangYi Chen (＠meshine) 28 Nov '24

28 Nov '24

Log: Signed-off-by: chenjiangyi <chenjiangyi(a)uniontech.com> Change-Id: If35310eb8df08f39e04066b59c6b907d89c7dd9b -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6914

1 0

[PATCH 0/1] MR6913: uxtheme: Check DrawThemeEdge() content rectangle pointer.
by Zhiyi Zhang (＠zhiyi) 28 Nov '24

28 Nov '24

Otherwise, applications that call DrawThemeEdge() with BF_ADJUST and a NULL content rectangle pointer will crash. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6913

3 2

Re: [PATCH v7 0/3] MR4826: Mach vm operations improvements
by Brendan Shanks (＠bshanks) 28 Nov '24

28 Nov '24

I'd still like to test these out (particularly with some games/launchers that are known to use cross-process memory writes) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4826#note_89090

1 0

Re: [PATCH v7 0/3] MR4826: Mach vm operations improvements
by Brendan Shanks (＠bshanks) 28 Nov '24

28 Nov '24

Brendan Shanks (@bshanks) commented about server/mach.c: > return 0; > } > > - if ((ret = task_suspend( process_port )) != KERN_SUCCESS) > - { > - mach_set_error( ret ); > - return 0; > - } Can you put the removal of `task_suspend()` and `task_resume()` (I guess for all 3 functions) into a separate commit? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4826#note_89089

1 0

Re: [PATCH v5 0/2] MR6794: user32: Add PackTouchHitTestingProximityEvaluation stub. - approved
by Alexandre Julliard (＠julliard) 27 Nov '24

27 Nov '24

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

1 0

Re: [PATCH v2 0/2] MR6912: msvcp120/tests: Add tests for _Fiopen. - approved
by Alexandre Julliard (＠julliard) 27 Nov '24

27 Nov '24

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

1 0

Re: [PATCH v4 0/2] MR6898: comctl32: Update combobox dropdown size. - approved
by Alexandre Julliard (＠julliard) 27 Nov '24

27 Nov '24

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

1 0

Re: [PATCH v3 0/2] MR6736: Do not modify audio client buffer size when changing sample rate - approved
by Alexandre Julliard (＠julliard) 27 Nov '24

27 Nov '24

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

1 0

Re: [PATCH v7 0/9] MR6427: winevulkan: Introduce a vulkan object structure. - approved
by Alexandre Julliard (＠julliard) 27 Nov '24

27 Nov '24

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

1 0

2025

2024

2023

2022

wine-gitlab