- Wine-GitLab - list.winehq.org

[PATCH v6 0/3] MR9874: wineandroid.drv: experimental bring-up fixes for Android 7.1.x
by Twaik Yont (＠twaik) March 3, 2026

March 3, 2026

Requires #10067, fixup/followup to e0d3683d8947cd9a3cb20acdf69091b183a90861 and 4b5311c7e02aa7ab2409f8fdcd22233f116dc4bc. #### Note on authorship and language This text was translated into English and structured with the assistance of ChatGPT. The author is not a native English speaker and may struggle with written technical English; any wording issues are unintentional. #### Description This merge request is an experimental attempt to bring wineandroid.drv back to a minimally functional state on Android 7.1.x. The current Android support appears to have bit-rotted over time, likely due to a combination of internal contract changes in Wine, toolchain and NDK evolution, and the absence of continuous Android testing. The changes proposed here aim to re-establish a working baseline and make the regressions more concrete and easier to reason about. #### Test environment and context All testing so far was performed on Android 7.1.2 x86 images from the Android-x86 project, published on osboxes.org ([link](https://www.osboxes.org/android-x86/)) The primary target is i386 Wine running on x86 Android userspace. Because no up-to-date official Android build scripts were available, Wine was built using Termux as an unsupported but convenient environment for rapid testing. The Java part (WineActivity and related glue code) was built with `sharedUserId = com.termux` purely for convenience (filesystem access and faster prototyping). **Termux is explicitly not considered a supported environment and is mentioned only to provide context for the testing setup.** The build uses Android NDK r29. Since the last known functional Android Wine builds, the NDK and linker behavior have changed multiple times, including symbol visibility and relocation handling. These changes appear to have directly affected several failure modes described below. There is also a known issue with wine-preloader producing excessively large binaries under recent toolchains; a workaround exists but is not included here and is mentioned only as additional context. #### Scope of changes This merge request currently modifies only Android-specific code: - `wineandroid.drv` (native code and Java glue, including WineActivity) - android-only paths in `dlls/ntdll/unix/loader.c` No non-Android platforms are affected. #### Summary of resolved issues 1) Desktop initialization ordering regression After recent `CreateDesktopW`-related changes, `ANDROID_CreateDesktop` started running before the DESKTOP window was created. The Java glue assumed the opposite order. The fix splits desktop initialization into two phases (view setup first, desktop window attachment later via an explicit is_desktop flag) and corrects the `ANDROID_CreateDesktop` success return value. 2) Rendering stalls and `USER lock assertion` Occasional crashes with: ``` err:system:user_check_not_lock BUG: holding USER lock ``` A full memory barrier was added in the dequeue path to avoid a likely memory ordering issue. Additionally, a guard was added for a `NULL` buffer returned on successful dequeue. 3) Early startup failure in `virtual_alloc_first_teb` Wine frequently failed with: ``` err:virtual:virtual_alloc_first_teb wine: failed to map the shared user data: c0000018 ``` `virtual_init()` is now called from `JNI_OnLoad()` to reduce the likelihood of the JVM reserving the required address range before Wine initializes its virtual memory subsystem. #### Remaining issues - Window focus handling is partially broken: windows receive focus on click, but are not always raised to the front. - Despite the available desktop area being larger (e.g. 1024x696), Wine consistently reports a display resolution of 800x600. #### Limitations Wine on Android stopped functioning entirely starting with Android 8. As a result, all testing so far has been limited to Android 7.1.x. No claims are made about behavior on newer Android versions. #### Out of scope This merge request intentionally does not attempt to: - redesign IPC mechanisms - introduce new Android integration models - address Android 8+ compatibility The sole goal is to re-establish a minimally working baseline on Android 7.1.x and enable informed discussion about what regressed and how to proceed. **This is my first contribution to Wine, and I am aware that some parts of this analysis or implementation may be flawed. I would be grateful for any review comments or suggestions.** <details> <summary>Also, the screenshot of the working prototype.</summary> ![1](/uploads/666d78a712edce531a25521a2615ea9f/1.png){width=756 height=600} </details> -- v6: ntdll: call virtual_init from JNI_OnLoad to avoid early virtual_alloc_first_teb failure Wineandroid: Sanitize dequeueBuffer result and reject missing buffers. wineandroid: fix desktop init ordering after CreateDesktopW changes https://gitlab.winehq.org/wine/wine/-/merge_requests/9874

3 6

[PATCH v4 0/3] MR10067: wineandroid: fix Android NDK/ARM build issues (resubmission with expanded rationale)
by Twaik Yont (＠twaik) March 3, 2026

March 3, 2026

