wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 330dc601978922aa1d5864d29d94882d6b1990d1.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-03-12 11:27:46 +11:00
parent 0e1d830578
commit f077cbe2d3
28 changed files with 467 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,19 @@
From ac625fd640ad8d9d48765979370e635b77a580ec Mon Sep 17 00:00:00 2001
From a295be388db4bbe50867b295d09a57726321261c 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 | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
dlls/user32/win.c | 1 -
dlls/win32u/window.c | 5 ++---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 29fdc56ecca..49e5b824806 100644
index 496c3f9ab07..2718d4c96c9 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -9820,7 +9820,7 @@ static void test_FlashWindowEx(void)
@@ -9825,7 +9825,7 @@ static void test_FlashWindowEx(void)
SetLastError(0xdeadbeef);
ret = pFlashWindowEx(&finfo);
@ -21,7 +22,7 @@ index 29fdc56ecca..49e5b824806 100644
finfo.cbSize = sizeof(FLASHWINFO) - 1;
SetLastError(0xdeadbeef);
@@ -9871,7 +9871,7 @@ static void test_FlashWindowEx(void)
@@ -9876,7 +9876,7 @@ static void test_FlashWindowEx(void)
finfo.dwFlags = FLASHW_STOP;
SetLastError(0xdeadbeef);
ret = pFlashWindowEx(&finfo);
@ -30,26 +31,26 @@ index 29fdc56ecca..49e5b824806 100644
DestroyWindow( hwnd );
}
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 1a037297ac1..b79e942ee46 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -3842,13 +3842,12 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo )
if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE;
hwnd = wndPtr->obj.handle; /* make it a full handle */
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 1e36e48aded..fd4be68084b 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -1862,13 +1862,12 @@ 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 */
- if (pfinfo->dwFlags) wparam = !(wndPtr->flags & WIN_NCACTIVATED);
- if (info->dwFlags) wparam = !(win->flags & WIN_NCACTIVATED);
- else wparam = (hwnd == NtUserGetForegroundWindow());
+ wparam = (wndPtr->flags & WIN_NCACTIVATED) != 0;
+ wparam = (win->flags & WIN_NCACTIVATED) != 0;
WIN_ReleasePtr( wndPtr );
SendMessageW( hwnd, WM_NCACTIVATE, wparam, 0 );
USER_Driver->pFlashWindowEx( pfinfo );
release_win_ptr( win );
send_message( hwnd, WM_NCACTIVATE, wparam, 0 );
user_driver->pFlashWindowEx( info );
- return wparam;
+ return (pfinfo->dwFlags & FLASHW_CAPTION) ? TRUE : wparam;
+ return (info->dwFlags & FLASHW_CAPTION) ? TRUE : wparam;
}
}
--
2.34.1
2.35.1