ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Fixed tests on some IE6 installations.

This commit is contained in:
Jacek Caban 2010-12-15 00:43:03 +01:00 committed by Alexandre Julliard
parent 79f400c062
commit 0b5edecc8b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/mshtml/tests/activex.c
View File

@ -178,7 +178,7 @@ static void set_plugin_readystate(READYSTATE state)
IPropertyNotifySink_Release(prop_notif); IPropertyNotifySink_Release(prop_notif);
} }
static void test_mon_displayname(IMoniker *mon, const char *exname) static void test_mon_displayname(IMoniker *mon, const char *exname, const char *broken_name)
{ {
LPOLESTR display_name; LPOLESTR display_name;
DWORD mksys; DWORD mksys;
@ -186,7 +186,8 @@ static void test_mon_displayname(IMoniker *mon, const char *exname)
hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name); hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name);
ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres);
ok(!strcmp_wa(display_name, exname), "display_name = %s\n", wine_dbgstr_w(display_name)); ok(!strcmp_wa(display_name, exname) || broken(broken_name && !strcmp_wa(display_name, broken_name)),
"display_name = %s\n", wine_dbgstr_w(display_name));
CoTaskMemFree(display_name); CoTaskMemFree(display_name);
hres = IMoniker_IsSystemMoniker(mon, &mksys); hres = IMoniker_IsSystemMoniker(mon, &mksys);
@ -486,7 +487,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper
hres = IBindHost_CreateMoniker(bind_host, test_swfW, NULL, &mon, 0); hres = IBindHost_CreateMoniker(bind_host, test_swfW, NULL, &mon, 0);
ok(hres == S_OK, "CreateMoniker failed: %08x\n", hres); ok(hres == S_OK, "CreateMoniker failed: %08x\n", hres);
ok(mon != NULL, "mon == NULL\n"); ok(mon != NULL, "mon == NULL\n");
test_mon_displayname(mon, "about:test.swf"); test_mon_displayname(mon, "about:test.swf", "about:blanktest.swf");
IMoniker_Release(mon); IMoniker_Release(mon);
IBindHost_Release(bind_host); IBindHost_Release(bind_host);
@ -495,7 +496,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper
hres = IOleClientSite_GetMoniker(client_site, OLEGETMONIKER_ONLYIFTHERE, OLEWHICHMK_CONTAINER, &mon); hres = IOleClientSite_GetMoniker(client_site, OLEGETMONIKER_ONLYIFTHERE, OLEWHICHMK_CONTAINER, &mon);
ok(hres == S_OK, "GetMoniker failed: %08x\n", hres); ok(hres == S_OK, "GetMoniker failed: %08x\n", hres);
ok(mon != NULL, "mon == NULL\n"); ok(mon != NULL, "mon == NULL\n");
test_mon_displayname(mon, "about:blank"); test_mon_displayname(mon, "about:blank", NULL);
IMoniker_Release(mon); IMoniker_Release(mon);
set_plugin_readystate(READYSTATE_COMPLETE); set_plugin_readystate(READYSTATE_COMPLETE);