Jacek Caban : mshtml: Added test of CompareUrl.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Dec 13 10:03:52 CST 2006
Module: wine
Branch: master
Commit: 139d2b813dbd30b96a172cd831f388dc65759bf5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=139d2b813dbd30b96a172cd831f388dc65759bf5
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Dec 12 21:52:46 2006 +0100
mshtml: Added test of CompareUrl.
---
dlls/mshtml/protocol.c | 25 +++++++++----------------
dlls/mshtml/tests/protocol.c | 12 ++++++++++++
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c
index a560ae7..376d1f0 100644
--- a/dlls/mshtml/protocol.c
+++ b/dlls/mshtml/protocol.c
@@ -102,6 +102,13 @@ static HRESULT WINAPI InternetProtocolIn
return INET_E_USE_DEFAULT_PROTOCOLHANDLER;
}
+static HRESULT WINAPI InternetProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1,
+ LPCWSTR pwzUrl2, DWORD dwCompareFlags)
+{
+ TRACE("%p)->(%s %s %08x)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
+ return E_NOTIMPL;
+}
+
#undef PROTOCOLINFO_THIS
#define CLASSFACTORY_THIS(iface) DEFINE_THIS(ProtocolFactory, ClassFactory, iface)
@@ -438,13 +445,6 @@ static HRESULT WINAPI AboutProtocolInfo_
return INET_E_DEFAULT_ACTION;
}
-static HRESULT WINAPI AboutProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1,
- LPCWSTR pwzUrl2, DWORD dwCompareFlags)
-{
- FIXME("%p)->(%s %s %08x)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
- return E_NOTIMPL;
-}
-
static HRESULT WINAPI AboutProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPCWSTR pwzUrl,
QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf,
DWORD dwReserved)
@@ -460,7 +460,7 @@ static const IInternetProtocolInfoVtbl A
InternetProtocolInfo_Release,
AboutProtocolInfo_ParseUrl,
InternetProtocolInfo_CombineUrl,
- AboutProtocolInfo_CompareUrl,
+ InternetProtocolInfo_CompareUrl,
AboutProtocolInfo_QueryInfo
};
@@ -839,13 +839,6 @@ static HRESULT WINAPI ResProtocolInfo_Pa
return INET_E_DEFAULT_ACTION;
}
-static HRESULT WINAPI ResProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1,
- LPCWSTR pwzUrl2, DWORD dwCompareFlags)
-{
- FIXME("%p)->(%s %s %08x)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
- return E_NOTIMPL;
-}
-
static HRESULT WINAPI ResProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPCWSTR pwzUrl,
QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf,
DWORD dwReserved)
@@ -861,7 +854,7 @@ static const IInternetProtocolInfoVtbl R
InternetProtocolInfo_Release,
ResProtocolInfo_ParseUrl,
InternetProtocolInfo_CombineUrl,
- ResProtocolInfo_CompareUrl,
+ InternetProtocolInfo_CompareUrl,
ResProtocolInfo_QueryInfo
};
diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c
index f4edef4..2cb50d2 100644
--- a/dlls/mshtml/tests/protocol.c
+++ b/dlls/mshtml/tests/protocol.c
@@ -354,6 +354,12 @@ static void test_res_protocol(void)
ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres);
ok(size == 0xdeadbeef, "size=%d\n", size);
+ hres = IInternetProtocolInfo_CompareUrl(protocol_info, blank_url, blank_url, 0);
+ ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres);
+
+ hres = IInternetProtocolInfo_CompareUrl(protocol_info, NULL, NULL, 0xdeadbeef);
+ ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres);
+
IInternetProtocolInfo_Release(protocol_info);
}
@@ -538,6 +544,12 @@ static void test_about_protocol(void)
ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres);
ok(size == 0xdeadbeef, "size=%d\n", size);
+ hres = IInternetProtocolInfo_CompareUrl(protocol_info, blank_url, blank_url, 0);
+ ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres);
+
+ hres = IInternetProtocolInfo_CompareUrl(protocol_info, NULL, NULL, 0xdeadbeef);
+ ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres);
+
IInternetProtocolInfo_Release(protocol_info);
}
More information about the wine-cvs
mailing list