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
fba6da79
Commit
fba6da79
authored
Feb 12, 2018
by
Jacek Caban
Committed by
Alexandre Julliard
Feb 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a219fd31
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
15 deletions
+15
-15
htmlattr.c
dlls/mshtml/htmlattr.c
+2
-2
htmlcurstyle.c
dlls/mshtml/htmlcurstyle.c
+1
-1
htmlelemcol.c
dlls/mshtml/htmlelemcol.c
+3
-3
htmlinput.c
dlls/mshtml/htmlinput.c
+1
-1
htmloption.c
dlls/mshtml/htmloption.c
+3
-3
htmlscript.c
dlls/mshtml/htmlscript.c
+1
-1
htmlstyle.c
dlls/mshtml/htmlstyle.c
+3
-3
script.c
dlls/mshtml/script.c
+1
-1
No files found.
dlls/mshtml/htmlattr.c
View file @
fba6da79
...
@@ -183,7 +183,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V
...
@@ -183,7 +183,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
if
(
!
This
->
elem
||
!
This
->
elem
->
nselem
)
{
if
(
!
This
->
elem
||
!
This
->
elem
->
dom_element
)
{
FIXME
(
"NULL This->elem
\n
"
);
FIXME
(
"NULL This->elem
\n
"
);
return
E_UNEXPECTED
;
return
E_UNEXPECTED
;
}
}
...
@@ -199,7 +199,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V
...
@@ -199,7 +199,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V
/* FIXME: This is not exactly right, we have some attributes that don't map directly to Gecko attributes. */
/* FIXME: This is not exactly right, we have some attributes that don't map directly to Gecko attributes. */
nsAString_InitDepend
(
&
nsname
,
name
);
nsAString_InitDepend
(
&
nsname
,
name
);
nsres
=
nsIDOM
HTMLElement_GetAttributeNode
(
This
->
elem
->
nselem
,
&
nsname
,
&
nsattr
);
nsres
=
nsIDOM
Element_GetAttributeNode
(
This
->
elem
->
dom_element
,
&
nsname
,
&
nsattr
);
nsAString_Finish
(
&
nsname
);
nsAString_Finish
(
&
nsname
);
SysFreeString
(
name
);
SysFreeString
(
name
);
if
(
NS_FAILED
(
nsres
))
if
(
NS_FAILED
(
nsres
))
...
...
dlls/mshtml/htmlcurstyle.c
View file @
fba6da79
...
@@ -1345,7 +1345,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p)
...
@@ -1345,7 +1345,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p)
assert
(
nsres
==
NS_OK
);
assert
(
nsres
==
NS_OK
);
nsAString_Init
(
&
nsempty_str
,
NULL
);
nsAString_Init
(
&
nsempty_str
,
NULL
);
nsres
=
nsIDOMWindow_GetComputedStyle
(
nswindow
,
(
nsIDOMElement
*
)
elem
->
nselem
,
&
nsempty_str
,
&
nsstyle
);
nsres
=
nsIDOMWindow_GetComputedStyle
(
nswindow
,
elem
->
dom_element
,
&
nsempty_str
,
&
nsstyle
);
nsAString_Finish
(
&
nsempty_str
);
nsAString_Finish
(
&
nsempty_str
);
nsIDOMWindow_Release
(
nswindow
);
nsIDOMWindow_Release
(
nswindow
);
if
(
NS_FAILED
(
nsres
))
{
if
(
NS_FAILED
(
nsres
))
{
...
...
dlls/mshtml/htmlelemcol.c
View file @
fba6da79
...
@@ -377,7 +377,7 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name)
...
@@ -377,7 +377,7 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name)
static
const
PRUnichar
nameW
[]
=
{
'n'
,
'a'
,
'm'
,
'e'
,
0
};
static
const
PRUnichar
nameW
[]
=
{
'n'
,
'a'
,
'm'
,
'e'
,
0
};
if
(
!
elem
->
nselem
)
if
(
!
elem
->
dom_element
)
return
FALSE
;
return
FALSE
;
nsAString_Init
(
&
nsstr
,
NULL
);
nsAString_Init
(
&
nsstr
,
NULL
);
...
@@ -507,10 +507,10 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface,
...
@@ -507,10 +507,10 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface,
nsAString_Init
(
&
tag_str
,
NULL
);
nsAString_Init
(
&
tag_str
,
NULL
);
for
(
i
=
0
;
i
<
This
->
len
;
i
++
)
{
for
(
i
=
0
;
i
<
This
->
len
;
i
++
)
{
if
(
!
This
->
elems
[
i
]
->
nselem
)
if
(
!
This
->
elems
[
i
]
->
dom_element
)
continue
;
continue
;
nsIDOM
HTMLElement_GetTagName
(
This
->
elems
[
i
]
->
nselem
,
&
tag_str
);
nsIDOM
Element_GetTagName
(
This
->
elems
[
i
]
->
dom_element
,
&
tag_str
);
nsAString_GetData
(
&
tag_str
,
&
tag
);
nsAString_GetData
(
&
tag_str
,
&
tag
);
if
(
CompareStringW
(
LOCALE_SYSTEM_DEFAULT
,
NORM_IGNORECASE
,
tag
,
-
1
,
if
(
CompareStringW
(
LOCALE_SYSTEM_DEFAULT
,
NORM_IGNORECASE
,
tag
,
-
1
,
...
...
dlls/mshtml/htmlinput.c
View file @
fba6da79
...
@@ -1590,7 +1590,7 @@ static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BST
...
@@ -1590,7 +1590,7 @@ static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BST
nsAString_InitDepend
(
&
for_str
,
forW
);
nsAString_InitDepend
(
&
for_str
,
forW
);
nsAString_InitDepend
(
&
val_str
,
v
);
nsAString_InitDepend
(
&
val_str
,
v
);
nsres
=
nsIDOM
HTMLElement_SetAttribute
(
This
->
element
.
nselem
,
&
for_str
,
&
val_str
);
nsres
=
nsIDOM
Element_SetAttribute
(
This
->
element
.
dom_element
,
&
for_str
,
&
val_str
);
nsAString_Finish
(
&
for_str
);
nsAString_Finish
(
&
for_str
);
nsAString_Finish
(
&
val_str
);
nsAString_Finish
(
&
val_str
);
if
(
NS_FAILED
(
nsres
))
{
if
(
NS_FAILED
(
nsres
))
{
...
...
dlls/mshtml/htmloption.c
View file @
fba6da79
...
@@ -260,11 +260,11 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR
...
@@ -260,11 +260,11 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR
while
(
1
)
{
while
(
1
)
{
nsIDOMNode
*
child
;
nsIDOMNode
*
child
;
nsres
=
nsIDOM
HTMLElement_GetFirstChild
(
This
->
element
.
nselem
,
&
child
);
nsres
=
nsIDOM
Element_GetFirstChild
(
This
->
element
.
dom_element
,
&
child
);
if
(
NS_FAILED
(
nsres
)
||
!
child
)
if
(
NS_FAILED
(
nsres
)
||
!
child
)
break
;
break
;
nsres
=
nsIDOM
HTMLElement_RemoveChild
(
This
->
element
.
nselem
,
child
,
&
tmp
);
nsres
=
nsIDOM
Element_RemoveChild
(
This
->
element
.
dom_element
,
child
,
&
tmp
);
nsIDOMNode_Release
(
child
);
nsIDOMNode_Release
(
child
);
if
(
NS_SUCCEEDED
(
nsres
))
{
if
(
NS_SUCCEEDED
(
nsres
))
{
nsIDOMNode_Release
(
tmp
);
nsIDOMNode_Release
(
tmp
);
...
@@ -282,7 +282,7 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR
...
@@ -282,7 +282,7 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR
return
E_FAIL
;
return
E_FAIL
;
}
}
nsres
=
nsIDOM
HTMLElement_AppendChild
(
This
->
element
.
nselem
,
(
nsIDOMNode
*
)
text_node
,
&
tmp
);
nsres
=
nsIDOM
Element_AppendChild
(
This
->
element
.
dom_element
,
(
nsIDOMNode
*
)
text_node
,
&
tmp
);
if
(
NS_SUCCEEDED
(
nsres
))
if
(
NS_SUCCEEDED
(
nsres
))
nsIDOMNode_Release
(
tmp
);
nsIDOMNode_Release
(
tmp
);
else
else
...
...
dlls/mshtml/htmlscript.c
View file @
fba6da79
...
@@ -200,7 +200,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR
...
@@ -200,7 +200,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR
return
E_FAIL
;
return
E_FAIL
;
}
}
nsres
=
nsIDOM
HTMLElement_GetParentNode
(
This
->
element
.
nselem
,
&
parent
);
nsres
=
nsIDOM
Element_GetParentNode
(
This
->
element
.
dom_element
,
&
parent
);
if
(
NS_FAILED
(
nsres
)
||
!
parent
)
{
if
(
NS_FAILED
(
nsres
)
||
!
parent
)
{
TRACE
(
"No parent, not executing
\n
"
);
TRACE
(
"No parent, not executing
\n
"
);
This
->
parse_on_bind
=
TRUE
;
This
->
parse_on_bind
=
TRUE
;
...
...
dlls/mshtml/htmlstyle.c
View file @
fba6da79
...
@@ -4701,12 +4701,12 @@ static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration
...
@@ -4701,12 +4701,12 @@ static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration
nsIDOMElementCSSInlineStyle
*
nselemstyle
;
nsIDOMElementCSSInlineStyle
*
nselemstyle
;
nsresult
nsres
;
nsresult
nsres
;
if
(
!
elem
->
nselem
)
{
if
(
!
elem
->
dom_element
)
{
FIXME
(
"
NULL nselem
\n
"
);
FIXME
(
"
comment element
\n
"
);
return
E_NOTIMPL
;
return
E_NOTIMPL
;
}
}
nsres
=
nsIDOM
HTMLElement_QueryInterface
(
elem
->
nselem
,
&
IID_nsIDOMElementCSSInlineStyle
,
nsres
=
nsIDOM
Element_QueryInterface
(
elem
->
dom_element
,
&
IID_nsIDOMElementCSSInlineStyle
,
(
void
**
)
&
nselemstyle
);
(
void
**
)
&
nselemstyle
);
assert
(
nsres
==
NS_OK
);
assert
(
nsres
==
NS_OK
);
...
...
dlls/mshtml/script.c
View file @
fba6da79
...
@@ -905,7 +905,7 @@ static void script_file_available(ScriptBSC *bsc)
...
@@ -905,7 +905,7 @@ static void script_file_available(ScriptBSC *bsc)
return
;
return
;
}
}
nsres
=
nsIDOM
HTMLElement_GetParentNode
(
script_elem
->
element
.
nselem
,
&
parent
);
nsres
=
nsIDOM
Element_GetParentNode
(
script_elem
->
element
.
dom_element
,
&
parent
);
if
(
NS_FAILED
(
nsres
)
||
!
parent
)
{
if
(
NS_FAILED
(
nsres
)
||
!
parent
)
{
TRACE
(
"No parent, not executing
\n
"
);
TRACE
(
"No parent, not executing
\n
"
);
script_elem
->
parse_on_bind
=
TRUE
;
script_elem
->
parse_on_bind
=
TRUE
;
...
...
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