March 2026 - Wine-GitLab - list.winehq.org

[PATCH v10 0/4] MR10232: ntdll: Avoid exposing non-user rsp in normal syscall return path
by Hoshino Lina (＠hoshinolina) March 22, 2026

March 22, 2026

When rsp is outside the kernel stack, the SIGUSR1 handler considers the context "out of syscall" and reports the real register values to wineserver. rsp pointing into the syscall frame is used for iret returns. Commit 0a5f7a710365 moved this earlier in the return path, creating a window in the regular direct return path where rsp points neither to the kernel stack, nor to the expected user stack. When a thread is interrupted by SIGUSR1 within this window, this exposes a bogus stack pointer to GetThreadContext(), breaking the garbage collector in Unity applications. Fix the regression by first switching to the real user stack (needed so we don't break things by touching other registers), then, only if an iret path is coming up, switching to the syscall frame pointer. This fixes the regression introduced by 0a5f7a710365, since GetThreadContext() will now observe the proper stack pointer during regular syscall returns. Further work would be needed to solve other corner cases and ensure that the register context returned by GetThreadContext() behaves exactly as on Windows (with no kernel-mode context info ever returned), but that is a larger/more invasive change. Fixes: 0a5f7a710365 ("ntdll: Switch to the user stack before restoring the %fs register.") Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59333 Signed-off-by: Hoshino Lina lina(a)lina.yt -- v10: gitlab: Run ntdll tests with win64 architecture. ntdll: Abort wow64 tests early if wow64 is unavailable ntdll/tests: Add a test for bogus SP/IP values from GetThreadContext(). ntdll: Avoid exposing non-user rsp in normal syscall return path https://gitlab.winehq.org/wine/wine/-/merge_requests/10232

2 4

[PATCH v9 0/4] MR10232: ntdll: Avoid exposing non-user rsp in normal syscall return path
by Hoshino Lina (＠hoshinolina) March 22, 2026

March 22, 2026

When rsp is outside the kernel stack, the SIGUSR1 handler considers the context "out of syscall" and reports the real register values to wineserver. rsp pointing into the syscall frame is used for iret returns. Commit 0a5f7a710365 moved this earlier in the return path, creating a window in the regular direct return path where rsp points neither to the kernel stack, nor to the expected user stack. When a thread is interrupted by SIGUSR1 within this window, this exposes a bogus stack pointer to GetThreadContext(), breaking the garbage collector in Unity applications. Fix the regression by first switching to the real user stack (needed so we don't break things by touching other registers), then, only if an iret path is coming up, switching to the syscall frame pointer. This fixes the regression introduced by 0a5f7a710365, since GetThreadContext() will now observe the proper stack pointer during regular syscall returns. Further work would be needed to solve other corner cases and ensure that the register context returned by GetThreadContext() behaves exactly as on Windows (with no kernel-mode context info ever returned), but that is a larger/more invasive change. Fixes: 0a5f7a710365 ("ntdll: Switch to the user stack before restoring the %fs register.") Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59333 Signed-off-by: Hoshino Lina lina(a)lina.yt -- v9: gitlab: Run ntdll tests with win64 architecture. ntdll: Abort wow64 tests early if wow64 is unavailable ntdll/tests: Add a test for bogus SP values from GetThreadContext(). ntdll: Avoid exposing non-user rsp in normal syscall return path https://gitlab.winehq.org/wine/wine/-/merge_requests/10232

2 4

[PATCH v8 0/5] MR10419: ntdll: Fix thread stops inside __wine_syscall_dispatcher
by Hoshino Lina (＠hoshinolina) March 22, 2026

March 22, 2026

When SIGUSR1 is called while running inside `__wine_syscall_dispatcher`, the CPU context is not in a consistent state. To ensure that the captured context is always consistent: * If the SIGUSR1 arrives while saving the context, set a flag and defer handling it until after the context is fully saved. * If the SIGUSR1 arrives while restoring the context, rewind and retry restoring the context from the beginning. The latter relies on context restore being idempotent. The only case where that is not true is when the instrumentation callback is enabled. To address this, first make that path idempotent by saving the user %rip into %r10 in paths that enable the instrumentation callback. This fixes a regression introduced by 0a5f7a710365 which started leaking bogus SP values, but also generally fixes all other register value leaks due to SIGUSR1 racing with the syscall dispatcher. Supersedes: !10232 (FYI, the threadctx test introduced in this MR is stricter and also checks %rip, which will fail with that previous MR). Fixes: 0a5f7a710365 ("ntdll: Switch to the user stack before restoring the %fs register.") \ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59333 -- v8: gitlab: Run ntdll tests with win64 architecture. ntdll/tests: Abort wow64 tests early if wow64 is unavailable https://gitlab.winehq.org/wine/wine/-/merge_requests/10419

2 5

Re: [PATCH v7 0/5] MR10419: ntdll: Fix thread stops inside __wine_syscall_dispatcher
by Hoshino Lina (＠hoshinolina) March 22, 2026

March 22, 2026

It seems the %eip test is broken on i386 (which is not surprising since it does not implement this fix). I split off the check in the test and marked it as `todo_wine` on that plaform. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10419#note_133226

1 0

[PATCH v4 0/5] MR10419: ntdll: Fix thread stops inside __wine_syscall_dispatcher
by Hoshino Lina (＠hoshinolina) March 22, 2026

March 22, 2026

When SIGUSR1 is called while running inside `__wine_syscall_dispatcher`, the CPU context is not in a consistent state. To ensure that the captured context is always consistent: * If the SIGUSR1 arrives while saving the context, set a flag and defer handling it until after the context is fully saved. * If the SIGUSR1 arrives while restoring the context, rewind and retry restoring the context from the beginning. The latter relies on context restore being idempotent. The only case where that is not true is when the instrumentation callback is enabled. To address this, first make that path idempotent by saving the user %rip into %r10 in paths that enable the instrumentation callback. This fixes a regression introduced by 0a5f7a710365 which started leaking bogus SP values, but also generally fixes all other register value leaks due to SIGUSR1 racing with the syscall dispatcher. Supersedes: !10232 (FYI, the threadctx test introduced in this MR is stricter and also checks %rip, which will fail with that previous MR). Fixes: 0a5f7a710365 ("ntdll: Switch to the user stack before restoring the %fs register.") \ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59333 -- v4: gitlab: Run ntdll tests with win64 architecture. ntdll: Abort wow64 tests early if wow64 is unavailable ntdll/tests: Add a test for bogus SP/IP values from GetThreadContext(). https://gitlab.winehq.org/wine/wine/-/merge_requests/10419

2 5

[PATCH v3 0/5] MR10419: ntdll: Fix thread stops inside __wine_syscall_dispatcher
by Hoshino Lina (＠hoshinolina) March 22, 2026

March 22, 2026

When SIGUSR1 is called while running inside `__wine_syscall_dispatcher`, the CPU context is not in a consistent state. To ensure that the captured context is always consistent: * If the SIGUSR1 arrives while saving the context, set a flag and defer handling it until after the context is fully saved. * If the SIGUSR1 arrives while restoring the context, rewind and retry restoring the context from the beginning. The latter relies on context restore being idempotent. The only case where that is not true is when the instrumentation callback is enabled. To address this, first make that path idempotent by saving the user %rip into %r10 in paths that enable the instrumentation callback. This fixes a regression introduced by 0a5f7a710365 which started leaking bogus SP values, but also generally fixes all other register value leaks due to SIGUSR1 racing with the syscall dispatcher. Supersedes: !10232 (FYI, the threadctx test introduced in this MR is stricter and also checks %rip, which will fail with that previous MR). Fixes: 0a5f7a710365 ("ntdll: Switch to the user stack before restoring the %fs register.") \ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59333 -- v3: gitlab: Run ntdll tests with win64 architecture. ntdll: Abort wow64 tests early if wow64 is unavailable ntdll/tests: Add a test for bogus SP/IP values from GetThreadContext(). https://gitlab.winehq.org/wine/wine/-/merge_requests/10419

2 5

[PATCH v2 0/3] MR10354: wineandroid: update Android build to work with modern toolchains
by Twaik Yont (＠twaik) March 22, 2026

March 22, 2026

Update the Android project and build logic to work with recent Gradle and Android SDK versions, adjust types for consistency, separate APK generation from the default build, and add the required staging steps to prepare assets and libraries before building the APK. These changes allow Wine to be built with NDK r29 and modern Android build tools. The resulting build runs on Android 7 and later (only devices using the legacy gralloc interface). The build process still remains somewhat non-standard, so a build script and screenshot are provided for reference. <details> <summary>Screenshot</summary> ![image](/uploads/c82b589e6de36d88c340317f6fc80b50/image.png){width=792 height=600} </details> [wineandroid-builder.tar.gz](/uploads/0b47ae812cfcd2d64f71aa9dee7042f6/wineandroid-builder.tar.gz) -- v2: wineandroid: remove APK from default build and add staging checks wineandroid: use BOOL for is_desktop flag wineandroid: update Android project for modern Gradle plugin https://gitlab.winehq.org/wine/wine/-/merge_requests/10354

3 11

[PATCH v2 0/5] MR10419: ntdll: Fix thread stops inside __wine_syscall_dispatcher
by Hoshino Lina (＠hoshinolina) March 22, 2026

March 22, 2026

When SIGUSR1 is called while running inside `__wine_syscall_dispatcher`, the CPU context is not in a consistent state. To ensure that the captured context is always consistent: * If the SIGUSR1 arrives while saving the context, set a flag and defer handling it until after the context is fully saved. * If the SIGUSR1 arrives while restoring the context, rewind and retry restoring the context from the beginning. The latter relies on context restore being idempotent. The only case where that is not true is when the instrumentation callback is enabled. To address this, first make that path idempotent by saving the user %rip into %r10 in paths that enable the instrumentation callback. This fixes a regression introduced by 0a5f7a710365 which started leaking bogus SP values, but also generally fixes all other register value leaks due to SIGUSR1 racing with the syscall dispatcher. Supersedes: !10232 (FYI, the threadctx test introduced in this MR is stricter and also checks %rip, which will fail with that previous MR). Fixes: 0a5f7a710365 ("ntdll: Switch to the user stack before restoring the %fs register.") \ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59333 -- v2: gitlab: Run ntdll tests with win64 architecture. ntdll: Abort wow64 tests early if wow64 is unavailable ntdll/tests: Add a test for bogus SP/IP values from GetThreadContext(). ntdll: Fix thread stops inside __wine_syscall_dispatcher https://gitlab.winehq.org/wine/wine/-/merge_requests/10419

2 5

[PATCH v10 0/2] MR10207: comctl32/treeview: Cycle all state images from custom image list when toggling checkboxes
by Piotr Pawłowski March 22, 2026

March 22, 2026

Bug and test program- https://bugs.winehq.org/show_bug.cgi?id=59486 This bug breaks foobar2000 advanced preferences - radiocheckboxes work only because I have very specific hack around this Wine behavior. My next treeview patch, fixing TVM_ITEMCHANGING, depends on this one and will be made a MR after this is merged. -- v10: comctl32/treeview: Cycle all state images from custom image list when toggling checkboxes comctl32/tests: Test cycling all state images from custom image list when toggling checkboxes https://gitlab.winehq.org/wine/wine/-/merge_requests/10207

2 5

[PATCH v8 0/4] MR10232: ntdll: Avoid exposing non-user rsp in normal syscall return path
by Hoshino Lina (＠hoshinolina) March 22, 2026

March 22, 2026

When rsp is outside the kernel stack, the SIGUSR1 handler considers the context "out of syscall" and reports the real register values to wineserver. rsp pointing into the syscall frame is used for iret returns. Commit 0a5f7a710365 moved this earlier in the return path, creating a window in the regular direct return path where rsp points neither to the kernel stack, nor to the expected user stack. When a thread is interrupted by SIGUSR1 within this window, this exposes a bogus stack pointer to GetThreadContext(), breaking the garbage collector in Unity applications. Fix the regression by first switching to the real user stack (needed so we don't break things by touching other registers), then, only if an iret path is coming up, switching to the syscall frame pointer. This fixes the regression introduced by 0a5f7a710365, since GetThreadContext() will now observe the proper stack pointer during regular syscall returns. Further work would be needed to solve other corner cases and ensure that the register context returned by GetThreadContext() behaves exactly as on Windows (with no kernel-mode context info ever returned), but that is a larger/more invasive change. Fixes: 0a5f7a710365 ("ntdll: Switch to the user stack before restoring the %fs register.") Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59333 Signed-off-by: Hoshino Lina lina(a)lina.yt -- v8: gitlab: Run ntdll tests with win64 architecture. ntdll: Abort wow64 tests early if wow64 is unavailable ntdll/tests: Add a test for bogus SP values from GetThreadContext(). ntdll: Avoid exposing non-user rsp in normal syscall return path https://gitlab.winehq.org/wine/wine/-/merge_requests/10232

2 6