wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against e956c4ec71dd0f41090df3863e6f937963b2b7d9.

Browse Source
This commit is contained in:
Elizabeth Figura
2025-04-02 18:32:00 -05:00
parent e1b2c45272
commit 8924ee42d8
12 changed files with 47 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/user32-recursive-activation/0001-user32-focus-Prevent-a-recursive-loop-with-the-activ.patch
View File

@@ -1,4 +1,4 @@
From 8c830f61a85e634b1fc135f6fe90a1dd5e45d158 Mon Sep 17 00:00:00 2001
From 2f2480806c4c431aeb75308e570a317da43f3508 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
@@ -20,10 +20,10 @@ Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
2 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index cbdd4b195d3..241d07cefd2 100644
index a4834b740d8..123a0ff9a94 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -1810,7 +1810,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
@@ -1966,7 +1966,7 @@ BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus, DWORD new
{
HWND previous = get_active_window();
BOOL ret;
@@ -32,7 +32,7 @@ index cbdd4b195d3..241d07cefd2 100644
CBTACTIVATESTRUCT cbt;
if (previous == hwnd)
@@ -1819,16 +1819,24 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
@@ -1975,16 +1975,24 @@ BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus, DWORD new
goto done;
}
@@ -66,7 +66,7 @@ index cbdd4b195d3..241d07cefd2 100644
}
SERVER_START_REQ( set_active_window )
@@ -1848,7 +1856,11 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
@@ -2006,7 +2014,11 @@ BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus, DWORD new
if (send_message( hwnd, WM_QUERYNEWPALETTE, 0, 0 ))
send_message_timeout( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0,
SMTO_ABORTIFHUNG, 2000, FALSE );
@@ -79,7 +79,7 @@ index cbdd4b195d3..241d07cefd2 100644
}
old_thread = previous ? get_window_thread( previous, NULL ) : 0;
@@ -1880,7 +1892,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
@@ -2039,7 +2051,7 @@ BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus, DWORD new
}
}
@@ -88,7 +88,7 @@ index cbdd4b195d3..241d07cefd2 100644
{
send_message( hwnd, WM_NCACTIVATE, hwnd == NtUserGetForegroundWindow(), (LPARAM)previous );
send_message( hwnd, WM_ACTIVATE,
@@ -1914,9 +1926,13 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
@@ -2064,13 +2076,17 @@ BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus, DWORD new
}
}
@@ -96,7 +96,11 @@ index cbdd4b195d3..241d07cefd2 100644
+ win_set_flags(hwnd, 0, WIN_IS_IN_ACTIVATION);
+
done:
if (hwnd) clip_fullscreen_window( hwnd, FALSE );
if (hwnd)
{
if (hwnd == NtUserGetForegroundWindow()) user_driver->pActivateWindow( hwnd, previous );
clip_fullscreen_window( hwnd, FALSE );
}
- return TRUE;
+
+ return ret;
@@ -104,10 +108,10 @@ index cbdd4b195d3..241d07cefd2 100644
/**********************************************************************
diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h
index b39e38db5d6..4be55209265 100644
index 2f3bbdf91c0..74f5b07bd46 100644
--- a/dlls/win32u/ntuser_private.h
+++ b/dlls/win32u/ntuser_private.h
@@ -100,6 +100,7 @@ typedef struct tagWND
@@ -92,6 +92,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 */
@@ -116,5 +120,5 @@ index b39e38db5d6..4be55209265 100644
#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.40.1
2.47.2