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 5a66eab725423951860676aef49feeb3668eb20c.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-02-18 10:54:02 +11:00
parent 4b36169b46
commit dec87df6ec
11 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
From 6f9a7411f7e0f9db155818b15c3bb1dfba2bbbd3 Mon Sep 17 00:00:00 2001
From ac625fd640ad8d9d48765979370e635b77a580ec Mon Sep 17 00:00:00 2001
From: James Coonradt <gamax92@aol.com>
Date: Tue, 19 Sep 2017 12:28:50 -0600
Subject: user32: Improve FlashWindowEx message and return value.
Subject: [PATCH] user32: Improve FlashWindowEx message and return value.
---
dlls/user32/tests/win.c | 4 ++--
@@ -9,10 +9,10 @@ Subject: 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 9b8d16adc5f..ee923668995 100644
index 29fdc56ecca..49e5b824806 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -8314,7 +8314,7 @@ static void test_FlashWindowEx(void)
@@ -9820,7 +9820,7 @@ static void test_FlashWindowEx(void)
SetLastError(0xdeadbeef);
ret = pFlashWindowEx(&finfo);
@@ -21,7 +21,7 @@ index 9b8d16adc5f..ee923668995 100644
finfo.cbSize = sizeof(FLASHWINFO) - 1;
SetLastError(0xdeadbeef);
@@ -8365,7 +8365,7 @@ static void test_FlashWindowEx(void)
@@ -9871,7 +9871,7 @@ static void test_FlashWindowEx(void)
finfo.dwFlags = FLASHW_STOP;
SetLastError(0xdeadbeef);
ret = pFlashWindowEx(&finfo);
@@ -31,15 +31,15 @@ index 9b8d16adc5f..ee923668995 100644
DestroyWindow( hwnd );
}
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 3042a560ce9..2fb33058b6c 100644
index 1a037297ac1..b79e942ee46 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -3545,13 +3545,12 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo )
@@ -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 */
- if (pfinfo->dwFlags) wparam = !(wndPtr->flags & WIN_NCACTIVATED);
- else wparam = (hwnd == GetForegroundWindow());
- else wparam = (hwnd == NtUserGetForegroundWindow());
+ wparam = (wndPtr->flags & WIN_NCACTIVATED) != 0;
WIN_ReleasePtr( wndPtr );
@@ -51,5 +51,5 @@ index 3042a560ce9..2fb33058b6c 100644
}
--
2.14.1
2.34.1