[PATCH v2 2/6] winex11: Clear the composition string when input context is closed.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winex11.drv/ime.c | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c
index bfca49ab22b..095a7fc12d6 100644
--- a/dlls/winex11.drv/ime.c
+++ b/dlls/winex11.drv/ime.c
@@ -591,8 +591,6 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
                     }
                     break;
                 case IMC_SETOPENSTATUS:
-                    TRACE("IMC_SETOPENSTATUS\n");
-
                     bRet = TRUE;
                     preedit_params.hwnd = lpIMC->hWnd;
                     preedit_params.open = lpIMC->fOpen;
@@ -600,9 +598,10 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
                     if (!lpIMC->fOpen)
                     {
                         X11DRV_CALL( xim_reset, lpIMC->hWnd );
+                        ImmDestroyIMCC( lpIMC->hCompStr );
+                        lpIMC->hCompStr = ImeCreateBlankCompStr();
                         ime_set_composition_status( hIMC, FALSE );
                     }
-
                     break;
                 default: FIXME("Unknown\n"); break;
             }
@@ -643,27 +642,16 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
                         free( str );
                     }

-                    ime_set_composition_status( hIMC, FALSE );
-
+                    ImmSetOpenStatus( hIMC, FALSE );
                     bRet = TRUE;
                 }
                 break;
                 case CPS_CONVERT: FIXME("CPS_CONVERT\n"); break;
                 case CPS_REVERT: FIXME("CPS_REVERT\n"); break;
                 case CPS_CANCEL:
-                {
-                    TRACE("CPS_CANCEL\n");
-
-                    X11DRV_CALL( xim_reset, lpIMC->hWnd );
-
-                    if (lpIMC->hCompStr)
-                        ImmDestroyIMCC(lpIMC->hCompStr);
-                    lpIMC->hCompStr = ImeCreateBlankCompStr();
-
-                    ime_set_composition_status( hIMC, FALSE );
+                    ImmSetOpenStatus( hIMC, FALSE );
                     bRet = TRUE;
-                }
-                break;
+                    break;
                 default: FIXME("Unknown\n"); break;
             }
             break;