Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b304616f
Commit
b304616f
authored
Feb 19, 2018
by
Jacek Caban
Committed by
Alexandre Julliard
Feb 19, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
>
parent
ae4809c7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
htmldoc.c
dlls/mshtml/htmldoc.c
+10
-8
htmlelem.c
dlls/mshtml/htmlelem.c
+2
-2
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-1
No files found.
dlls/mshtml/htmldoc.c
View file @
b304616f
...
...
@@ -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_elem
ent
(
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_elem
ent
(
(
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_elem
ent
(
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_elem
ent
(
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_elem
ent
(
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_elem
ent
(
nselem
,
&
elem
);
nsIDOMElement_Release
(
nselem
);
if
(
SUCCEEDED
(
hres
))
*
pel
=
&
elem
->
IHTMLElement_iface
;
if
(
FAILED
(
hres
))
return
hres
;
*
pel
=
&
elem
->
IHTMLElement_iface
;
return
S_OK
;
}
...
...
dlls/mshtml/htmlelem.c
View file @
b304616f
...
...
@@ -5119,7 +5119,7 @@ static HRESULT WINAPI ElementTraversal_get_firstElementChild(IElementTraversal *
return
S_OK
;
}
hres
=
get_elem
(
This
->
node
.
doc
,
nselem
,
&
elem
);
hres
=
get_elem
ent
(
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_elem
ent
(
nsIDOMElement
*
nselem
,
HTMLElement
**
ret
)
{
HTMLDOMNode
*
node
;
HRESULT
hres
;
...
...
dlls/mshtml/mshtml_private.h
View file @
b304616f
...
...
@@ -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_elem
ent
(
nsIDOMElement
*
,
HTMLElement
**
)
DECLSPEC_HIDDEN
;
HRESULT
get_document_node
(
nsIDOMDocument
*
,
HTMLDocumentNode
**
)
DECLSPEC_HIDDEN
;
HTMLElement
*
unsafe_impl_from_IHTMLElement
(
IHTMLElement
*
)
DECLSPEC_HIDDEN
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment