From fff59d624e2b3d647726f7c16a242014641d431d Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Fri, 15 Apr 2022 19:45:39 -0500
Subject: [PATCH] user32-Mouse_Message_Hwnd: Delete a stray spacing change.

---
 patches/patchinstall.sh                       |  3 +--
 ...r-to-find-a-target-for-mouse-message.patch | 21 ++++---------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 630cbf44..d658b1ca 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -3235,8 +3235,7 @@ fi
 # |   *	[#9512] Make sure popups don't block access to objects underneath in DVDPro
 # |
 # | Modified files:
-# |   *	dlls/user32/message.c, dlls/user32/tests/input.c, dlls/win32u/message.c, dlls/winex11.drv/bitblt.c, server/protocol.def,
-# | 	server/window.c
+# |   *	dlls/user32/tests/input.c, dlls/win32u/message.c, dlls/winex11.drv/bitblt.c, server/protocol.def, server/window.c
 # |
 if test "$enable_user32_Mouse_Message_Hwnd" -eq 1; then
 	patch_apply user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch
diff --git a/patches/user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch b/patches/user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch
index 2d676a21..499b6671 100644
--- a/patches/user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch
+++ b/patches/user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch
@@ -1,26 +1,13 @@
-From 7e23fd15f7cd8f4a3d59342c2489243b4f79d1fa Mon Sep 17 00:00:00 2001
+From cb9f379e0eef9b7f1a150633e200864cc1ded33f Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@codeweavers.com>
 Date: Tue, 25 Nov 2014 20:31:58 +0100
 Subject: [PATCH] user32: Try harder to find a target for mouse messages
 
 ---
- dlls/user32/message.c     | 1 -
  dlls/user32/tests/input.c | 4 ++--
  dlls/win32u/message.c     | 2 +-
- 3 files changed, 3 insertions(+), 4 deletions(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/dlls/user32/message.c b/dlls/user32/message.c
-index 9170e919292..ed72fb81fe0 100644
---- a/dlls/user32/message.c
-+++ b/dlls/user32/message.c
-@@ -592,7 +592,6 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d
-     return TRUE;
- }
- 
--
- /***********************************************************************
-  *		SendMessageTimeoutW  (USER32.@)
-  */
 diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
 index 14641591bff..2bef3437109 100644
 --- a/dlls/user32/tests/input.c
@@ -37,10 +24,10 @@ index 14641591bff..2bef3437109 100644
  
      /* click on HTTRANSPARENT top-level window that belongs to other thread */
 diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
-index 9479595ae53..d602a7f3974 100644
+index 644e91aed4f..4cb65eec36a 100644
 --- a/dlls/win32u/message.c
 +++ b/dlls/win32u/message.c
-@@ -1401,7 +1401,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H
+@@ -1402,7 +1402,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H
      {
          HWND orig = msg->hwnd;