- Wine-GitLab - list.winehq.org

[PATCH v2 0/3] MR10710: wineandroid: prepare ioctl dispatch for Java-only thread execution (part of !10569)
by Twaik Yont (＠twaik) April 27, 2026

April 27, 2026

Part of !10569. This series prepares wineandroid ioctl dispatch paths for execution on Java-originated threads that do not have a Wine TEB. It does three things: * pass JNIEnv explicitly through the ioctl dispatch path instead of relying on the global jni_env value in handlers * move native window registration from the APC/unixlib callback path to the direct JNI surface_changed callback on the Android UI thread * make logging in device.c context-aware so the same code remains safe both on Wine threads and on Java-only threads The JNIEnv change is a preparatory refactoring. It does not by itself complete the thread model transition, but it removes one of the major implicit dependencies on Wine thread context and makes follow-up changes smaller and easier to review. Moving native window registration to surface_changed removes another dependency on APC-based execution in the desktop process and puts window attachment on the thread that actually receives the Android surface callbacks. A shared lock is used to serialize registration against ioctl dispatch. Finally, logging in device.c is made context-aware. Upcoming changes will run parts of ioctl dispatch on Java-only threads, where the standard Wine TRACE/WARN/FIXME/ERR macros are unsafe because they depend on Wine TEB state. The local logging wrapper preserves normal Wine logging semantics on Wine threads and falls back to Android logging on non-Wine threads, allowing the existing code to keep using the standard logging macros without invasive per-call-site changes. Taken together, these patches remove several implicit Wine-thread-only assumptions from wineandroid ioctl dispatch code and prepare the path for running more of it directly on Java-side threads. -- v2: wineandroid: pass JNIEnv explicitly through ioctl handlers wineandroid: move native window registration to surface_changed wineandroid: make logging context-aware for upcoming Java-only ioctl dispatch https://gitlab.winehq.org/wine/wine/-/merge_requests/10710

2 4

[PATCH 0/1] MR10736: gdiplus: Don't add X margin on Center/Fat for GdipMeasureCharacterRanges
by Bartosz Kosiorek (＠gang65) April 27, 2026

April 27, 2026

We should shift X position only for StringAlignmentNear. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10736

4 9

[PATCH 0/3] MR10710: wineandroid: prepare ioctl dispatch for Java-only thread execution (part of !10569)
by Twaik Yont (＠twaik) April 27, 2026

April 27, 2026

Part of !10569. This series prepares wineandroid ioctl dispatch paths for execution on Java-originated threads that do not have a Wine TEB. It does three things: * pass JNIEnv explicitly through the ioctl dispatch path instead of relying on the global jni_env value in handlers * move native window registration from the APC/unixlib callback path to the direct JNI surface_changed callback on the Android UI thread * make logging in device.c context-aware so the same code remains safe both on Wine threads and on Java-only threads The JNIEnv change is a preparatory refactoring. It does not by itself complete the thread model transition, but it removes one of the major implicit dependencies on Wine thread context and makes follow-up changes smaller and easier to review. Moving native window registration to surface_changed removes another dependency on APC-based execution in the desktop process and puts window attachment on the thread that actually receives the Android surface callbacks. A shared lock is used to serialize registration against ioctl dispatch. Finally, logging in device.c is made context-aware. Upcoming changes will run parts of ioctl dispatch on Java-only threads, where the standard Wine TRACE/WARN/FIXME/ERR macros are unsafe because they depend on Wine TEB state. The local logging wrapper preserves normal Wine logging semantics on Wine threads and falls back to Android logging on non-Wine threads, allowing the existing code to keep using the standard logging macros without invasive per-call-site changes. Taken together, these patches remove several implicit Wine-thread-only assumptions from wineandroid ioctl dispatch code and prepare the path for running more of it directly on Java-side threads. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10710

3 11

[PATCH 0/1] MR10756: Uninstaller/Appwiz: update app list after installation
by Rose Hellsing (＠axtlos) April 27, 2026

April 27, 2026

Match the Uninstall workflow and make Installation synchronous to allow the app list to update immediately after installation finishes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48597 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10756

2 1

Re: [PATCH v4 0/1] MR10485: vbscript: Return proper errors for orphan Loop and Next keywords. - approved
by Jacek Caban (＠jacek) April 27, 2026

April 27, 2026

This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10485

1 0

[PATCH v12 0/1] MR10314: vbscript: Convert string to number for comparison operators.
by Francis De Brabandere (＠francisdb) April 27, 2026

April 27, 2026

When one operand was a string and the other numeric, VBScript should have converted the string to a double before comparing. VarCmp did not do this automatically, resulting in incorrect string comparison. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56281 -- v12: vbscript: Convert string to number for comparison operators. https://gitlab.winehq.org/wine/wine/-/merge_requests/10314

3 3

[PATCH v4 0/1] MR10692: vbscript: Fix Sub first argument parentheses handling (alt parser-only).
by Francis De Brabandere (＠francisdb) April 27, 2026

April 27, 2026

Alternative to MR !10244 that does the disambiguation entirely in the parser grammar. The lex keeps master's behavior (no state tracking, no paren lookahead); a new SimpleStatement production handles the 'CallExpression Arguments OP Expression [, rest]' pattern and rewrites it as 'f((args) OP expr)' via the action. Cost: +2 shift/reduce conflicts (12 vs baseline 10). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54177 -- v4: vbscript: Fix Sub first argument parentheses handling. https://gitlab.winehq.org/wine/wine/-/merge_requests/10692

3 2

[PATCH 0/2] MR10724: gdiplus: Elide empty spans.
by Conor McCarthy (＠cmccarthy) April 27, 2026

April 27, 2026

We assume a span is never empty and therefore can never begin at the right bound. An empty span there can break the requirement in combine_regions_to_spans() that current span Y coordinates are never less than the loop Y coordinate. Empty spans also break the in_left and in_right calculation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59678 The added test will assert without the fix. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10724

4 5

[PATCH v3 0/4] MR10753: ntdll/actctx: Add privatePath probing functions in SxS loader
by Bolan Chen (＠bolanc) April 27, 2026

April 27, 2026

