James Hawkins : urlmon: Fix a few failing tests in win2k3.
Alexandre Julliard
julliard at winehq.org
Mon Jun 2 07:24:23 CDT 2008
Module: wine
Branch: master
Commit: 6fc9d7e59d25c5b9742595d532b0d74527c233ba
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc9d7e59d25c5b9742595d532b0d74527c233ba
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Sat May 31 21:10:54 2008 -0500
urlmon: Fix a few failing tests in win2k3.
---
dlls/urlmon/tests/protocol.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c
index 6361403..60335ec 100644
--- a/dlls/urlmon/tests/protocol.c
+++ b/dlls/urlmon/tests/protocol.c
@@ -426,7 +426,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface,
ok(szStatusText != NULL, "szStatusText == NULL\n");
if(szStatusText) {
if(binding_test)
- ok(szStatusText == expect_wsz, "unexpected szStatusText\n");
+ ok(!lstrcmpW(szStatusText, expect_wsz), "unexpected szStatusText\n");
else if(tested_protocol == FILE_TEST)
ok(!lstrcmpW(szStatusText, file_name), "szStatusText = \"%s\"\n", debugstr_w(szStatusText));
else
@@ -1721,13 +1721,18 @@ static void test_mk_protocol(void)
expect_hrResult = INET_E_RESOURCE_NOT_FOUND;
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);
- CLEAR_CALLED(ReportProgress_DIRECTBIND);
- CHECK_CALLED(ReportProgress_SENDINGREQUEST);
- CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE);
- CHECK_CALLED(ReportResult);
+ if (hres == INET_E_RESOURCE_NOT_FOUND)
+ {
+ CHECK_CALLED(GetBindInfo);
+ CLEAR_CALLED(ReportProgress_DIRECTBIND);
+ CHECK_CALLED(ReportProgress_SENDINGREQUEST);
+ CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE);
+ CHECK_CALLED(ReportResult);
+ }
IInternetProtocol_Release(protocol);
}
More information about the wine-cvs
mailing list