Jacek Caban : urlmon: Fixed protocol tests.
Alexandre Julliard
julliard at winehq.org
Mon Dec 24 14:21:35 CST 2007
Module: wine
Branch: master
Commit: 0d869d539fe67166f27e42ba688f59742bcd1529
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d869d539fe67166f27e42ba688f59742bcd1529
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Dec 24 12:41:57 2007 +0100
urlmon: Fixed protocol tests.
---
dlls/urlmon/bindprot.c | 2 +-
dlls/urlmon/tests/protocol.c | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c
index 13a3b0a..c2033fc 100644
--- a/dlls/urlmon/bindprot.c
+++ b/dlls/urlmon/bindprot.c
@@ -443,7 +443,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *ifa
TRACE("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax);
- return S_OK;
+ return IInternetProtocolSink_ReportData(This->protocol_sink, grfBSCF, ulProgress, ulProgressMax);
}
static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *iface,
diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c
index 00335b3..8c85ad5 100644
--- a/dlls/urlmon/tests/protocol.c
+++ b/dlls/urlmon/tests/protocol.c
@@ -393,8 +393,6 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface,
ok(szStatusText != NULL, "szStatusText == NULL\n");
if(szStatusText)
ok(!*szStatusText, "wrong szStatusText\n");
- }else {
- ok(szStatusText == NULL, "szStatusText != NULL\n");
}
break;
case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE:
@@ -460,7 +458,10 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR
}
SetEvent(event_complete);
}
+ }else {
+ CHECK_EXPECT(ReportData);
}
+
return S_OK;
}
@@ -736,9 +737,11 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
"ReportProgress(BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE) failed: %08x\n", hres);
CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE);
+ SET_EXPECT(ReportData);
hres = IInternetProtocolSink_ReportData(pOIProtSink,
BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION, 13, 13);
ok(hres == S_OK, "ReportData failed: %08x\n", hres);
+ CHECK_CALLED(ReportData);
SET_EXPECT(ReportResult);
hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL);
More information about the wine-cvs
mailing list