vcl/win/window/salframe.cxx | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit af3033e5546648bacdac3187caf2be6d5ea34f77
Author: Jan-Marek Glogowski <jan-marek.glogow...@extern.cib.de>
AuthorDate: Tue Feb 25 10:02:25 2020 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Feb 27 07:28:21 2020 +0100
WIN prevent deadlock in SetForegroundWindow
As mentioned in various blogs, like Raymon Chens "The old new
thing", 2008-08-01, "I warned you: The dangers of attaching input
queues", using AttachThreadInput to steal the input from an other
thread, so SetForegroundWindow becomes more reliable, can
deadlock in that call in win32u.dll!NtUserCallHwndLock.
Stackoverflow also has a multitude of suggestions and links in
"Win32 SetForegroundWindow unreliable", to circumvent Windows
focus-stealing prevention mechanisms.
A customer is experiencing these hangs reliably and often when
opening LO windows via Java UNO, because the Window and the UNO
thread are different and trigger this code path. Removing the
calls to AttachThreadInput fixes the problem for them. This has
started lately and nobody really knows why.
I also know other customers with a similar Java UNO setup, which
don't experience them.
For better foreground handling, the calling app eventually should
either use AllowSetForegroundWindow or CoAllowSetForegroundWindow
(for COM servers), to give up the foreground / input handling.
So this just drops the AttachThreadInput calls.
Change-Id: I8de0a17aaaa44c24b1ee728b2ef6ec3aea951c54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89527
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
(cherry picked from commit 518c0265efebf39ab6d1e90c4ec4e7cf52b701c6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89572
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index a57e67ce8896..aedba78e3fca 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1934,15 +1934,8 @@ static void ImplSalToTop( HWND hWnd, SalFrameToTop
nFlags )
if ( nFlags & SalFrameToTop::ForegroundTask )
{
- // This magic code is necessary to connect the input focus of the
- // current window thread and the thread which owns the window that
- // should be the new foreground window.
- HWND hCurrWnd = GetForegroundWindow();
- DWORD myThreadID = GetCurrentThreadId();
- DWORD currThreadID = GetWindowThreadProcessId(hCurrWnd,nullptr);
- AttachThreadInput(myThreadID, currThreadID,TRUE);
+ // LO used to call AttachThreadInput here, which resulted in deadlocks!
SetForegroundWindow_Impl(hWnd);
- AttachThreadInput(myThreadID,currThreadID,FALSE);
}
if ( nFlags & SalFrameToTop::RestoreWhenMin )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
