Aric Stewart : msctf/tests: Correct wine_todo handling in sinks.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 017c84e75ec26135956f1e228845bdc19a8a1689
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=017c84e75ec26135956f1e2288...

Author: Aric Stewart 
Date:   Wed Sep  9 13:33:23 2009 -0500

msctf/tests: Correct wine_todo handling in sinks.

---

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

diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c
index 591deff..815dbbb 100644
--- a/dlls/msctf/tests/inputprocessor.c
+++ b/dlls/msctf/tests/inputprocessor.c
@@ -106,10 +106,10 @@ static inline void _sink_fire_ok(INT *sink, const CHAR* name)
             winetest_trace("Ignoring %s\n",name);
             return;
         default:
-            if (todo) todo_wine
-            {
+            if (todo)
+                todo_wine winetest_ok(0, "Unexpected %s sink\n",name);
+            else
                 winetest_ok(0, "Unexpected %s sink\n",name);
-            }
     }
     *sink = SINK_FIRED;
 }
@@ -1121,8 +1121,10 @@ static void test_KeystrokeMgr(void)
     tfpk.uVKey = 'A';
     tfpk.uModifiers = TF_MOD_SHIFT;

+    test_KEV_OnSetFocus = SINK_EXPECTED;
     hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,tid,sink,TRUE);
     ok(SUCCEEDED(hr),"ITfKeystrokeMgr_AdviseKeyEventSink failed\n");
+    sink_check_ok(&test_KEV_OnSetFocus,"KeyEventSink_OnSetFocus");
     hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,tid,sink,TRUE);
     ok(hr == CONNECT_E_ADVISELIMIT,"Wrong return, expected CONNECT_E_ADVISELIMIT\n");
     hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,cid,sink,TRUE);