Commit 6fc9d7e5 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

urlmon: Fix a few failing tests in win2k3.

parent 85e839a2
...@@ -426,7 +426,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ...@@ -426,7 +426,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface,
ok(szStatusText != NULL, "szStatusText == NULL\n"); ok(szStatusText != NULL, "szStatusText == NULL\n");
if(szStatusText) { if(szStatusText) {
if(binding_test) if(binding_test)
ok(szStatusText == expect_wsz, "unexpected szStatusText\n"); ok(!lstrcmpW(szStatusText, expect_wsz), "unexpected szStatusText\n");
else if(tested_protocol == FILE_TEST) else if(tested_protocol == FILE_TEST)
ok(!lstrcmpW(szStatusText, file_name), "szStatusText = \"%s\"\n", debugstr_w(szStatusText)); ok(!lstrcmpW(szStatusText, file_name), "szStatusText = \"%s\"\n", debugstr_w(szStatusText));
else else
...@@ -1721,13 +1721,18 @@ static void test_mk_protocol(void) ...@@ -1721,13 +1721,18 @@ static void test_mk_protocol(void)
expect_hrResult = INET_E_RESOURCE_NOT_FOUND; expect_hrResult = INET_E_RESOURCE_NOT_FOUND;
hres = IInternetProtocol_Start(protocol, wrong_url2, &protocol_sink, &bind_info, 0, 0); hres = IInternetProtocol_Start(protocol, wrong_url2, &protocol_sink, &bind_info, 0, 0);
ok(hres == INET_E_RESOURCE_NOT_FOUND, "Start failed: %08x, expected INET_E_RESOURCE_NOT_FOUND\n", hres); ok(hres == INET_E_RESOURCE_NOT_FOUND ||
hres == INET_E_INVALID_URL, /* win2k3 */
"Start failed: %08x, expected INET_E_RESOURCE_NOT_FOUND or INET_E_INVALID_URL\n", hres);
CHECK_CALLED(GetBindInfo); if (hres == INET_E_RESOURCE_NOT_FOUND)
CLEAR_CALLED(ReportProgress_DIRECTBIND); {
CHECK_CALLED(ReportProgress_SENDINGREQUEST); CHECK_CALLED(GetBindInfo);
CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); CLEAR_CALLED(ReportProgress_DIRECTBIND);
CHECK_CALLED(ReportResult); CHECK_CALLED(ReportProgress_SENDINGREQUEST);
CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE);
CHECK_CALLED(ReportResult);
}
IInternetProtocol_Release(protocol); IInternetProtocol_Release(protocol);
} }
......
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