commit 13.1.3 upon wine-1.7.4

dlls/imm32/imm.c

@@ -769,25 +769,22 @@ HIMC WINAPI ImmCreateContext(void)
 static BOOL IMM_DestroyContext(HIMC hIMC)
 {
     InputContextData *data = get_imc_data(hIMC);
+    IMMThreadData *tdata;
 
     TRACE("Destroying %p\n",hIMC);
 
-    if (data)
-    {
-        IMMThreadData *tdata;
-        data->immKbd->uSelected --;
-        data->immKbd->pImeSelect(hIMC, FALSE);
-        if (data->IMC.hWnd)
-            SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0));
-
-        tdata = IMM_IsDefaultContext(hIMC);
-        if (tdata)
-            tdata->hwndDefault = NULL;
-        LeaveCriticalSection(&threaddata_cs);
+    if (!data)
+        return FALSE;
 
     data->immKbd->uSelected --;
     data->immKbd->pImeSelect(hIMC, FALSE);
-    SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0));
+    if (data->IMC.hWnd)
+        SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0));
+
+    tdata = IMM_IsDefaultContext(hIMC);
+    if (tdata)
+        tdata->hwndDefault = NULL;
+    LeaveCriticalSection(&threaddata_cs);
 
     ImmDestroyIMCC(data->IMC.hCompStr);
     ImmDestroyIMCC(data->IMC.hCandInfo);
@@ -798,12 +795,11 @@ static BOOL IMM_DestroyContext(HIMC hIMC)
     data->magic = 0;
     HeapFree(GetProcessHeap(),0,data);
 
-        HeapFree(GetProcessHeap(),0,data);
-        EnterCriticalSection(&threaddata_cs);
-        if (tdata)
-            tdata->defaultContext = NULL;
-        LeaveCriticalSection(&threaddata_cs);
-    }
+    EnterCriticalSection(&threaddata_cs);
+    if (tdata)
+        tdata->defaultContext = NULL;
+    LeaveCriticalSection(&threaddata_cs);
+
     return TRUE;
 }