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

mshtml: Reimplement get_node_obj using vtbl comparison.

This commit is contained in:
Jacek Caban 2012-06-28 11:22:12 +02:00 committed by Alexandre Julliard
parent 4e10fcc953
commit 3ab9eaf679
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/mshtml/htmlnode.c
View File

@ -883,6 +883,15 @@ static const IHTMLDOMNodeVtbl HTMLDOMNodeVtbl = {
HTMLDOMNode_get_nextSibling
};
static HTMLDOMNode *get_node_obj(HTMLDocumentNode *This, IUnknown *iface)
{
IHTMLDOMNode *node;
HRESULT hres;
hres = IUnknown_QueryInterface(iface, &IID_IHTMLDOMNode, (void**)&node);
return hres == S_OK && node->lpVtbl == &HTMLDOMNodeVtbl ? impl_from_IHTMLDOMNode(node) : NULL;
}
static inline HTMLDOMNode *impl_from_IHTMLDOMNode2(IHTMLDOMNode2 *iface)
{
return CONTAINING_RECORD(iface, HTMLDOMNode, IHTMLDOMNode2_iface);
@ -1117,29 +1126,6 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO
return create_node(This, nsnode, ret);
}
/*
* FIXME
* We should use better way for getting node object (like private interface)
* or avoid it at all.
*/
static HTMLDOMNode *get_node_obj(HTMLDocumentNode *This, IUnknown *iface)
{
HTMLDOMNode *iter = This->nodes;
IHTMLDOMNode *node;
IUnknown_QueryInterface(iface, &IID_IHTMLDOMNode, (void**)&node);
while(iter) {
if(&iter->IHTMLDOMNode_iface == node)
return iter;
iter = iter->next;
}
FIXME("Not found %p\n", iface);
IHTMLDOMNode_Release(node);
return NULL;
}
void release_nodes(HTMLDocumentNode *This)
{
HTMLDOMNode *iter, *next;