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

mshtml: Use custom get_readyState implementations for object and frame elements.

This commit is contained in:
Jacek Caban 2010-11-14 14:42:00 +01:00 committed by Alexandre Julliard
parent f351dc5e74
commit cb99f716a7
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/mshtml/htmlframe.c
View File

@ -211,6 +211,13 @@ static HRESULT HTMLFrameElement_get_document(HTMLDOMNode *iface, IDispatch **p)
return S_OK;
}
static HRESULT HTMLFrameElement_get_readystate(HTMLDOMNode *iface, BSTR *p)
{
HTMLFrameElement *This = HTMLFRAME_NODE_THIS(iface);
return IHTMLFrameBase2_get_readyState(HTMLFRAMEBASE2(&This->framebase), p);
}
static HRESULT HTMLFrameElement_get_dispid(HTMLDOMNode *iface, BSTR name,
DWORD grfdex, DISPID *pid)
{
@ -264,7 +271,7 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = {
NULL,
NULL,
HTMLFrameElement_get_document,
NULL,
HTMLFrameElement_get_readystate,
HTMLFrameElement_get_dispid,
HTMLFrameElement_invoke,
HTMLFrameElement_bind_to_tree

17
dlls/mshtml/htmlobject.c
View File

@ -40,7 +40,7 @@ typedef struct {
nsIDOMHTMLObjectElement *nsobject;
} HTMLObjectElement;
#define HTMLOBJECT(x) (&(x)->lpIHTMLObjectElementVtbl)
#define HTMLOBJECT(x) ((IHTMLObjectElement*) &(x)->lpIHTMLObjectElementVtbl)
#define HTMLOBJECT_THIS(iface) DEFINE_THIS(HTMLObjectElement, IHTMLObjectElement, iface)
@ -424,12 +424,25 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface)
HTMLElement_destructor(&This->element.node);
}
static HRESULT HTMLObjectElement_get_readystate(HTMLDOMNode *iface, BSTR *p)
{
HTMLObjectElement *This = HTMLOBJECT_NODE_THIS(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
}
#undef HTMLOBJECT_NODE_THIS
static const NodeImplVtbl HTMLObjectElementImplVtbl = {
HTMLObjectElement_QI,
HTMLObjectElement_destructor,
HTMLElement_clone
HTMLElement_clone,
NULL,
NULL,
NULL,
NULL,
NULL,
HTMLObjectElement_get_readystate
};
static const tid_t HTMLObjectElement_iface_tids[] = {