Frédéric Delanoy : ieframe/tests: Use todo_wine_if() in tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0d6ed1b6679d32849b8cbb7e219ea7d63bf2cfbb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0d6ed1b6679d32849b8cbb7e21...

Author: Frédéric Delanoy 
Date:   Wed Feb 17 21:13:30 2016 +0100

ieframe/tests: Use todo_wine_if() in tests.

Signed-off-by: Frédéric Delanoy 
Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard

---

dlls/ieframe/tests/intshcut.c   | 5 +----
 dlls/ieframe/tests/webbrowser.c | 9 ++-------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c
index 2a5f2df..0959a61 100644
--- a/dlls/ieframe/tests/intshcut.c
+++ b/dlls/ieframe/tests/intshcut.c
@@ -147,10 +147,7 @@ static void _check_string_transform(unsigned line, IUniformResourceLocatorA *url
     output = (void*)0xdeadbeef;
     hr = urlA->lpVtbl->GetURL(urlA, &output);
     if(expectedOutput) {
-        if(is_todo) {
-            todo_wine
-            ok_(__FILE__,line)(hr == S_OK, "GetUrl failed, hr=0x%x\n", hr);
-        }else {
+        todo_wine_if(is_todo) {
             ok_(__FILE__,line)(hr == S_OK, "GetUrl failed, hr=0x%x\n", hr);
         }
         todo_wine
diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c
index 3201499..032faef 100644
--- a/dlls/ieframe/tests/webbrowser.c
+++ b/dlls/ieframe/tests/webbrowser.c
@@ -2806,10 +2806,7 @@ static void test_QueryStatusWB(IWebBrowser2 *webbrowser, BOOL has_document)
     if (use_container_olecmd) SET_EXPECT(QueryStatus_STOP);
     hres = IWebBrowser2_QueryStatusWB(webbrowser, OLECMDID_STOP, &status);
     ok(hres == success_state, "QueryStatusWB failed: %08x %08x\n", hres, success_state);
-    if (!use_container_olecmd && has_document)
-        todo_wine ok((has_document && status == success_flags) || (!has_document && status == 0xdeadbeef),
-                     "OLECMDID_STOP not enabled/supported: %08x %08x\n", status, success_flags);
-    else
+    todo_wine_if (!use_container_olecmd && has_document)
         ok((has_document && status == success_flags) || (!has_document && status == 0xdeadbeef),
            "OLECMDID_STOP not enabled/supported: %08x %08x\n", status, success_flags);
     status = 0xdeadbeef;
@@ -3312,9 +3309,7 @@ static void test_UIActivate(IWebBrowser2 *unk, BOOL activate)
         }

hres = IOleDocumentView_UIActivate(docview, activate);
-        if(activate)
-            todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres);
-        else
+        todo_wine_if(activate)
             ok(hres == S_OK, "Got 0x%08x\n", hres);

if(activate) {