Anatoly Lyutin : user32/tests: Fix test for switch maximized MDI children.
Alexandre Julliard
julliard at winehq.org
Mon Sep 24 08:07:58 CDT 2007
Module: wine
Branch: master
Commit: 6858ce73b6e8ef0432e62f2973d5c598fef2e8b1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6858ce73b6e8ef0432e62f2973d5c598fef2e8b1
Author: Anatoly Lyutin <vostok at etersoft.ru>
Date: Fri Sep 21 18:37:46 2007 +0400
user32/tests: Fix test for switch maximized MDI children.
---
dlls/user32/tests/msg.c | 118 +++++++++++++++++++++++------------------------
1 files changed, 57 insertions(+), 61 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 188551c..4a25204 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -253,25 +253,19 @@ static const struct message WmSwitchChild[] = {
{ WM_SIZE, sent|defwinproc|optional },/* in the 2nd MDI child */
/* Redraw 2nd MDI child */
{ WM_SETREDRAW, sent|defwinproc|optional },/* in the 2nd MDI child */
- { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_FRAMECHANGED|SWP_NOMOVE },/* in the 1st MDI child */
- { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 },/* in the 1st MDI child */
- { WM_WINDOWPOSCHANGED, sent|defwinproc|optional},/* in the 1st MDI child */
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_FRAMECHANGED|SWP_NOMOVE },/* in the MDI frame */
{ WM_NCCALCSIZE, sent|wparam, 1 },/* in the MDI frame */
{ WM_WINDOWPOSCHANGED, sent},/* in the MDI frame */
{ WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE },/* in the 1st MDI child */
- { WM_NCACTIVATE, sent|defwinproc|optional },/* in the 1st MDI child */
+ { WM_NCACTIVATE, sent|wparam|defwinproc|optional, 1 },/* in the 1st MDI child */
{ WM_SETVISIBLE, hook },
- { WM_KILLFOCUS, sent|defwinproc|optional },/* in the 2nd MDI child */
+ { WM_KILLFOCUS, sent|defwinproc|optional }, /* in the 2nd MDI child */
{ WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */
{ WM_IME_SETCONTEXT, sent|wparam|optional, 1 },
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 },
{ WM_SETFOCUS, sent },/* in the MDI client */
- { WM_SETVISIBLE, hook},
+ { WM_SETVISIBLE, hook },
{ WM_KILLFOCUS, sent },/* in the MDI client */
- { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */
- { WM_IME_SETCONTEXT, sent|wparam|optional, 1 },
- { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 },
{ WM_SETFOCUS, sent|defwinproc|optional },/* in the 1st MDI child */
{ WM_MDIACTIVATE, sent|defwinproc|optional },/* in the 1st MDI child */
{ WM_WINDOWPOSCHANGED, sent },/* in the 1st MDI child */
@@ -3191,6 +3185,60 @@ static void test_mdi_messages(void)
flush_sequence();
/* end of test for maximized MDI children */
+ SetFocus(0);
+ flush_sequence();
+ trace("creating maximized visible MDI child window 1(Switch test)\n");
+ mdi_child = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child",
+ WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE,
+ 0, 0, CW_USEDEFAULT, CW_USEDEFAULT,
+ mdi_client, 0, GetModuleHandleA(0), NULL);
+ assert(mdi_child);
+ ok_sequence(WmCreateMDIchildVisibleMaxSeq1, "Create maximized visible 1st MDI child window(Switch test)", TRUE);
+ ok(IsZoomed(mdi_child), "1st MDI child should be maximized(Switch test)\n");
+
+ ok(GetActiveWindow() == mdi_frame, "wrong active window %p(Switch test)\n", GetActiveWindow());
+ ok(GetFocus() == mdi_child || /* win2k */
+ GetFocus() == 0, /* win9x */
+ "wrong focus window %p(Switch test)\n", GetFocus());
+
+ active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed);
+ ok(active_child == mdi_child, "wrong active MDI child %p(Switch test)\n", active_child);
+ ok(zoomed, "wrong zoomed state %d(Switch test)\n", zoomed);
+ flush_sequence();
+
+ trace("creating maximized visible MDI child window 2(Switch test)\n");
+ mdi_child2 = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child",
+ WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE,
+ 0, 0, CW_USEDEFAULT, CW_USEDEFAULT,
+ mdi_client, 0, GetModuleHandleA(0), NULL);
+ assert(mdi_child2);
+ ok_sequence(WmCreateMDIchildVisibleMaxSeq2, "Create maximized visible 2nd MDI child window(Switch test)\n", TRUE);
+
+ ok(IsZoomed(mdi_child2), "2nd MDI child should be maximized(Switch test)\n");
+ ok(!IsZoomed(mdi_child), "1st MDI child should NOT be maximized(Switch test)\n");
+
+ ok(GetActiveWindow() == mdi_frame, "wrong active window %p(Switch test)\n", GetActiveWindow());
+ ok(GetFocus() == mdi_child2, "wrong focus window %p(Switch test)\n", GetFocus());
+
+ active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed);
+ ok(active_child == mdi_child2, "wrong active MDI child %p(Switch test)\n", active_child);
+ ok(zoomed, "wrong zoomed state %d(Switch test)\n", zoomed);
+ flush_sequence();
+
+ trace("Switch child window.\n");
+ SendMessageA(mdi_client, WM_MDIACTIVATE, (WPARAM)mdi_child, 0);
+ ok_sequence(WmSwitchChild,"Child not switch correctly\n",TRUE);
+ trace("end of test for switch maximized MDI children\n");
+
+ SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0);
+ flush_sequence();
+
+ SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child2, 0);
+ flush_sequence();
+
+ SetFocus(0);
+ flush_sequence();
+ /* end of test for switch maximized MDI children */
mdi_cs.szClass = "MDI_child_Class";
mdi_cs.szTitle = "MDI child";
@@ -3263,58 +3311,6 @@ static void test_mdi_messages(void)
/* end of test for maximization of MDI child with invisible parent */
- /* test for switch maximized MDI children */
- trace("creating maximized visible MDI child window 1(Switch test)\n");
- mdi_child = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child",
- WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE,
- 0, 0, CW_USEDEFAULT, CW_USEDEFAULT,
- mdi_client, 0, GetModuleHandleA(0), NULL);
- assert(mdi_child);
- ok_sequence(WmCreateMDIchildVisibleMaxSeq1, "Create maximized visible 1st MDI child window(Switch test)", TRUE);
- ok(IsZoomed(mdi_child), "1st MDI child should be maximized(Switch test)\n");
-
- ok(GetActiveWindow() == mdi_frame, "wrong active window %p(Switch test)\n", GetActiveWindow());
- ok(GetFocus() == mdi_child || /* win2k */
- GetFocus() == 0, /* win9x */
- "wrong focus window %p(Switch test)\n", GetFocus());
-
- active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed);
- ok(active_child == mdi_child, "wrong active MDI child %p(Switch test)\n", active_child);
- ok(zoomed, "wrong zoomed state %d(Switch test)\n", zoomed);
- flush_sequence();
-
- trace("creating maximized visible MDI child window 2(Switch test)\n");
- mdi_child2 = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child",
- WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE,
- 0, 0, CW_USEDEFAULT, CW_USEDEFAULT,
- mdi_client, 0, GetModuleHandleA(0), NULL);
- assert(mdi_child2);
- ok_sequence(WmCreateMDIchildVisibleMaxSeq2, "Create maximized visible 2nd MDI child 2 window(Switch test)\n", TRUE);
- ok(IsZoomed(mdi_child2), "2nd MDI child should be maximized(Switch test)\n");
- ok(!IsZoomed(mdi_child), "1st MDI child should NOT be maximized(Switch test)\n");
-
- ok(GetActiveWindow() == mdi_frame, "wrong active window %p(Switch test)\n", GetActiveWindow());
- ok(GetFocus() == mdi_child2, "wrong focus window %p(Switch test)\n", GetFocus());
-
- active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed);
- ok(active_child == mdi_child2, "wrong active MDI child %p(Switch test)\n", active_child);
- ok(zoomed, "wrong zoomed state %d(Switch test)\n", zoomed);
- flush_sequence();
-
- trace("Switch child window.\n");
- SendMessageA(mdi_client, WM_MDIACTIVATE, (WPARAM)mdi_child, 0);
- ok_sequence(WmSwitchChild,"Child not switch correctly\n",TRUE);
-
- trace("end of test for switch maximized MDI children\n");
-
- SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0);
- flush_sequence();
-
- SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child2, 0);
- flush_sequence();
-
- /* end of test for switch maximized MDI children */
-
DestroyWindow(mdi_client);
ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE);
More information about the wine-cvs
mailing list