From: Zebediah Figura Subject: [PATCH] msctf/tests: Fix some test failures on Windows 10. Message-Id: <20200116210422.7181-1-z.figura12@gmail.com> Date: Thu, 16 Jan 2020 15:04:22 -0600 Signed-off-by: Zebediah Figura --- dlls/msctf/tests/inputprocessor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591ea409..b9a225af588 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2405,6 +2405,7 @@ static void test_AssociateFocus(void) ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ test_CurrentFocus = FOCUS_SAVE; test_PrevFocus = FOCUS_SAVE; test_OnSetFocus = SINK_SAVE; @@ -2421,11 +2422,13 @@ static void test_AssociateFocus(void) ok(olddm == dm1, "incorrect old DocumentMgr returned\n"); ITfDocumentMgr_Release(olddm); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ test_OnSetFocus = SINK_IGNORE; /* OnSetFocus fires a couple of times on Win7 */ test_CurrentFocus = FOCUS_IGNORE; test_PrevFocus = FOCUS_IGNORE; SetFocus(wnd2); processPendingMessages(); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ SetFocus(wnd1); processPendingMessages(); test_OnSetFocus = SINK_UNEXPECTED; @@ -2433,6 +2436,7 @@ static void test_AssociateFocus(void) ITfDocumentMgr_Release(dm1); ITfDocumentMgr_Release(dm2); + test_OnPopContext = SINK_OPTIONAL; /* Win10 1709+ */ test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_OPTIONAL; @@ -2443,8 +2447,9 @@ static void test_AssociateFocus(void) test_CurrentFocus = FOCUS_IGNORE; test_PrevFocus = FOCUS_IGNORE; DestroyWindow(wnd1); + test_OnPopContext = SINK_OPTIONAL; /* Win10 1709+ */ DestroyWindow(wnd2); - test_OnPopContext = SINK_OPTIONAL; /* Vista and greater */ + test_OnPopContext = SINK_IGNORE; /* Vista+, twice Win10 1709+ */ test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus); test_CurrentFocus = NULL; -- 2.24.1