Besides manifest files, SxS Loader can also take a config file similar to CLR apps which can instruct the loader to look for manifests in additional paths. Autodesk installers use this somewhat obscure feature so this probe path will help Autodesk software installer to start. The config file looks like ``` <configuration> <windows> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <probing privatePath="path"/> </assemblyBinding> </windows> </configuration> ``` Microsoft mentions this feature in [application config files doc](https://learn.microsoft.com/en-us/windows/win32/sbscs/application-conf…. -- v3: ntdll/actctx: add correct fallback path using manifest.info actctx/tests: add tests ntdll/actctx: add proper probing functionality ntdll/actctx: add essential functions to read .config file and parse privatePath https://gitlab.winehq.org/wine/wine/-/merge_requests/10753

2 4

[PATCH 0/4] MR10755: dinput: Add proper support for DIPROP_JOYSTICKID and GUID_Joystick.
by Connor McAdams (＠cmcadams) April 27, 2026

April 27, 2026

This was also attempted in MR !6878. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10755

3 8

[PATCH v2 0/2] MR10672: win32u: Initialize Uniscribe fallback registry keys on startup.
by समीरसिंह Sameer Singh (＠ss141309) April 27, 2026

April 27, 2026

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27641 @aricstewart I thought about the trade-offs between the two approaches (this and https://gitlab.winehq.org/wine/wine/-/merge_requests/10630) and finally decided to go through with this, because this would allow for a more better UX. How does this look? If it looks better, we can close the previous MR. Also I will open a separate MR for the script tag, which will hopefully have a better solution than just using one script tag for a script. -- v2: win32u: Initialize Uniscribe fallback registry keys on startup. win32u: Implement fontconfig_get_default_font_for_char(). https://gitlab.winehq.org/wine/wine/-/merge_requests/10672

3 3

Re: [PATCH v6 0/1] MR10553: iphlpapi: Prefer adapters with valid MAC in GetAdaptersInfo.
by Tim Clem (＠tclem) April 27, 2026

April 27, 2026

On Thu Apr 23 07:22:38 2026 +0000, Hans Leidekker wrote: > @tclem and @bshanks may know better if these interfaces are still used. > Alternatively we could put them last, although that presumably brings > back the buffer overflow in your app. I don't know much about those options unfortunately. I do see that you can create a 6-to-4 device in Network Settings, which seems to bring up stf0 on my machine. I don't know if there's a UI that would set up a gif device, but presumably you could configure and bring one up with ifconfig. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10553#note_137760

1 0

[PATCH v4 0/3] MR10612: gdi32/uniscribe: Fix heap buffer overflow in ScriptStringAnalyse().
by समीरसिंह Sameer Singh (＠ss141309) April 27, 2026

April 27, 2026

Hi, I came across this bug while solving another issue. Steps to reproduce: 1. Open wine notepad 2. Start spamming any character that requires mark_invalid_combinations() in the notepad, such as: َ (0x064e Arabic Fatha) 3. At nearly 41 inserted Fatha, notepad will crash -- v4: gdi32/uniscribe: Resize the buffers if glyph count exceeds limit. gdi32/uniscribe: Perform bounds check in insert_glyph(). gdi32/uniscribe: Fix heap buffer overflow in ScriptStringAnalyse(). https://gitlab.winehq.org/wine/wine/-/merge_requests/10612

3 7

[PATCH v3 0/1] MR10704: Display invalid Indic syllables
by Aric Stewart (＠aricstewart) April 27, 2026

April 27, 2026

Use the U+25CC DOTTED CIRCLE as the base glyph for invalid Indic syllables https://bugs.winehq.org/show_bug.cgi?id=27637 -- v3: Display invalid Indic syllables https://gitlab.winehq.org/wine/wine/-/merge_requests/10704

3 3

[PATCH v14 0/9] MR10604: setupapi, ntoskrnl: Implement CM_Get_Parent with device tree properties
by Jan Robert Gerigk (＠RgSg86) April 27, 2026

April 27, 2026

Wine Bug: https://bugs.winehq.org/show_bug.cgi?id=59604 Implement CM_Get_Parent by storing device tree relationship properties when ntoskrnl enumerates child devices via IRP_MN_QUERY_DEVICE_RELATIONS: - DEVPKEY_Device_Parent on each child device - DEVPKEY_Device_Children on the parent device - DEVPKEY_Device_Siblings on each child device CM_Get_Parent reads DEVPKEY_Device_Parent through SetupDiGetDevicePropertyW. Also fix SETUPDI_EnumerateMatchingInterfaces to remove devices without interfaces from DIGCF_DEVICEINTERFACE enumeration results. --\> no more phantom devices Based on discussion with Rémi Bernon (Bug 59604) Tested on a fresh Wine 11.6 setup with KNX ETS 6.4.1: A USB HID license dongle (VID 2A07, PID 0102) is now correctly identified through CM_Get_Parent device tree navigation. -- v14: setupapi/tests: Add CM_Get_Parent tests. cfgmgr32: Implement CM_Get_Parent using DEVPKEY_Device_Parent property. ntoskrnl: Store DEVPKEY_Device_Siblings on each child after bus enumeration. ntoskrnl/tests: Add DEVPKEY_Device_Children test. ntoskrnl: Store DEVPKEY_Device_Children on parent after bus enumeration. ntoskrnl/tests: Add DEVPKEY_Device_Parent test. ntoskrnl: Store DEVPKEY_Device_Parent when enumerating child devices. setupapi/tests: Add test for DIGCF_DEVICEINTERFACE filter. setupapi: Remove devices without interfaces from DIGCF_DEVICEINTERFACE enumeration. https://gitlab.winehq.org/wine/wine/-/merge_requests/10604

2 9

[PATCH v4 0/3] MR10743: small odbc fixes
by Ivan Ivlev (＠iviv) April 27, 2026

April 27, 2026

1)odbc32: compare strings case-insensitively in get_driver_filename() Driver names should be compared without case-sensetivity. unixODBC has no problems when testDSN got "Driver = SQLite3" instead of "Driver = SQLITE3" https://learn.microsoft.com/en-us/openspecs/sql_server_protocols/ms-odbcstr… 2)odbc32: skip set_value for NULL filename in replicate_odbc_to_registry() get_driver_filename can return NULL, for example when \~/.odbc.ini contains driver that has been deleted. We want to prevent SIGSEGV because of wcslen(filename) when filename is NULL. 3)odbc32: check if row_number is NULL in param_options_unix() According to documentation, SQLParamOptions can accept NULL row_number. Now when NULL row_nuber is passed, crash happens 4)odbc32: make sure ODBC_CALL returns SQLRETURN Not sure about this one, need opinion. The targeted problem: now ODBC_CALL return SQLRETURN which is truncated from NTSTATUS. If WINE_UNIX_CALL fails at some point, ODBC_CALL returns truncated NTSTATUS error code, STATUS_ACCESS_VIOLATION (0xC0000005) truncated to 5, then function gets invalid SQLRETURN. The following solution checks of NTSTATUS is actually short SQLRETURN casted to NTSTATUS. -- v4: odbc32: Check if row_number is NULL in param_options_unix(). odbc32: Skip set_value for NULL filename in replicate_odbc_to_registry(). odbc32: Compare strings case-insensitively in get_driver_filename(). https://gitlab.winehq.org/wine/wine/-/merge_requests/10743

3 5

[PATCH 0/3] MR10754: mf/session: Initialise the stored presentation rate.
by Conor McCarthy (＠cmccarthy) April 27, 2026

April 27, 2026

The latest argument passed to SetRate() is stored in presentation.rate, but if the client never called SetRate(), the stored rate remains zero, which results in preroll not being enabled. That could be fixed by instead calling GetRate() before enabling preroll, but always setting the stored rate reduces the risk of regression. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10754

3 5

[PATCH v3 0/3] MR10743: small odbc fixes
by Ivan Ivlev (＠iviv) April 27, 2026

April 27, 2026

1)odbc32: compare strings case-insensitively in get_driver_filename() Driver names should be compared without case-sensetivity. unixODBC has no problems when testDSN got "Driver = SQLite3" instead of "Driver = SQLITE3" https://learn.microsoft.com/en-us/openspecs/sql_server_protocols/ms-odbcstr… 2)odbc32: skip set_value for NULL filename in replicate_odbc_to_registry() get_driver_filename can return NULL, for example when \~/.odbc.ini contains driver that has been deleted. We want to prevent SIGSEGV because of wcslen(filename) when filename is NULL. 3)odbc32: check if row_number is NULL in param_options_unix() According to documentation, SQLParamOptions can accept NULL row_number. Now when NULL row_nuber is passed, crash happens 4)odbc32: make sure ODBC_CALL returns SQLRETURN Not sure about this one, need opinion. The targeted problem: now ODBC_CALL return SQLRETURN which is truncated from NTSTATUS. If WINE_UNIX_CALL fails at some point, ODBC_CALL returns truncated NTSTATUS error code, STATUS_ACCESS_VIOLATION (0xC0000005) truncated to 5, then function gets invalid SQLRETURN. The following solution checks of NTSTATUS is actually short SQLRETURN casted to NTSTATUS. -- v3: odbc32: Check if row_number is NULL in param_options_unix(). odbc32: Skip set_value for NULL filename in replicate_odbc_to_registry(). odbc32: Compare strings case-insensitively in get_driver_filename(). https://gitlab.winehq.org/wine/wine/-/merge_requests/10743

