[WINESYNC]

- Sync comdlg32, crypt32, gdiplus, inetcomm, jscript, msctf, mshtml, msxml3, rsaenh, schannel, shlwapi, urlmon, usp10, wininet winetests.

svn path=/trunk/; revision=46982
This commit is contained in:
Aleksey Bragin
2010-04-21 20:35:09 +00:00
parent e20b4df9ef
commit 577625f6f8
41 changed files with 7905 additions and 1238 deletions
+15 -3
View File
@@ -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();