[PATCH 2/5] imm32: Move ImmAssociateContext(Ex) around.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/imm32/imm.c | 116 +++++++++++++++++++++++------------------------
 1 file changed, 56 insertions(+), 60 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 554cc00b457..f7304897f15 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -865,66 +865,6 @@ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate)
     return TRUE;
 }

-/***********************************************************************
- *		ImmAssociateContext (IMM32.@)
- */
-HIMC WINAPI ImmAssociateContext(HWND hwnd, HIMC imc)
-{
-    HIMC old;
-    UINT ret;
-
-    TRACE("(%p, %p):\n", hwnd, imc);
-
-    old = NtUserGetWindowInputContext(hwnd);
-    ret = NtUserAssociateInputContext(hwnd, imc, 0);
-    if (ret == AICR_FOCUS_CHANGED)
-    {
-        ImmSetActiveContext(hwnd, old, FALSE);
-        ImmSetActiveContext(hwnd, imc, TRUE);
-    }
-    return ret == AICR_FAILED ? 0 : old;
-}
-
-
-/*
- * Helper function for ImmAssociateContextEx
- */
-static BOOL CALLBACK _ImmAssociateContextExEnumProc(HWND hwnd, LPARAM lParam)
-{
-    HIMC hImc = (HIMC)lParam;
-    ImmAssociateContext(hwnd,hImc);
-    return TRUE;
-}
-
-/***********************************************************************
- *              ImmAssociateContextEx (IMM32.@)
- */
-BOOL WINAPI ImmAssociateContextEx(HWND hwnd, HIMC imc, DWORD flags)
-{
-    HIMC old;
-    UINT ret;
-
-    TRACE("(%p, %p, 0x%lx):\n", hwnd, imc, flags);
-
-    if (!hwnd)
-        return FALSE;
-
-    if (flags == IACE_CHILDREN)
-    {
-        EnumChildWindows(hwnd, _ImmAssociateContextExEnumProc, (LPARAM)imc);
-        return TRUE;
-    }
-
-    old = NtUserGetWindowInputContext(hwnd);
-    ret = NtUserAssociateInputContext(hwnd, imc, flags);
-    if (ret == AICR_FOCUS_CHANGED)
-    {
-        ImmSetActiveContext(hwnd, old, FALSE);
-        ImmSetActiveContext(hwnd, imc, TRUE);
-    }
-    return ret != AICR_FAILED;
-}
-
 /***********************************************************************
  *		ImmConfigureIMEA (IMM32.@)
  */
@@ -1065,6 +1005,62 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC)
     return IMM_DestroyContext(hIMC);
 }

+/***********************************************************************
+ *      ImmAssociateContext (IMM32.@)
+ */
+HIMC WINAPI ImmAssociateContext( HWND hwnd, HIMC new_himc )
+{
+    HIMC old_himc;
+    UINT ret;
+
+    TRACE( "hwnd %p, new_himc %p\n", hwnd, new_himc );
+
+    old_himc = NtUserGetWindowInputContext( hwnd );
+    ret = NtUserAssociateInputContext( hwnd, new_himc, 0 );
+    if (ret == AICR_FOCUS_CHANGED)
+    {
+        ImmSetActiveContext( hwnd, old_himc, FALSE );
+        ImmSetActiveContext( hwnd, new_himc, TRUE );
+    }
+
+    return ret == AICR_FAILED ? 0 : old_himc;
+}
+
+static BOOL CALLBACK enum_associate_context( HWND hwnd, LPARAM lparam )
+{
+    ImmAssociateContext( hwnd, (HIMC)lparam );
+    return TRUE;
+}
+
+/***********************************************************************
+ *              ImmAssociateContextEx (IMM32.@)
+ */
+BOOL WINAPI ImmAssociateContextEx( HWND hwnd, HIMC new_himc, DWORD flags )
+{
+    HIMC old_himc;
+    UINT ret;
+
+    TRACE( "hwnd %p, new_himc %p, flags %#lx\n", hwnd, new_himc, flags );
+
+    if (!hwnd) return FALSE;
+
+    if (flags == IACE_CHILDREN)
+    {
+        EnumChildWindows( hwnd, enum_associate_context, (LPARAM)new_himc );
+        return TRUE;
+    }
+
+    old_himc = NtUserGetWindowInputContext( hwnd );
+    ret = NtUserAssociateInputContext( hwnd, new_himc, flags );
+    if (ret == AICR_FOCUS_CHANGED)
+    {
+        ImmSetActiveContext( hwnd, old_himc, FALSE );
+        ImmSetActiveContext( hwnd, new_himc, TRUE );
+    }
+
+    return ret != AICR_FAILED;
+}
+
 struct enum_register_word_params_WtoA
 {
     REGISTERWORDENUMPROCA proc;