2 4

[PATCH v3 0/2] MR10750: msado15: Handle BSTR bookmarks in _Recordset::Find.
by Piotr Caban (＠piotr) April 27, 2026

April 27, 2026

-- v3: msado15: Handle empty BSTR bookmark in _Recordset::Find. https://gitlab.winehq.org/wine/wine/-/merge_requests/10750

2 2

Re: [PATCH v3 0/4] MR10751: winscard: Implement SCardGetCardTypeProviderName and SCardListCards (smartcard database)
by Hans Leidekker (＠hans) April 27, 2026

April 27, 2026

Thanks for the patches. I have some comments. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10751#note_137728

1 0

Re: [PATCH v3 0/4] MR10751: winscard: Implement SCardGetCardTypeProviderName and SCardListCards (smartcard database)
by Hans Leidekker (＠hans) April 27, 2026

April 27, 2026

Hans Leidekker (@hans) commented about dlls/winscard/winscard.c: > return SCARD_S_SUCCESS; > } > > +/* subkey of the db in HKLM */ > +const WCHAR* SUBKEY_SMARTCARDS_DATABASE = L"SOFTWARE\\Microsoft\\Cryptography\\Calais\\SmartCards"; > + > +/******************************************************************************* > + * SCardGetCardTypeProviderNameW (winscard.@) > + * > + * Return the name of the "provider" that handles the given type of card. > + * Depending on the value of `provider_id`, this return either the name of the DLL, crypto provider, or key storage provider. We no longer do function documentation. We can refer to MSDN instead. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10751#note_137727

1 0

Re: [PATCH v3 0/4] MR10751: winscard: Implement SCardGetCardTypeProviderName and SCardListCards (smartcard database)
by Hans Leidekker (＠hans) April 27, 2026

April 27, 2026

Hans Leidekker (@hans) commented about dlls/winscard/tests/winscard.c: > + ok(len == wcslen(provider)+1, "bad length from SCardGetCardTypeProviderNameW: got %lu, expected %Iu\n", len, wcslen(provider)+1); > + SCardFreeMemory(ctx, provider); > + > + ret = SCardReleaseContext(ctx); > + ok(ret == ERROR_SUCCESS, "failed to release context: error %ld\n", ret); > +} > + > +static void test_smartcard_db(void) > +{ > + LONG ret; > + > + ret = populate_smartcard_db(); > + ok(ret == ERROR_SUCCESS, "failed to populate database: error %ld\n", ret); > + if (ret) return; > + > + test_SCardGetCardTypeProviderName(); This function could be omitted if you call populate_smartcard_db() first in test_SCardGetCardTypeProviderName(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10751#note_137726

1 0

Re: [PATCH v3 0/4] MR10751: winscard: Implement SCardGetCardTypeProviderName and SCardListCards (smartcard database)
by Hans Leidekker (＠hans) April 27, 2026

April 27, 2026

Hans Leidekker (@hans) commented about dlls/winscard/tests/winscard.c: > + if (ret) return ret; > + > + ret = RegCloseKey(key_card1); > + if (ret) return ret; > + ret = RegCloseKey(key_card2); > + if (ret) return ret; > + ret = RegCloseKey(key_db); > + if (ret) return ret; > + > + return 0; > +} > + > +static void test_SCardGetCardTypeProviderName(void) > +{ > + LONG ret; > + SCARDCONTEXT ctx = 0; /* SCardGetCardTypeProviderName does not need a context */ In that case you should just pass 0 directly. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10751#note_137725

