Rebase against fca833678f3b2588cc539d04693e7f9d8bca3278.

patches/user32-FlashWindowEx/0001-user32-Improve-FlashWindowEx-message-and-return-valu.patch

@@ -1,19 +1,18 @@
-From a295be388db4bbe50867b295d09a57726321261c Mon Sep 17 00:00:00 2001
+From 04c565bea63d13790703f4823b6719d45e376076 Mon Sep 17 00:00:00 2001
 From: James Coonradt <gamax92@aol.com>
 Date: Tue, 19 Sep 2017 12:28:50 -0600
 Subject: [PATCH] user32: Improve FlashWindowEx message and return value.
 
 ---
  dlls/user32/tests/win.c | 4 ++--
- dlls/user32/win.c       | 1 -
  dlls/win32u/window.c    | 5 ++---
- 3 files changed, 4 insertions(+), 6 deletions(-)
+ 2 files changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
-index 496c3f9ab07..2718d4c96c9 100644
+index 8464a9f02d8..f2cedc30980 100644
 --- a/dlls/user32/tests/win.c
 +++ b/dlls/user32/tests/win.c
-@@ -9825,7 +9825,7 @@ static void test_FlashWindowEx(void)
+@@ -9851,7 +9851,7 @@ static void test_FlashWindowEx(void)
  
      SetLastError(0xdeadbeef);
      ret = pFlashWindowEx(&finfo);
@@ -22,7 +21,7 @@ index 496c3f9ab07..2718d4c96c9 100644
  
      finfo.cbSize = sizeof(FLASHWINFO) - 1;
      SetLastError(0xdeadbeef);
-@@ -9876,7 +9876,7 @@ static void test_FlashWindowEx(void)
+@@ -9902,7 +9902,7 @@ static void test_FlashWindowEx(void)
      finfo.dwFlags = FLASHW_STOP;
      SetLastError(0xdeadbeef);
      ret = pFlashWindowEx(&finfo);
@@ -32,10 +31,10 @@ index 496c3f9ab07..2718d4c96c9 100644
      DestroyWindow( hwnd );
  }
 diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
-index 1e36e48aded..fd4be68084b 100644
+index f008735f2e3..e8245684b0c 100644
 --- a/dlls/win32u/window.c
 +++ b/dlls/win32u/window.c
-@@ -1862,13 +1862,12 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info )
+@@ -4532,8 +4532,7 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info )
          if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE;
          hwnd = win->obj.handle;  /* make it a full handle */
  
@@ -44,7 +43,10 @@ index 1e36e48aded..fd4be68084b 100644
 +        wparam = (win->flags & WIN_NCACTIVATED) != 0;
  
          release_win_ptr( win );
-         send_message( hwnd, WM_NCACTIVATE, wparam, 0 );
+ 
+@@ -4541,7 +4540,7 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info )
+             send_message( hwnd, WM_NCACTIVATE, wparam, 0 );
+ 
          user_driver->pFlashWindowEx( info );
 -        return wparam;
 +        return (info->dwFlags & FLASHW_CAPTION) ? TRUE : wparam;
@@ -52,5 +54,5 @@ index 1e36e48aded..fd4be68084b 100644
  }
  
 -- 
-2.35.1
+2.40.1
 

staging/upstream-commit

@@ -1 +1 @@
-98b73b5c32fa82218081f0e7668f9836ffe1b55d
+fca833678f3b2588cc539d04693e7f9d8bca3278