(retry) msctf/tests: handle an occassional unexpected SetFocus from wine

View: New views
1 Messages — Rating Filter:   Alert me  

(retry) msctf/tests: handle an occassional unexpected SetFocus from wine

by Aric Stewart :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

---
  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);