mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
123 lines
4.9 KiB
Diff
123 lines
4.9 KiB
Diff
From 364612d585a26bb8b4b9f8428103585e05f7ee78 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= <gabrielopcode@gmail.com>
|
|
Date: Mon, 22 Jul 2019 15:29:25 +0300
|
|
Subject: [PATCH] user32/focus: Prevent a recursive loop with the activation
|
|
messages
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
When activating a window and sending activation messages to the window
|
|
procedure, Windows avoids a recursive loop by not sending more of these
|
|
messages or hooks while it's still activating the window. Some applications
|
|
actually depend on this behavior, so it is needed.
|
|
|
|
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274
|
|
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
|
|
---
|
|
dlls/win32u/input.c | 41 ++++++++++++++++++++++++------------
|
|
dlls/win32u/ntuser_private.h | 1 +
|
|
2 files changed, 29 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
|
|
index f3b724e7010..9f89f21059f 100644
|
|
--- a/dlls/win32u/input.c
|
|
+++ b/dlls/win32u/input.c
|
|
@@ -1599,7 +1599,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
|
|
{
|
|
HWND previous = get_active_window();
|
|
BOOL ret;
|
|
- DWORD old_thread, new_thread;
|
|
+ DWORD winflags, old_thread, new_thread;
|
|
CBTACTIVATESTRUCT cbt;
|
|
|
|
if (previous == hwnd)
|
|
@@ -1608,16 +1608,24 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
|
|
return TRUE;
|
|
}
|
|
|
|
- /* call CBT hook chain */
|
|
- cbt.fMouse = mouse;
|
|
- cbt.hWndActive = previous;
|
|
- if (call_hooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, sizeof(cbt) )) return FALSE;
|
|
-
|
|
- if (is_window( previous ))
|
|
+ /* Prevent a recursive activation loop with the activation messages */
|
|
+ winflags = win_set_flags(hwnd, WIN_IS_IN_ACTIVATION, 0);
|
|
+ if (!(winflags & WIN_IS_IN_ACTIVATION))
|
|
{
|
|
- send_message( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd );
|
|
- send_message( previous, WM_ACTIVATE,
|
|
- MAKEWPARAM( WA_INACTIVE, is_iconic(previous) ), (LPARAM)hwnd );
|
|
+ ret = FALSE;
|
|
+
|
|
+ /* call CBT hook chain */
|
|
+ cbt.fMouse = mouse;
|
|
+ cbt.hWndActive = previous;
|
|
+ if (call_hooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, sizeof(cbt) ))
|
|
+ goto clear_flags;
|
|
+
|
|
+ if (is_window(previous))
|
|
+ {
|
|
+ send_message( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd );
|
|
+ send_message( previous, WM_ACTIVATE,
|
|
+ MAKEWPARAM( WA_INACTIVE, is_iconic(previous) ), (LPARAM)hwnd );
|
|
+ }
|
|
}
|
|
|
|
SERVER_START_REQ( set_active_window )
|
|
@@ -1637,7 +1645,11 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
|
|
if (send_message( hwnd, WM_QUERYNEWPALETTE, 0, 0 ))
|
|
send_message_timeout( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0,
|
|
SMTO_ABORTIFHUNG, 2000, FALSE );
|
|
- if (!is_window(hwnd)) return FALSE;
|
|
+ if (!is_window(hwnd))
|
|
+ {
|
|
+ ret = FALSE;
|
|
+ goto clear_flags;
|
|
+ }
|
|
}
|
|
|
|
old_thread = previous ? get_window_thread( previous, NULL ) : 0;
|
|
@@ -1669,7 +1681,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
|
|
}
|
|
}
|
|
|
|
- if (is_window(hwnd))
|
|
+ if (!(winflags & WIN_IS_IN_ACTIVATION) && is_window(hwnd))
|
|
{
|
|
send_message( hwnd, WM_NCACTIVATE, hwnd == NtUserGetForegroundWindow(), (LPARAM)previous );
|
|
send_message( hwnd, WM_ACTIVATE,
|
|
@@ -1689,12 +1701,15 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
|
|
/* Do not change focus if the window is no more active */
|
|
if (hwnd == info.hwndActive)
|
|
{
|
|
+ /* this line exists to keep this patch from applying in the wrong place */
|
|
if (!info.hwndFocus || !hwnd || NtUserGetAncestor( info.hwndFocus, GA_ROOT ) != hwnd)
|
|
set_focus_window( hwnd );
|
|
}
|
|
}
|
|
|
|
- return TRUE;
|
|
+clear_flags:
|
|
+ win_set_flags(hwnd, 0, WIN_IS_IN_ACTIVATION);
|
|
+ return ret;
|
|
}
|
|
|
|
/**********************************************************************
|
|
diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h
|
|
index 8287126258e..38ac4498a83 100644
|
|
--- a/dlls/win32u/ntuser_private.h
|
|
+++ b/dlls/win32u/ntuser_private.h
|
|
@@ -104,6 +104,7 @@ typedef struct tagWND
|
|
#define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */
|
|
#define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */
|
|
#define WIN_HAS_IME_WIN 0x0080 /* the window has been registered with imm32 */
|
|
+#define WIN_IS_IN_ACTIVATION 0x0100 /* the window is in an activation process */
|
|
|
|
#define WND_OTHER_PROCESS ((WND *)1) /* returned by get_win_ptr on unknown window handles */
|
|
#define WND_DESKTOP ((WND *)2) /* returned by get_win_ptr on the desktop window */
|
|
--
|
|
2.37.2
|
|
|