Skip to content

W
wine-winehq
Commit 0789ec11 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

urlmon/tests: Allow some more optional progress notifications.

parent b80c71ab
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/urlmon/tests/protocol.c
View file @ 0789ec11
...@@ -594,6 +594,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) ...@@ -594,6 +594,7 @@ static void call_continue(PROTOCOLDATA *protocol_data)
SET_EXPECT(OnResponse); SET_EXPECT(OnResponse);
if(tested_protocol == HTTPS_TEST || test_redirect || test_abort || empty_file) if(tested_protocol == HTTPS_TEST || test_redirect || test_abort || empty_file)
SET_EXPECT(ReportProgress_ACCEPTRANGES); SET_EXPECT(ReportProgress_ACCEPTRANGES);
SET_EXPECT(ReportProgress_ENCODING);
SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE);
if(bindf & BINDF_NEEDFILE) if(bindf & BINDF_NEEDFILE)
SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE);
...@@ -627,6 +628,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) ...@@ -627,6 +628,7 @@ static void call_continue(PROTOCOLDATA *protocol_data)
CHECK_CALLED(ReportProgress_ACCEPTRANGES); CHECK_CALLED(ReportProgress_ACCEPTRANGES);
else if(test_redirect || test_abort) else if(test_redirect || test_abort)
CLEAR_CALLED(ReportProgress_ACCEPTRANGES); CLEAR_CALLED(ReportProgress_ACCEPTRANGES);
CLEAR_CALLED(ReportProgress_ENCODING);
CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE);
if(bindf & BINDF_NEEDFILE) if(bindf & BINDF_NEEDFILE)
CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE);
...@@ -751,7 +753,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ...@@ -751,7 +753,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface,
switch(ulStatusCode) { switch(ulStatusCode) {
case BINDSTATUS_MIMETYPEAVAILABLE: case BINDSTATUS_MIMETYPEAVAILABLE:
CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); CHECK_EXPECT2(ReportProgress_MIMETYPEAVAILABLE);
if(tested_protocol != FILE_TEST && tested_protocol != ITS_TEST && !mimefilter_test && (pi & PI_MIMEVERIFICATION)) { if(tested_protocol != FILE_TEST && tested_protocol != ITS_TEST && !mimefilter_test && (pi & PI_MIMEVERIFICATION)) {
if(!short_read || !direct_read) if(!short_read || !direct_read)
CHECK_CALLED(Read); /* set in Continue */ CHECK_CALLED(Read); /* set in Continue */
...@@ -831,7 +833,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ...@@ -831,7 +833,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface,
ok(!lstrcmpW(szStatusText, null_guid), "unexpected classid %s\n", wine_dbgstr_w(szStatusText)); ok(!lstrcmpW(szStatusText, null_guid), "unexpected classid %s\n", wine_dbgstr_w(szStatusText));
break; break;
case BINDSTATUS_COOKIE_SENT: case BINDSTATUS_COOKIE_SENT:
CHECK_EXPECT(ReportProgress_COOKIE_SENT); CHECK_EXPECT2(ReportProgress_COOKIE_SENT);
ok(szStatusText == NULL, "szStatusText != NULL\n"); ok(szStatusText == NULL, "szStatusText != NULL\n");
break; break;
case BINDSTATUS_REDIRECTING: case BINDSTATUS_REDIRECTING:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment