Better (?) fix for deadlock in a situation with an IME and a URP client

This reverts commit 3e5371ab.

Change-Id: I9e02a3d72f66a1eabb1f25d95417c855459556cc

vcl/source/window/winproc.cxx

@@ -1745,8 +1745,10 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl)
                 }
 
                 // TrackingMode is ended in ImplHandleLoseFocus
+#ifdef _WIN32
                 // To avoid problems with the Unix IME
-                // pFocusWin->EndExtTextInput( EXTTEXTINPUT_END_COMPLETE );
+                pFocusWin->EndExtTextInput( EXTTEXTINPUT_END_COMPLETE );
+#endif
 
                 // XXX #102010# hack for accessibility: do not close the menu,
                 // even after focus lost

vcl/win/source/window/salframe.cxx

@@ -2294,12 +2294,8 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags )
 
 void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags )
 {
-
-    SalData* pSalData = GetSalData();
-    if ( pSalData->mnAppThreadId != GetCurrentThreadId() )
-        ImplSalFrameEndExtTextInput( mhWnd, nFlags);
-    else
-        SendMessageW( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
+    // Must be called in the main thread!
+    SendMessageW( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
 }
 
 static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,