Module: wine Branch: master Commit: 0b49495b8ed9e725b47b7ca791312a2a3c3e3c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b49495b8ed9e725b47b7ca791...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Aug 4 23:46:30 2016 +0200
urlmon/tests: Make use of todo_wine_if().
Signed-off-by: Michael Stefaniuc mstefani@redhat.de Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/urlmon/tests/protocol.c | 4 +--- dlls/urlmon/tests/url.c | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a55db96..dad87ed 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -2574,9 +2574,7 @@ static void test_file_protocol_url(LPCWSTR url) hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - if(file_with_hash) /* FIXME: An effect of UnlockRequest call? */ - todo_wine ok(hres == S_OK, "Read failed: %08x\n", hres); - else + todo_wine_if(file_with_hash) /* FIXME: An effect of UnlockRequest call? */ ok(hres == S_OK, "Read failed: %08x\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); ok(hres == S_OK, "Terminate failed: %08x\n", hres); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ad27c3d..4fa11c7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3087,14 +3087,10 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(!no_callback) { CLEAR_CALLED(QueryInterface_IBindStatusCallbackEx); /* IE 8 */ CHECK_CALLED(GetBindInfo); - if(abort_start) - todo_wine CHECK_CALLED(QueryInterface_IInternetProtocol); - else + todo_wine_if(abort_start) CHECK_CALLED(QueryInterface_IInternetProtocol); if(!emulate_protocol) { - if(abort_start) - todo_wine CHECK_CALLED(QueryService_IInternetProtocol); - else + todo_wine_if(abort_start) CHECK_CALLED(QueryService_IInternetProtocol); } CHECK_CALLED(OnStartBinding);