From 25bfe9df49c8ba1cad7e13693f42d83295d160a9 Mon Sep 17 00:00:00 2001 From: Aric Stewart Date: Sat, 7 Nov 2009 09:52:09 -0600 Subject: [PATCH] msctf/tests: Handle an occasional unexpected SetFocus from wine. --- dlls/msctf/tests/inputprocessor.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index edf5cc0327f..f4f737ffc00 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1997,11 +1997,14 @@ static void test_AssociateFocus(void) test_CurrentFocus = dm2; test_PrevFocus = dm1; - test_OnSetFocus = SINK_EXPECTED; + test_OnSetFocus = SINK_OPTIONAL; /* wine and Winxp */ ShowWindow(wnd2,SW_SHOWNORMAL); SetFocus(wnd2); - processPendingMessages(); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + test_CurrentFocus = FOCUS_IGNORE; /* occasional wine race */ + test_PrevFocus = FOCUS_IGNORE; /* occasional wine race */ + test_OnSetFocus = SINK_IGNORE; /* occasional wine race */ + processPendingMessages(); ShowWindow(wnd3,SW_SHOWNORMAL); SetFocus(wnd3); -- 2.11.4.GIT