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

mshtml: Fixed tests on IE8 and change Wine behavior to IE8.

This commit is contained in:
Jacek Caban 2009-06-22 19:25:58 +02:00 committed by Alexandre Julliard
parent 6f5591f3b2
commit 51f13ac144
5 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/dispex.c
View File

@ -77,6 +77,8 @@ static REFIID tid_ids[] = {
&DIID_DispHTMLIFrame,
&DIID_DispHTMLImg,
&DIID_DispHTMLInputElement,
&DIID_DispHTMLLocation,
&DIID_DispHTMLNavigator,
&DIID_DispHTMLOptionElement,
&DIID_DispHTMLSelectElement,
&DIID_DispHTMLStyle,

2
dlls/mshtml/htmllocation.c
View File

@ -293,7 +293,7 @@ static const tid_t HTMLLocation_iface_tids[] = {
};
static dispex_static_data_t HTMLLocation_dispex = {
NULL,
IHTMLLocation_tid,
DispHTMLLocation_tid,
NULL,
HTMLLocation_iface_tids
};

2
dlls/mshtml/mshtml_private.h
View File

@ -74,6 +74,8 @@ typedef enum {
DispHTMLIFrame_tid,
DispHTMLImg_tid,
DispHTMLInputElement_tid,
DispHTMLLocation_tid,
DispHTMLNavigator_tid,
DispHTMLOptionElement_tid,
DispHTMLSelectElement_tid,
DispHTMLStyle_tid,

2
dlls/mshtml/omnavigator.c
View File

@ -329,7 +329,7 @@ static const tid_t OmNavigator_iface_tids[] = {
};
static dispex_static_data_t OmNavigator_dispex = {
NULL,
IOmNavigator_tid,
DispHTMLNavigator_tid,
NULL,
OmNavigator_iface_tids
};

36
dlls/mshtml/tests/dom.c
View File

@ -438,18 +438,19 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids)
}
}
#define test_disp(u,id) _test_disp(__LINE__,u,id)
static void _test_disp(unsigned line, IUnknown *unk, const IID *diid)
#define test_get_dispid(u,id) _test_disp(__LINE__,u,id)
static BOOL _test_get_dispid(unsigned line, IUnknown *unk, IID *iid)
{
IDispatchEx *dispex;
ITypeInfo *typeinfo;
BOOL ret = FALSE;
UINT ticnt;
HRESULT hres;
hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex);
ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatch: %08x\n", hres);
if(FAILED(hres))
return;
return FALSE;
ticnt = 0xdeadbeef;
hres = IDispatchEx_GetTypeInfoCount(dispex, &ticnt);
@ -464,13 +465,36 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid)
hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr);
ok_(__FILE__,line) (hres == S_OK, "GetTypeAttr failed: %08x\n", hres);
ok_(__FILE__,line) (IsEqualGUID(&type_attr->guid, diid), "unexpected guid %s\n", dbgstr_guid(&type_attr->guid));
if(hres == S_OK) {
*iid = type_attr->guid;
ret = TRUE;
}
ITypeInfo_ReleaseTypeAttr(typeinfo, type_attr);
ITypeInfo_Release(typeinfo);
}
IDispatchEx_Release(dispex);
return ret;
}
#define test_disp(u,id) _test_disp(__LINE__,u,id)
static void _test_disp(unsigned line, IUnknown *unk, const IID *diid)
{
IID iid;
if(_test_get_dispid(line, unk, &iid))
ok_(__FILE__,line) (IsEqualGUID(&iid, diid), "unexpected guid %s\n", dbgstr_guid(&iid));
}
#define test_disp2(u,id,id2) _test_disp2(__LINE__,u,id,id2)
static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID *diid2)
{
IID iid;
if(_test_get_dispid(line, unk, &iid))
ok_(__FILE__,line) (IsEqualGUID(&iid, diid) || broken(IsEqualGUID(&iid, diid2)),
"unexpected guid %s\n", dbgstr_guid(&iid));
}
#define get_elem_iface(u) _get_elem_iface(__LINE__,u)
@ -2366,7 +2390,7 @@ static void test_location(IHTMLDocument2 *doc)
IHTMLLocation_Release(location2);
test_ifaces((IUnknown*)location, location_iids);
test_disp((IUnknown*)location, &IID_IHTMLLocation);
test_disp2((IUnknown*)location, &DIID_DispHTMLLocation, &IID_IHTMLLocation);
ref = IHTMLLocation_Release(location);
ok(!ref, "location chould be destroyed here\n");
@ -2388,7 +2412,7 @@ static void test_navigator(IHTMLDocument2 *doc)
hres = IHTMLWindow2_get_navigator(window, &navigator);
ok(hres == S_OK, "get_navigator failed: %08x\n", hres);
ok(navigator != NULL, "navigator == NULL\n");
test_disp((IUnknown*)navigator, &IID_IOmNavigator);
test_disp2((IUnknown*)navigator, &DIID_DispHTMLNavigator, &IID_IOmNavigator);
hres = IHTMLWindow2_get_navigator(window, &navigator2);
ok(hres == S_OK, "get_navigator failed: %08x\n", hres);