[PATCH 0/1] MR1909: comctl32/tests: Ignore some IME messages in monthcal tests.

[Nikolay Sivov (＠nsivov)]

Should fix test failures on some systems with enabled IME.

[PATCH 1/1] comctl32/tests: Ignore some IME messages in monthcal tests.

[Nikolay Sivov]

From: Nikolay Sivov

---
 dlls/comctl32/tests/monthcal.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c
index 8b01173e86e..58060e66e35 100644
--- a/dlls/comctl32/tests/monthcal.c
+++ b/dlls/comctl32/tests/monthcal.c
@@ -71,8 +71,6 @@ static const struct message create_parent_window_seq[] = {
     { WM_ACTIVATEAPP, 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 },
     { WM_SETFOCUS, sent|wparam|defwinproc, 0 },
     /* Win9x adds SWP_NOZORDER below */
     { WM_WINDOWPOSCHANGED, sent, /*|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ },
@@ -517,7 +515,9 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
         message != WM_NCHITTEST &&
         message != WM_GETTEXT &&
         message != WM_GETICON &&
-        message != WM_DEVICECHANGE)
+        message != WM_DEVICECHANGE &&
+        message != WM_IME_SETCONTEXT &&
+        message != WM_IME_NOTIFY)
     {
         msg.message = message;
         msg.flags = sent|wparam|lparam;

[PATCH 0/1] MR1909: comctl32/tests: Ignore some IME messages in monthcal tests. - approved

[Zhiyi Zhang (＠zhiyi)]

This merge request was approved by Zhiyi Zhang.