[PATCH 25/27] user32/tests: Fix test_layered_window() message sequences to support WinEvents.
Connor McAdams
cmcadams at codeweavers.com
Tue Aug 17 11:11:40 CDT 2021
Signed-off-by: Connor McAdams <cmcadams at codeweavers.com>
---
dlls/user32/tests/msg.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 2305fab4c07..b206ac919af 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -17755,6 +17755,11 @@ static const struct message WmSetLayeredStyle2[] = {
{ 0 }
};
+static const struct message WmLayeredWinEmptySeq[] = {
+ { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 },
+ { 0 }
+};
+
struct layered_window_info
{
HWND hwnd;
@@ -17823,7 +17828,7 @@ static void test_layered_window(void)
ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE );
ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() );
- ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE );
+ ok_sequence( WmLayeredWinEmptySeq, "UpdateLayeredWindow", FALSE );
GetWindowRect( hwnd, &rect );
ok( rect.left == 300 && rect.top == 300 && rect.right == 550 && rect.bottom == 550,
"wrong window rect %s\n", wine_dbgstr_rect( &rect ));
@@ -17835,7 +17840,7 @@ static void test_layered_window(void)
pos.y = 200;
ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE );
ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() );
- ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE );
+ ok_sequence( WmLayeredWinEmptySeq, "UpdateLayeredWindow", FALSE );
GetWindowRect( hwnd, &rect );
ok( rect.left == 300 && rect.top == 200 && rect.right == 450 && rect.bottom == 450,
"wrong window rect %s\n", wine_dbgstr_rect( &rect ));
@@ -17851,7 +17856,7 @@ static void test_layered_window(void)
pos.x = 200;
ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE );
ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() );
- ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE );
+ ok_sequence( WmLayeredWinEmptySeq, "UpdateLayeredWindow", FALSE );
GetWindowRect( hwnd, &rect );
ok( rect.left == 200 && rect.top == 200 && rect.right == 400 && rect.bottom == 450,
"wrong window rect %s\n", wine_dbgstr_rect( &rect ));
@@ -18603,6 +18608,7 @@ START_TEST(msg)
test_clipboard_viewers();
test_keyflags();
test_hotkey();
+ test_layered_window();
/* Fix message sequences before removing 4 lines below */
if (pUnhookWinEvent && hEvent_hook)
@@ -18613,7 +18619,6 @@ START_TEST(msg)
}
hEvent_hook = 0;
- test_layered_window();
test_TrackPopupMenu();
test_TrackPopupMenuEmpty();
test_DoubleSetCapture();
--
2.25.1
More information about the wine-devel
mailing list