wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

user32-FlashWindowEx: Remove patch.

Browse Source 
This was fixed upstream by d4b2865eb7f2612e52b3fee6ae121e59c2d28296.

Although some parts of the patch still apply and are orthogonal to the change, tests show they're not correct either.
This commit is contained in:
Elizabeth Figura
2025-10-01 15:44:21 -05:00
parent 1f7871a75c
commit 78a888cd3d
2 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,58 +0,0 @@
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.
---
dlls/user32/tests/win.c | 4 ++--
dlls/win32u/window.c | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index a345f5ea9e8..cd85a026672 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -10148,7 +10148,7 @@ static void test_FlashWindowEx(void)
SetLastError(0xdeadbeef);
ret = pFlashWindowEx(&finfo);
- todo_wine ok(!ret, "previous window state should not be active\n");
+ ok(!ret, "previous window state should not be active\n");
finfo.cbSize = sizeof(FLASHWINFO) - 1;
SetLastError(0xdeadbeef);
@@ -10199,7 +10199,7 @@ static void test_FlashWindowEx(void)
finfo.dwFlags = FLASHW_STOP;
SetLastError(0xdeadbeef);
ret = pFlashWindowEx(&finfo);
- ok(prev != ret, "previous window state should be different\n");
+ todo_wine ok(prev != ret, "previous window state should be different\n");
DestroyWindow( hwnd );
}
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 3b3a3ba5eac..9073d287564 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -4874,8 +4874,7 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info )
if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE;
hwnd = win->handle; /* make it a full handle */
- if (info->dwFlags) wparam = !(win->flags & WIN_NCACTIVATED);
- else wparam = (hwnd == NtUserGetForegroundWindow());
+ wparam = (win->flags & WIN_NCACTIVATED) != 0;
release_win_ptr( win );
@@ -4883,7 +4882,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;
}
}
--
2.47.2

1
patches/user32-FlashWindowEx/definition
View File

@@ -1 +0,0 @@
Fixes: [43124] FlashWindowEx: WM_NCACTIVATE behavior is incorrect