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

mshtml: Get rid of no longer needed document argument from get_element. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2018-02-19 14:50:02 +01:00 committed by Alexandre Julliard
parent ae4809c7d6
commit b304616f8a
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/mshtml/htmldoc.c
View File

@ -112,7 +112,7 @@ HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement *
return S_OK;
}
hres = get_elem(doc, nselem, ret);
hres = get_element(nselem, ret);
nsIDOMElement_Release(nselem);
return hres;
}
@ -281,7 +281,7 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement
return S_OK;
}
hres = get_elem(This->doc_node, (nsIDOMElement*)nsbody, &element);
hres = get_element((nsIDOMElement*)nsbody, &element);
nsIDOMHTMLElement_Release(nsbody);
if(FAILED(hres))
return hres;
@ -320,7 +320,7 @@ static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTM
return S_OK;
}
hres = get_elem(This->doc_node, nselem, &elem);
hres = get_element(nselem, &elem);
nsIDOMElement_Release(nselem);
if(FAILED(hres))
return hres;
@ -3161,7 +3161,7 @@ static HRESULT WINAPI HTMLDocument6_getElementById(IHTMLDocument6 *iface,
return S_OK;
}
hres = get_elem(This->doc_node, nselem, &elem);
hres = get_element(nselem, &elem);
nsIDOMElement_Release(nselem);
if(FAILED(hres))
return hres;
@ -4083,7 +4083,7 @@ static HRESULT WINAPI HTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement
nsIDOMHTMLHeadElement_Release(nshead);
assert(nsres == NS_OK);
hres = get_elem(This->doc_node, nselem, &elem);
hres = get_element(nselem, &elem);
nsIDOMElement_Release(nselem);
if(FAILED(hres))
return hres;
@ -4282,10 +4282,12 @@ static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, B
return S_OK;
}
hres = get_elem(This->doc_node, nselem, &elem);
hres = get_element(nselem, &elem);
nsIDOMElement_Release(nselem);
if(SUCCEEDED(hres))
*pel = &elem->IHTMLElement_iface;
if(FAILED(hres))
return hres;
*pel = &elem->IHTMLElement_iface;
return S_OK;
}

4
dlls/mshtml/htmlelem.c
View File

@ -5119,7 +5119,7 @@ static HRESULT WINAPI ElementTraversal_get_firstElementChild(IElementTraversal *
return S_OK;
}
hres = get_elem(This->node.doc, nselem, &elem);
hres = get_element(nselem, &elem);
nsIDOMElement_Release(nselem);
if(FAILED(hres))
return hres;
@ -5623,7 +5623,7 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g
return S_OK;
}
HRESULT get_elem(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **ret)
HRESULT get_element(nsIDOMElement *nselem, HTMLElement **ret)
{
HTMLDOMNode *node;
HRESULT hres;

2
dlls/mshtml/mshtml_private.h
View File

@ -1073,7 +1073,7 @@ HRESULT HTMLFrameBase_QI(HTMLFrameBase*,REFIID,void**) DECLSPEC_HIDDEN;
void HTMLFrameBase_destructor(HTMLFrameBase*) DECLSPEC_HIDDEN;
HRESULT get_node(nsIDOMNode*,BOOL,HTMLDOMNode**) DECLSPEC_HIDDEN;
HRESULT get_elem(HTMLDocumentNode*,nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN;
HRESULT get_element(nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN;
HRESULT get_document_node(nsIDOMDocument*,HTMLDocumentNode**) DECLSPEC_HIDDEN;
HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN;