Detlef Riekenberg : urlmon/tests: Run the tests again on W95B ( CoInternetParseUrl).
Alexandre Julliard
julliard at winehq.org
Wed Apr 14 11:24:56 CDT 2010
Module: wine
Branch: master
Commit: 083849559679f1f4ab2661fe6ea5bbba6bda9e88
URL: http://source.winehq.org/git/wine.git/?a=commit;h=083849559679f1f4ab2661fe6ea5bbba6bda9e88
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Tue Apr 13 21:30:54 2010 +0200
urlmon/tests: Run the tests again on W95B (CoInternetParseUrl).
---
dlls/urlmon/tests/misc.c | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 2e77c1b..259c5a0 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -63,6 +63,8 @@ DEFINE_EXPECT(QI_IInternetProtocolInfo);
DEFINE_EXPECT(CreateInstance);
DEFINE_EXPECT(unk_Release);
+static HRESULT (WINAPI *pCoInternetCompareUrl)(LPCWSTR, LPCWSTR, DWORD);
+
static void test_CreateFormatEnum(void)
{
IEnumFORMATETC *fenum = NULL, *fenum2 = NULL;
@@ -363,13 +365,18 @@ static void test_CoInternetCompareUrl(void)
{
HRESULT hres;
- hres = CoInternetCompareUrl(url1, url1, 0);
+ if (!pCoInternetCompareUrl) {
+ win_skip("CoInternetCompareUrl not found\n");
+ return;
+ }
+
+ hres = pCoInternetCompareUrl(url1, url1, 0);
ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres);
- hres = CoInternetCompareUrl(url1, url3, 0);
+ hres = pCoInternetCompareUrl(url1, url3, 0);
ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres);
- hres = CoInternetCompareUrl(url3, url1, 0);
+ hres = pCoInternetCompareUrl(url3, url1, 0);
ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres);
}
@@ -1402,10 +1409,15 @@ static void test_IsValidURL(void)
START_TEST(misc)
{
+ HMODULE hurlmon;
+
OleInitialize(NULL);
register_protocols();
+ hurlmon = GetModuleHandle("urlmon.dll");
+ pCoInternetCompareUrl = (void *) GetProcAddress(hurlmon, "CoInternetCompareUrl");
+
test_CreateFormatEnum();
test_RegisterFormatEnumerator();
test_CoInternetParseUrl();
More information about the wine-cvs
mailing list