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

25bfe9df · Aric Stewart · Alexandre Julliard · 511c76df · 25bfe9df
Commit 25bfe9df authored Nov 07, 2009 by Aric Stewart Committed by Alexandre Julliard Nov 10, 2009
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

inputprocessor.c dlls/msctf/tests/inputprocessor.c +5 -2

No files found.
--- 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);