Aric Stewart : msctf/tests: Handle an occasional unexpected SetFocus from wine.

[Alexandre Julliard]

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

Author: Aric Stewart <aric(a)codeweavers.com>
Date:   Sat Nov  7 09:52:09 2009 -0600

msctf/tests: Handle an occasional unexpected SetFocus from wine.

---

 dlls/msctf/tests/inputprocessor.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c
index edf5cc0..f4f737f 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);