This series addresses several Android-specific build failures and toolchain interactions observed when building Wine with recent Android NDK versions. Some of these changes were previously proposed but not accepted due to insufficient explanation of the underlying behavior. This submission reintroduces those fixes with more detailed technical justification and adds a few additional related corrections discovered during further testing. The changes include: - Replace `ffs()` with `__builtin_ffs()` in ntdll. Android builds fail due to ffs() being used without `<strings.h>`, which Wine does not include. Using `__builtin_ffs()` avoids implicit declaration errors under C99 and matches existing usage elsewhere in the tree while preserving semantics. - Avoid pthread mutex attributes in winepulse on Android. `pthread_mutexattr_setprotocol()` may be exposed at configure time depending on the selected API level, but actual availability depends on the device's bionic libc. Robust mutex support is not provided by bionic. Configure-time detection can therefore select a code path that is not reliably supported at runtime. Use plain `pthread_mutex_init()` on Android and retain the existing attribute-based initialization on other platforms. - Force `--rosegment` for `wine-preloader` on Android (API < 29, NDK r22+). Since NDK r22, clang implicitly passes `-Wl,--no-rosegment` when targeting API levels below 29 ([NDK changelog](https://github.com/android/ndk/wiki/Changelog-r22) Issue 1196). Because wine-preloader links with `-Wl,-Ttext=0x7d400000`, this results in a `PT_LOAD` segment with a very large file offset to preserve the VMA-to-file-offset relationship, creating a sparse gap (`~0x7d400000`) and inflating the apparent ELF size to `~2GB`. `wine-preloader` is a static binary and does not depend on unwind/backtrace correctness, so inheriting `--no-rosegment` provides no benefit. Force `-Wl,--rosegment` when supported to keep the segment layout reasonable, without affecting other binaries. Overall, this series improves Android NDK compatibility, prevents false feature detection based on header exposure or API-level-dependent behavior, and fixes ARM assembler incompatibilities, while keeping the changes restricted to Android-specific paths. -- v4: wineandroid: force --rosegment for wine-preloader on Android (API < 29, NDK r22+) winepulse: avoid pthread mutex attributes on Android due to unreliable availability ntdll/unix: use __builtin_ffs instead of ffs in ldt_alloc_entry https://gitlab.winehq.org/wine/wine/-/merge_requests/10067

2 6

[PATCH v3 0/22] MR10227: kernelbase/loader.c: Include rudimentary support for multilanguage resource inclusion.
by Craig Schulstad (＠NoDakker) March 3, 2026

March 3, 2026

For programs that rely on language specific data for resources such as menus and text, attempt to search for and associated "mui" file. For example, if program "myapp.exe" is executed and resources are not found, and the user's language ID is "ENU", search for file "myapp.ENU", and if found, utilize that file for the source of resource data. -- v3: dlls/kernelbase/loader.c: Apply multilanguage resource support This merge request has too many patches to be relayed via email. Please visit the URL below to see the contents of the merge request. https://gitlab.winehq.org/wine/wine/-/merge_requests/10227

1 0

[PATCH v3 0/4] MR10223: Wininet refactors
by Reyka Matthies (＠tmatthies) March 3, 2026

March 3, 2026

This is the second set of patches towards the mfplat network bytestream, after !9369. Mostly preparatory work and refactors. -- v3: wininet: Factor request creation out of HTTP_HttpSendRequestW. wininet: Do not reset content_pos in reset_data_stream. wininet: Factor out writing of cache file. include: Add MFNETSOURCE_STATISTICS_SERVICE definition. https://gitlab.winehq.org/wine/wine/-/merge_requests/10223

3 6

[PATCH v2 0/21] MR10227: kernelbase/loader.c: Include rudimentary support for multilanguage resource inclusion.
by Craig Schulstad (＠NoDakker) March 3, 2026

March 3, 2026

For programs that rely on language specific data for resources such as menus and text, attempt to search for and associated "mui" file. For example, if program "myapp.exe" is executed and resources are not found, and the user's language ID is "ENU", search for file "myapp.ENU", and if found, utilize that file for the source of resource data. -- v2: dlls/kernelbase/loader.c: Add enhancement for multilanguage resource support. This merge request has too many patches to be relayed via email. Please visit the URL below to see the contents of the merge request. https://gitlab.winehq.org/wine/wine/-/merge_requests/10227

1 0

Re: [PATCH v2 0/1] MR10205: comctl32/treeview: Fixed wrong check for currently edited item - approved
by Zhiyi Zhang (＠zhiyi) March 3, 2026

March 3, 2026

This merge request was approved by Zhiyi Zhang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10205

1 0

Re: [PATCH v2 0/1] MR10205: comctl32/treeview: Fixed wrong check for currently edited item
by Zhiyi Zhang (＠zhiyi) March 3, 2026

March 3, 2026

On Tue Mar 3 13:58:46 2026 +0000, Piotr Pawłowski wrote: > For other MRs, OK, will do. > For repaint bug fixes like this one, how do you propose I test them? > Take screenshots and match against reference? > If you look at what I changed, it's a pretty obvious bug fix with no > possible side effects. Also thoroughly verified against one Windows app > known to be affected by this, which I happen to be the author of. It's indeed not easy to test this one. I see you have a test program in that wine bug report. That's helpful. Thanks. The change looks good to me. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10205#note_131111

1 0

[PATCH 0/2] MR10239: winex11: Continue requesting fullscreen monitors in PropertyNotify handlers.
by Rémi Bernon March 3, 2026

March 3, 2026

In case it was delayed or skipped because of _NET_WM_STATE_FULLSCREEN not being requested yet, we need to retry after any update that might trigger further _NET_WM_STATE requests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10239

1 2

[PATCH v2 0/5] MR10223: Wininet refactors
by Reyka Matthies (＠tmatthies) March 3, 2026

March 3, 2026

This is the second set of patches towards the mfplat network bytestream, after !9369. Mostly preparatory work and refactors. -- v2: wininet: Factor request creation out of HTTP_HttpSendRequestW. wininet: Do not reset content_pos in reset_data_stream. wininet: Factor out writing of cache file. wininet: Wrap INTERNET_SendCallback in local wrapper. include: Add MFNETSOURCE_STATISTICS_SERVICE definition. https://gitlab.winehq.org/wine/wine/-/merge_requests/10223

3 7

Re: [PATCH v2 0/1] MR10205: comctl32/treeview: Fixed wrong check for currently edited item
by Piotr Pawłowski March 3, 2026

March 3, 2026

For other MRs, OK, will do. For repaint bug fixes like this one, how do you propose I test them? Take screenshots and match against reference? If you look at what I changed, it's a pretty obvious bug fix with no possible side effects. Also thoroughly verified against one Windows app known to be affected by this, which I happen to be the author of. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10205#note_131103

1 0