[Git][wine/wine][master] 6 commits: wineandroid: Fix ANDROID_WindowPosChanged prototype in android.h.
"Alexandre Julliard (@julliard) via Wine-commits" <[email protected]> Wed, 04 Feb 2026 15:37:04 -0600
| Newsgroups | gmane.comp.emulators.wine.cvs |
|---|---|
| Message-ID | <[email protected]> |
----==_mimepart_6983bc007e5ad_37bc84f9bdc1486529 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Alexandre Julliard pushed to branch master at wine / wine Commits: 0b2f7e60 by Twaik Yont at 2026-02-04T22:21:42+01:00 wineandroid: Fix ANDROID_WindowPosChanged prototype in android.h. The ANDROID_WindowPosChanged prototype in android.h was not updated along with its implementation in e28867deb16579e541397a8e0c90153c94c82b90. Fix the declaration to match the current function signature. Signed-off-by: Twaik Yont <[email protected]> - - - - - da472e20 by Twaik Yont at 2026-02-04T22:21:42+01:00 wineandroid: Drop leftover drawable_mutex after win32u OpenGL changes. Commit 392d6163614065edab50d5d629ff9f145e0a1012 removed the drawable_mutex definition and all its users in the Android OpenGL driver, but left behind the public declaration and initialization. Remove the leftover extern declaration from android.h and the corresponding pthread_mutex_init() call from init.c. Signed-off-by: Twaik Yont <[email protected]> - - - - - 41977e84 by Twaik Yont at 2026-02-04T22:21:42+01:00 wineandroid: Fix start_device_callback assignment type. Newer compilers warn or error when assigning a function pointer to an integer-typed field without an explicit cast. Cast android_start_device when assigning it to start_device_callback to satisfy the expected UINT64 type. Signed-off-by: Twaik Yont <[email protected]> - - - - - 2f6b3fdf by Twaik Yont at 2026-02-04T22:21:42+01:00 win32u: Fix wineandroid build after OpenGL drawable refactoring. After commit 7557d83c074a958ea042c3b86e11cd3b5670ec66, the Android OpenGL driver fails to build because set_window_opengl_drawable() is no longer visible. Export set_window_opengl_drawable() on Android to restore the wineandroid.drv build, while keeping the existing internal linkage for non-Android platforms. Signed-off-by: Twaik Yont <[email protected]> - - - - - 63d33d02 by Twaik Yont at 2026-02-04T22:21:42+01:00 ntdll: Export Java globals for dlsym lookup. The java_vm, java_object and java_gdt_sel globals are looked up via dlsym, but can end up with hidden visibility and therefore missing from the dynamic symbol table. Explicitly export these symbols to ensure they remain visible to dlsym. This appears to be required with newer Android NDK toolchains, likely related to changes in symbol visibility handling (for example Android NDK r22). Reference: https://github.com/android/ndk/wiki/Changelog-r22 Signed-off-by: Twaik Yont <[email protected]> - - - - - b3791d39 by Twaik Yont at 2026-02-04T22:21:42+01:00 wineandroid: Fix WineAndroid device access path. Following an earlier change, the \\.\WineAndroid path and the corresponding \??\WineAndroid symbolic link no longer resolved correctly. Open the WineAndroid device directly via \Device\WineAndroid, create the driver and device objects using explicit kernel object names, and update the ioctl path to match. Use RTL_CONSTANT_STRING for allocation-free UNICODE_STRING initialization. Signed-off-by: Twaik Yont <[email protected]> - - - - - 7 changed files: - dlls/ntdll/unix/loader.c - dlls/win32u/opengl.c - dlls/wineandroid.drv/android.h - dlls/wineandroid.drv/device.c - dlls/wineandroid.drv/dllmain.c - dlls/wineandroid.drv/init.c - include/wine/opengl_driver.h View it on GitLab: https://gitlab.winehq.org/wine/wine/-/compare/3e7c4ecefb517c8587a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b85435507e703453 -- View it on GitLab: https://gitlab.winehq.org/wine/wine/-/compare/3e7c4ecefb517c8587a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b85435507e703453 You're receiving this email because of your account on gitlab.winehq.org. ----==_mimepart_6983bc007e5ad_37bc84f9bdc1486529 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www= .w3.org/TR/REC-html40/loose.dtd"> <html lang=3D"en" style=3D'--code-editor-font: var(--default-mono-font, "= GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, = Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospac= e;'> <head> <meta content=3D"text/html; charset=3Dutf-8" http-equiv=3D"Content-Type">= <title> GitLab </title> <style data-premailer=3D"ignore" type=3D"text/css"> a { color: #1068bf; } </style> <style>img { max-width: 100%; height: auto; } body { font-size: .875rem; } body { -webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px; } body { font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"Segoe UI",Ro= boto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Colo= r Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size= : inherit; } </style> </head> <body style=3D'font-size: inherit; -webkit-text-shadow: rgba(255,255,255,= .01) 0 0 1px; font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont= ,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-ser= if,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emo= ji";'> <div class=3D"content"> <h3 style=3D"margin-top: 20px; margin-bottom: 10px;"> Alexandre Julliard pushed to branch master at <a href=3D"https://gitlab.w= inehq.org/wine/wine">wine / wine</a> </h3> <h4 style=3D"margin-top: 10px; margin-bottom: 10px;"> Commits: </h4> <ul> <li> <strong style=3D"font-weight: 600;"><a href=3D"https://gitlab.winehq.org/= wine/wine/-/commit/0b2f7e60e759df4f773f6feb558b8eb97fc3ad8d">0b2f7e60</a>= </strong> <div> <span> by Twaik Yont </span> <i> at 2026-02-04T22:21:42+01:00 </i> </div> <pre class=3D"commit-message" style=3D'white-space: pre-wrap; display: bl= ock; font-size: 14px; color: #3a383f; position: relative; font-family: "G= itLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation M= ono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida co= nsole", monospace; font-variant-ligatures: none; word-break: break-all; w= ord-wrap: break-word; background-color: #fbfafd; border-radius: 2px; marg= in: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>wineandroid: Fix AN= DROID_WindowPosChanged prototype in android.h. The ANDROID_WindowPosChanged prototype in android.h was not updated along= with its implementation in e28867deb16579e541397a8e0c90153c94c82b90. Fix the declaration to match the current function signature. Signed-off-by: Twaik Yont <[email protected]> </pre> </li> <li> <strong style=3D"font-weight: 600;"><a href=3D"https://gitlab.winehq.org/= wine/wine/-/commit/da472e201037add49dcc88cf4e91b55de69b4ad5">da472e20</a>= </strong> <div> <span> by Twaik Yont </span> <i> at 2026-02-04T22:21:42+01:00 </i> </div> <pre class=3D"commit-message" style=3D'white-space: pre-wrap; display: bl= ock; font-size: 14px; color: #3a383f; position: relative; font-family: "G= itLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation M= ono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida co= nsole", monospace; font-variant-ligatures: none; word-break: break-all; w= ord-wrap: break-word; background-color: #fbfafd; border-radius: 2px; marg= in: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>wineandroid: Drop l= eftover drawable_mutex after win32u OpenGL changes. Commit 392d6163614065edab50d5d629ff9f145e0a1012 removed the drawable_mute= x definition and all its users in the Android OpenGL driver, but left behin= d the public declaration and initialization. Remove the leftover extern declaration from android.h and the correspondi= ng pthread_mutex_init() call from init.c. Signed-off-by: Twaik Yont <[email protected]> </pre> </li> <li> <strong style=3D"font-weight: 600;"><a href=3D"https://gitlab.winehq.org/= wine/wine/-/commit/41977e84c6adf891462833aae20a40aaea208db5">41977e84</a>= </strong> <div> <span> by Twaik Yont </span> <i> at 2026-02-04T22:21:42+01:00 </i> </div> <pre class=3D"commit-message" style=3D'white-space: pre-wrap; display: bl= ock; font-size: 14px; color: #3a383f; position: relative; font-family: "G= itLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation M= ono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida co= nsole", monospace; font-variant-ligatures: none; word-break: break-all; w= ord-wrap: break-word; background-color: #fbfafd; border-radius: 2px; marg= in: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>wineandroid: Fix st= art_device_callback assignment type. Newer compilers warn or error when assigning a function pointer to an integer-typed field without an explicit cast. Cast android_start_device when assigning it to start_device_callback to s= atisfy the expected UINT64 type. Signed-off-by: Twaik Yont <[email protected]> </pre> </li> <li> <strong style=3D"font-weight: 600;"><a href=3D"https://gitlab.winehq.org/= wine/wine/-/commit/2f6b3fdf712bbc588ffa6bde2524f19bbd03e03e">2f6b3fdf</a>= </strong> <div> <span> by Twaik Yont </span> <i> at 2026-02-04T22:21:42+01:00 </i> </div> <pre class=3D"commit-message" style=3D'white-space: pre-wrap; display: bl= ock; font-size: 14px; color: #3a383f; position: relative; font-family: "G= itLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation M= ono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida co= nsole", monospace; font-variant-ligatures: none; word-break: break-all; w= ord-wrap: break-word; background-color: #fbfafd; border-radius: 2px; marg= in: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>win32u: Fix wineand= roid build after OpenGL drawable refactoring. After commit 7557d83c074a958ea042c3b86e11cd3b5670ec66, the Android OpenGL= driver fails to build because set_window_opengl_drawable() is no longer visible.= Export set_window_opengl_drawable() on Android to restore the wineandroid= .drv build, while keeping the existing internal linkage for non-Android platfo= rms. Signed-off-by: Twaik Yont <[email protected]> </pre> </li> <li> <strong style=3D"font-weight: 600;"><a href=3D"https://gitlab.winehq.org/= wine/wine/-/commit/63d33d0266801605464dc1edd1285f143f403e39">63d33d02</a>= </strong> <div> <span> by Twaik Yont </span> <i> at 2026-02-04T22:21:42+01:00 </i> </div> <pre class=3D"commit-message" style=3D'white-space: pre-wrap; display: bl= ock; font-size: 14px; color: #3a383f; position: relative; font-family: "G= itLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation M= ono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida co= nsole", monospace; font-variant-ligatures: none; word-break: break-all; w= ord-wrap: break-word; background-color: #fbfafd; border-radius: 2px; marg= in: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>ntdll: Export Java = globals for dlsym lookup. The java_vm, java_object and java_gdt_sel globals are looked up via dlsym= , but can end up with hidden visibility and therefore missing from the dynamic symbol table. Explicitly export these symbols to ensure they remain visible to dlsym. This appears to be required with newer Android NDK toolchains, likely rel= ated to changes in symbol visibility handling (for example Android NDK r22). Reference: https://github.com/android/ndk/wiki/Changelog-r22 Signed-off-by: Twaik Yont <[email protected]> </pre> </li> <li> <strong style=3D"font-weight: 600;"><a href=3D"https://gitlab.winehq.org/= wine/wine/-/commit/b3791d396c888a8850060853b85435507e703453">b3791d39</a>= </strong> <div> <span> by Twaik Yont </span> <i> at 2026-02-04T22:21:42+01:00 </i> </div> <pre class=3D"commit-message" style=3D'white-space: pre-wrap; display: bl= ock; font-size: 14px; color: #3a383f; position: relative; font-family: "G= itLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation M= ono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida co= nsole", monospace; font-variant-ligatures: none; word-break: break-all; w= ord-wrap: break-word; background-color: #fbfafd; border-radius: 2px; marg= in: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>wineandroid: Fix Wi= neAndroid device access path. Following an earlier change, the \\.\WineAndroid path and the correspondi= ng \??\WineAndroid symbolic link no longer resolved correctly. Open the WineAndroid device directly via \Device\WineAndroid, create the = driver and device objects using explicit kernel object names, and update the ioc= tl path to match. Use RTL_CONSTANT_STRING for allocation-free UNICODE_STRING= initialization. Signed-off-by: Twaik Yont <[email protected]> </pre> </li> </ul> <h4 style=3D"margin-top: 10px; margin-bottom: 10px;"> 7 changed files: </h4> <ul> <li class=3D"file-stats"> <a href=3D"https://gitlab.winehq.org/wine/wine/-/compare/3e7c4ecefb517c85= 87a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b85435507e703453#b72b5= 8f02248bdb37effb33f7a24ac596fbe87d4"> dlls/ntdll/unix/loader.c </a> </li> <li class=3D"file-stats"> <a href=3D"https://gitlab.winehq.org/wine/wine/-/compare/3e7c4ecefb517c85= 87a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b85435507e703453#fcaff= fe4f28530d849afc9b80bc72edceb68e94e"> dlls/win32u/opengl.c </a> </li> <li class=3D"file-stats"> <a href=3D"https://gitlab.winehq.org/wine/wine/-/compare/3e7c4ecefb517c85= 87a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b85435507e703453#85608= db1aded7f8ad7714f543bf489163f8918ce"> dlls/wineandroid.drv/android.h </a> </li> <li class=3D"file-stats"> <a href=3D"https://gitlab.winehq.org/wine/wine/-/compare/3e7c4ecefb517c85= 87a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b85435507e703453#6934d= e5ce9de7113645219cac6147b37aeb1f6ec"> dlls/wineandroid.drv/device.c </a> </li> <li class=3D"file-stats"> <a href=3D"https://gitlab.winehq.org/wine/wine/-/compare/3e7c4ecefb517c85= 87a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b85435507e703453#de822= bbc033a67408ed1f90c5562be312923946e"> dlls/wineandroid.drv/dllmain.c </a> </li> <li class=3D"file-stats"> <a href=3D"https://gitlab.winehq.org/wine/wine/-/compare/3e7c4ecefb517c85= 87a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b85435507e703453#1e9d0= b063b9345787494caa6bb576e7a76ddd8d7"> dlls/wineandroid.drv/init.c </a> </li> <li class=3D"file-stats"> <a href=3D"https://gitlab.winehq.org/wine/wine/-/compare/3e7c4ecefb517c85= 87a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b85435507e703453#832d3= 127ac90db21326c970af502e8c173db234b"> include/wine/opengl_driver.h </a> </li> </ul> </div> <div class=3D"footer" style=3D"margin-top: 10px;"> <p style=3D"font-size: small; color: #626168;"> =E2=80=94 <br> <a href=3D"https://gitlab.winehq.org/wine/wine/-/compare/3e7c4ecefb517c85= 87a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b85435507e703453">View= it on GitLab</a>. <br> You're receiving this email because of your account on <a target=3D"_blan= k" rel=3D"noopener noreferrer" href=3D"https://gitlab.winehq.org">gitlab.= winehq.org</a>. <a href=3D"https://gitlab.winehq.org/-/profile/notificati= ons" target=3D"_blank" rel=3D"noopener noreferrer" class=3D"mng-notif-lin= k">Manage all notifications</a> =C2=B7 <a href=3D"https://gitlab.winehq.o= rg/help" target=3D"_blank" rel=3D"noopener noreferrer" class=3D"help-link= ">Help</a> <span style=3D"color: transparent; font-size: 0; display: none; overflow:= hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0;"> Notification message regarding https://gitlab.winehq.org/wine/wine/-/comp= are/3e7c4ecefb517c8587a0285a641eb63eaf1a9b99...b3791d396c888a8850060853b8= 5435507e703453 at 1770241024 </span> </p> </div> </body> </html> ----==_mimepart_6983bc007e5ad_37bc84f9bdc1486529--