mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 20:50:02 +00:00
imm32: Use default IME window WM_DESTROY to call imm_couninit_thread.
This commit is contained in:
parent
d7d9344003
commit
8f3e19a52f
|
@ -1028,7 +1028,6 @@ static HWND imm_detach_default_window(IMMThreadData *thread_data)
|
|||
to_destroy = thread_data->hwndDefault;
|
||||
thread_data->hwndDefault = NULL;
|
||||
thread_data->windowRefs = 0;
|
||||
imm_couninit_thread(TRUE);
|
||||
return to_destroy;
|
||||
}
|
||||
|
||||
|
@ -3470,6 +3469,14 @@ LRESULT WINAPI __wine_ime_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp
|
|||
init_messages();
|
||||
return TRUE;
|
||||
|
||||
case WM_DESTROY:
|
||||
{
|
||||
HWND default_hwnd = ImmGetDefaultIMEWnd(0);
|
||||
if (!default_hwnd || hwnd == default_hwnd)
|
||||
imm_couninit_thread(TRUE);
|
||||
}
|
||||
return TRUE;
|
||||
|
||||
case WM_IME_INTERNAL:
|
||||
return ime_internal_msg(wparam, lparam);
|
||||
}
|
||||
|
|
|
@ -3760,7 +3760,6 @@ static void test_SetActiveWindow_0_proc( char **argv )
|
|||
else /* < Win10 */
|
||||
{
|
||||
ok( tmp == hwnd, "SetActiveWindow returned %p\n", tmp );
|
||||
todo_wine
|
||||
ok( GetLastError() == 0, "got error %lu\n", GetLastError() );
|
||||
|
||||
tmp = GetForegroundWindow();
|
||||
|
|
Loading…
Reference in a new issue