Rebase against 09539a3af5f806bf319917cafff2b07e6480d656.

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

@@ -1,4 +1,4 @@
-From 04c565bea63d13790703f4823b6719d45e376076 Mon Sep 17 00:00:00 2001
+From d9259073ce85b42dec32716155e0f10e0f006030 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.
@@ -9,10 +9,10 @@ Subject: [PATCH] user32: Improve FlashWindowEx message and return value.
  2 files changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
-index 8464a9f02d8..f2cedc30980 100644
+index a345f5ea9e8..cd85a026672 100644
 --- a/dlls/user32/tests/win.c
 +++ b/dlls/user32/tests/win.c
-@@ -9851,7 +9851,7 @@ static void test_FlashWindowEx(void)
+@@ -10148,7 +10148,7 @@ static void test_FlashWindowEx(void)
  
      SetLastError(0xdeadbeef);
      ret = pFlashWindowEx(&finfo);
@@ -21,7 +21,7 @@ index 8464a9f02d8..f2cedc30980 100644
  
      finfo.cbSize = sizeof(FLASHWINFO) - 1;
      SetLastError(0xdeadbeef);
-@@ -9902,7 +9902,7 @@ static void test_FlashWindowEx(void)
+@@ -10199,7 +10199,7 @@ static void test_FlashWindowEx(void)
      finfo.dwFlags = FLASHW_STOP;
      SetLastError(0xdeadbeef);
      ret = pFlashWindowEx(&finfo);
@@ -31,12 +31,12 @@ index 8464a9f02d8..f2cedc30980 100644
      DestroyWindow( hwnd );
  }
 diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
-index f008735f2e3..e8245684b0c 100644
+index 3b3a3ba5eac..9073d287564 100644
 --- a/dlls/win32u/window.c
 +++ b/dlls/win32u/window.c
-@@ -4532,8 +4532,7 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info )
+@@ -4874,8 +4874,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 */
+         hwnd = win->handle;  /* make it a full handle */
  
 -        if (info->dwFlags) wparam = !(win->flags & WIN_NCACTIVATED);
 -        else wparam = (hwnd == NtUserGetForegroundWindow());
@@ -44,7 +44,7 @@ index f008735f2e3..e8245684b0c 100644
  
          release_win_ptr( win );
  
-@@ -4541,7 +4540,7 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info )
+@@ -4883,7 +4882,7 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info )
              send_message( hwnd, WM_NCACTIVATE, wparam, 0 );
  
          user_driver->pFlashWindowEx( info );
@@ -54,5 +54,5 @@ index f008735f2e3..e8245684b0c 100644
  }
  
 -- 
-2.40.1
+2.47.2
 

staging/upstream-commit

@@ -1 +1 @@
-f9741837a3bff3a912442695b4f7c3f5efbef557
+09539a3af5f806bf319917cafff2b07e6480d656