Ge van Geldorp : comctl32/tests: Adjust message sequences for Win7 ( monthcal).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bc76560b56c7a4ed176f71a32fb9af73a7de8af3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bc76560b56c7a4ed176f71a32f...

Author: Ge van Geldorp <ggeldorp(a)vmware.com>
Date:   Mon Aug 31 09:13:53 2009 +0200

comctl32/tests: Adjust message sequences for Win7 (monthcal).

---

 dlls/comctl32/tests/monthcal.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c
index 1ca1997..5f8e09e 100644
--- a/dlls/comctl32/tests/monthcal.c
+++ b/dlls/comctl32/tests/monthcal.c
@@ -56,7 +56,7 @@ static const struct message create_parent_window_seq[] = {
     { WM_WINDOWPOSCHANGING, sent|wparam|optional, 0 },
     { WM_WINDOWPOSCHANGED, sent|optional },
     { WM_ACTIVATEAPP, sent|wparam, 1 },
-    { WM_NCACTIVATE, sent|wparam, 1 },
+    { WM_NCACTIVATE, sent },
     { WM_ACTIVATE, sent|wparam, 1 },
     { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 },
     { WM_IME_NOTIFY, sent|defwinproc|optional },
@@ -299,12 +299,14 @@ static const struct message destroy_parent_seq[] = {
     { 0x0090, sent|optional }, /* Vista */
     { WM_WINDOWPOSCHANGING, sent|wparam, 0},
     { WM_WINDOWPOSCHANGED, sent|wparam, 0},
-    { WM_NCACTIVATE, sent|wparam, 0},
-    { WM_ACTIVATE, sent|wparam, 0},
+    { WM_IME_SETCONTEXT, sent|wparam|optional, 0},
+    { WM_IME_NOTIFY, sent|wparam|lparam|defwinproc|optional, 1, 0},
+    { WM_NCACTIVATE, sent|wparam|optional, 0},
+    { WM_ACTIVATE, sent|wparam|optional, 0},
     { WM_NCACTIVATE, sent|wparam|lparam|optional, 0, 0},
     { WM_ACTIVATE, sent|wparam|lparam|optional, 0, 0},
-    { WM_ACTIVATEAPP, sent|wparam, 0},
-    { WM_KILLFOCUS, sent|wparam|lparam, 0, 0},
+    { WM_ACTIVATEAPP, sent|wparam|optional, 0},
+    { WM_KILLFOCUS, sent|wparam|lparam|optional, 0, 0},
     { WM_IME_SETCONTEXT, sent|wparam|optional, 0},
     { WM_IME_NOTIFY, sent|wparam|lparam|defwinproc|optional, 1, 0},
     { WM_DESTROY, sent|wparam|lparam, 0, 0},