Jacek Caban : mshtml: Fixed tests on some IE6 installations.
Alexandre Julliard
julliard at winehq.org
Wed Dec 15 11:29:56 CST 2010
Module: wine
Branch: master
Commit: 0b5edecc8bc730a1be3d542b1a2ad32dd0bf1082
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5edecc8bc730a1be3d542b1a2ad32dd0bf1082
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Dec 15 00:43:03 2010 +0100
mshtml: Fixed tests on some IE6 installations.
---
dlls/mshtml/tests/activex.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c
index f163c6c..64b72c6 100644
--- a/dlls/mshtml/tests/activex.c
+++ b/dlls/mshtml/tests/activex.c
@@ -178,7 +178,7 @@ static void set_plugin_readystate(READYSTATE state)
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;
DWORD mksys;
@@ -186,7 +186,8 @@ static void test_mon_displayname(IMoniker *mon, const char *exname)
hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name);
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);
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);
ok(hres == S_OK, "CreateMoniker failed: %08x\n", hres);
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);
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);
ok(hres == S_OK, "GetMoniker failed: %08x\n", hres);
ok(mon != NULL, "mon == NULL\n");
- test_mon_displayname(mon, "about:blank");
+ test_mon_displayname(mon, "about:blank", NULL);
IMoniker_Release(mon);
set_plugin_readystate(READYSTATE_COMPLETE);
More information about the wine-cvs
mailing list