From e893644049af3d1dbfdbbcac556e0019df48b48a Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 17 Aug 2022 08:24:50 +1000
Subject: [PATCH] Rebase against 4608e1e1257a377cd554a0e885368e3feb7d286f.

---
 patches/patchinstall.sh                                   | 2 +-
 ...32-focus-Prevent-a-recursive-loop-with-the-activ.patch | 8 ++++----
 staging/upstream-commit                                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 01e4ca27..d88baba4 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "b4a5556da983c7ebc8a25b228100c08947024c59"
+	echo "4608e1e1257a377cd554a0e885368e3feb7d286f"
 }
 
 # Show version information
diff --git a/patches/user32-recursive-activation/0001-user32-focus-Prevent-a-recursive-loop-with-the-activ.patch b/patches/user32-recursive-activation/0001-user32-focus-Prevent-a-recursive-loop-with-the-activ.patch
index 33e5b6b8..c13476a5 100644
--- a/patches/user32-recursive-activation/0001-user32-focus-Prevent-a-recursive-loop-with-the-activ.patch
+++ b/patches/user32-recursive-activation/0001-user32-focus-Prevent-a-recursive-loop-with-the-activ.patch
@@ -1,4 +1,4 @@
-From 0845b0fa1713fbab8494e7709c78b771db111286 Mon Sep 17 00:00:00 2001
+From 757ca470261e45e8c3133ee0bb64e76198f6c02f 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
@@ -34,7 +34,7 @@ index 63388e2250e..6ddac9cc7d3 100644
  
      if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE)
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index bc5266d038f..e77875c3745 100644
+index a2d1af57f78..8b1cae060e2 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
 @@ -1569,7 +1569,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
@@ -53,7 +53,7 @@ index bc5266d038f..e77875c3745 100644
 -    /* call CBT hook chain */
 -    cbt.fMouse     = mouse;
 -    cbt.hWndActive = previous;
--    if (call_hooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt )) return FALSE;
+-    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 */
@@ -68,7 +68,7 @@ index bc5266d038f..e77875c3745 100644
 +        /* call CBT hook chain */
 +        cbt.fMouse     = mouse;
 +        cbt.hWndActive = previous;
-+        if (call_hooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt ))
++        if (call_hooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, sizeof(cbt) ))
 +            goto clear_flags;
 +
 +        if (is_window(previous))
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 48f87da2..58d772f3 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-b4a5556da983c7ebc8a25b228100c08947024c59
+4608e1e1257a377cd554a0e885368e3feb7d286f