[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
+11 -3
View File
@@ -3173,6 +3173,16 @@ static void test_navigator(IHTMLDocument2 *doc)
ok(!strcmp_wa(bstr, buf), "userAgent returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), buf);
SysFreeString(bstr);
if(!strncmp(buf, "Mozilla/", 8)) {
bstr = NULL;
hres = IOmNavigator_get_appVersion(navigator, &bstr);
ok(hres == S_OK, "get_appVersion failed: %08x\n", hres);
ok(!strcmp_wa(bstr, buf+8), "appVersion returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), buf+8);
SysFreeString(bstr);
}else {
skip("nonstandard user agent\n");
}
ref = IOmNavigator_Release(navigator);
ok(!ref, "navigator should be destroyed here\n");
}
@@ -3185,8 +3195,6 @@ static void test_screen(IHTMLWindow2 *window)
HDC hdc;
HRESULT hres;
static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0};
screen = NULL;
hres = IHTMLWindow2_get_screen(window, &screen);
ok(hres == S_OK, "get_screen failed: %08x\n", hres);
@@ -3206,7 +3214,7 @@ static void test_screen(IHTMLWindow2 *window)
IDispatchEx_Release(dispex);
}
hdc = CreateICW(displayW, NULL, NULL, NULL);
hdc = CreateICA("DISPLAY", NULL, NULL, NULL);
exl = GetDeviceCaps(hdc, HORZRES);
l = 0xdeadbeef;