1 0

Re: [PATCH v3 0/4] MR10751: winscard: Implement SCardGetCardTypeProviderName and SCardListCards (smartcard database)
by Hans Leidekker (＠hans) April 27, 2026

April 27, 2026

Hans Leidekker (@hans) commented about dlls/winscard/tests/winscard.c: > + > + ret = create_empty_key(HKEY_LOCAL_MACHINE, SUBKEY_SMARTCARDS_DATABASE, &key_db); > + ok(ret == ERROR_SUCCESS, "failed to create an empty %s: %ld\n", SUBKEY_SMARTCARDS_DATABASE, ret); > + > + ret = RegCreateKeyExA(key_db, CARD_NAME_1, 0, NULL, 0, KEY_WRITE, NULL, &key_card1, NULL); > + if (ret) return ret; > + ret = RegCreateKeyExA(key_db, CARD_NAME_2, 0, NULL, 0, KEY_WRITE, NULL, &key_card2, NULL); > + if (ret) return ret; > + > + ret = RegSetValueExA(key_card1, "Crypto Provider", 0, REG_SZ, (const BYTE*)crypto_provider_1, strlen(crypto_provider_1)); > + if (ret) return ret; > + ret = RegSetValueExA(key_card2, "Crypto Provider", 0, REG_SZ, (const BYTE*)crypto_provider_2, strlen(crypto_provider_2)); > + if (ret) return ret; > + > + ret = RegSetValueExA(key_card1, "Smart Card Key Storage Provider", 0, REG_SZ, (const BYTE*)storage_provider_1, strlen(storage_provider_1)); > + if (ret) return ret; Please wrap lines when they exceed 120 characters. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10751#note_137724

1 0

Re: [PATCH v3 0/4] MR10751: winscard: Implement SCardGetCardTypeProviderName and SCardListCards (smartcard database)
by Hans Leidekker (＠hans) April 27, 2026

April 27, 2026

Hans Leidekker (@hans) commented about dlls/winscard/tests/winscard.c: > + ret = RegOpenKeyExA(hkey, name, 0, KEY_READ|KEY_WRITE, &key); > + if (ret == ERROR_SUCCESS) { > + ret = RegDeleteTreeA(key, NULL); > + if (ret != ERROR_SUCCESS) { > + return ret; > + } > + } > + ret = RegCreateKeyExA(hkey, name, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, open_key, NULL); > + return ret; > +} > + > +const char* SUBKEY_SMARTCARDS_DATABASE = "SOFTWARE\\Microsoft\\Cryptography\\Calais\\SmartCards"; > +const char *CARD_NAME_1 = "PKI-test-1"; > +const char *CARD_NAME_2 = "PKI-test-2"; > +const WCHAR *CARD_NAME_1L = L"PKI-test-1"; > +const WCHAR *CARD_NAME_2L = L"PKI-test-2"; Please use lower-case for the variables. The convention is to use a W suffix for wide character strings. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10751#note_137723

1 0