Aric Stewart : imm32: Create the IME UI window with the IME instance so the registered class can be found .

[Alexandre Julliard]

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

Author: Aric Stewart <aric(a)codeweavers.com>
Date:   Wed Apr 16 14:30:13 2008 -0500

imm32: Create the IME UI window with the IME instance so the registered class can be found.

---

 dlls/imm32/imm.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 4eac53a..c267a70 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -92,7 +92,6 @@ typedef struct _tagIMMThreadData {
     HWND hwndDefault;
 } IMMThreadData;
 
-static HANDLE hImeInst;
 static DWORD tlsIndex = 0;
 static struct list ImmHklList = LIST_INIT(ImmHklList);
 
@@ -294,7 +293,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
-            hImeInst = hInstDLL;
             IMM_RegisterMessages();
             tlsIndex = TlsAlloc();
             IMM_InitThreadData();
@@ -1800,8 +1798,8 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen)
     {
         /* create the ime window */
         data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW,
-                    data->immKbd->imeClassName,
-                    NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, hImeInst, 0);
+                    data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0,
+                    0, data->immKbd->hIME, 0);
         SetWindowLongW(data->imeWnd, IMMGWL_IMC, (LONG)data);
         IMM_GetThreadData()->hwndDefault = data->imeWnd;
     }