Huw Davies : winex11.drv: Only initialize static variables once per process .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d7eb2262b08cdd379e9c322b2abac807ce2d4491
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d7eb2262b08cdd379e9c322b2a...

Author: Huw Davies 
Date:   Tue Oct 24 12:32:00 2006 +0100

winex11.drv: Only initialize static variables once per process.

---

dlls/winex11.drv/xim.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 4d0b7ad..ff98f01 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -430,17 +430,20 @@ XIM X11DRV_SetupXIM(Display *display, co
             ximStyleCallback = ximStyle;
         }

-        }
+    }

wine_tsx11_unlock();

-    LoadImmDll();
-
-    if (pImmCreateContext)
+    if(!hImmDll)
     {
-        root_context = pImmCreateContext();
-        if (pImmAssociateContext)
-            pImmAssociateContext(0,root_context);
+        LoadImmDll();
+
+        if (pImmCreateContext)
+        {
+            root_context = pImmCreateContext();
+            if (pImmAssociateContext)
+                pImmAssociateContext(0,root_context);
+        }
     }

return xim;