[PATCH 0/1] MR8031: winex11: Ensure initialized thread data in X11DRV_get_ic.

[Etaash Mathamsetty (＠etaash.mathamsetty)]

Intends to replace: https://gitlab.winehq.org/wine/wine-staging/-/blob/master/patches/winex11-im...

This patch has been in proton for almost 2 years now, never realized the same code existed upstream, lol

[PATCH 1/1] winex11: Ensure initialized thread data in X11DRV_get_ic.

[Etaash Mathamsetty]

From: Etaash Mathamsetty

---
 dlls/winex11.drv/xim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index ef09356fbb0..4c93c73cc23 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -509,7 +509,7 @@ XIC X11DRV_get_ic( HWND hwnd )
     XIC ret;

if (!(data = get_win_data( hwnd ))) return 0;
-    x11drv_thread_data()->last_xic_hwnd = hwnd;
+    x11drv_init_thread_data()->last_xic_hwnd = hwnd;
     if (!(ret = data->xic) && (xim = x11drv_thread_data()->xim))
         ret = data->xic = xic_create( xim, hwnd, data->whole_window );
     release_win_data( data );

[Jinoh Kang (＠iamahuman)]

Tests would be nice.

[Jinoh Kang (＠iamahuman)]

On Sat May 17 13:55:36 2025 +0000, Jinoh Kang wrote:
> Tests would be nice.

It's not clear the bug is around anymore, maybe the patch is no longer needed anymore. So if you can demonstrate the bug (ideally via a test), that would be nice.

[Etaash Mathamsetty (＠etaash.mathamsetty)]

On Sat May 17 14:01:10 2025 +0000, Jinoh Kang wrote:
> It's not clear the bug is around anymore, maybe the patch is no longer
> needed. So if you can demonstrate the bug (ideally via a test), that
> would be nice.

Yes, will do