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
2f849ce3
Commit
2f849ce3
authored
Sep 19, 2014
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 19, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Don't use nsIDOMHTMLParamElement.
It will be removed in the next Gecko update anyway.
parent
8b4c1204
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
31 deletions
+11
-31
nsiface.idl
dlls/mshtml/nsiface.idl
+0
-17
propbag.c
dlls/mshtml/propbag.c
+11
-14
No files found.
dlls/mshtml/nsiface.idl
View file @
2f849ce3
...
...
@@ -2220,23 +2220,6 @@ interface nsIDOMHTMLObjectElement : nsIDOMHTMLElement
[
object
,
uuid
(
f85e1b05
-
6
dc4
-
442
d
-
bea8
-
7
cf551f9bc9f
),
local
]
interface
nsIDOMHTMLParamElement
:
nsIDOMHTMLElement
{
nsresult
GetName
(
nsAString
*
aName
)
;
nsresult
SetName
(
const
nsAString
*
aName
)
;
nsresult
GetType
(
nsAString
*
aType
)
;
nsresult
SetType
(
const
nsAString
*
aType
)
;
nsresult
GetValue
(
nsAString
*
aValue
)
;
nsresult
SetValue
(
const
nsAString
*
aValue
)
;
nsresult
GetValueType
(
nsAString
*
aValueType
)
;
nsresult
SetValueType
(
const
nsAString
*
aValueType
)
;
}
[
object
,
uuid
(
e81273e1
-
d440
-
4
dd3
-
9073
-
8199
f7a9525e
),
local
]
...
...
dlls/mshtml/propbag.c
View file @
2f849ce3
...
...
@@ -270,15 +270,18 @@ static const IPropertyBag2Vtbl PropertyBag2Vtbl = {
static
HRESULT
fill_props
(
nsIDOMHTMLElement
*
nselem
,
PropertyBag
*
prop_bag
)
{
nsIDOMHTMLParamElement
*
nsparam
;
const
PRUnichar
*
name
,
*
value
;
nsAString
name_str
,
value_str
;
nsIDOMHTMLCollection
*
params
;
nsIDOMHTMLElement
*
param_elem
;
UINT32
length
,
i
;
nsIDOMNode
*
nsnode
;
nsresult
nsres
;
HRESULT
hres
=
S_OK
;
static
const
PRUnichar
nameW
[]
=
{
'n'
,
'a'
,
'm'
,
'e'
,
0
};
static
const
PRUnichar
paramW
[]
=
{
'p'
,
'a'
,
'r'
,
'a'
,
'm'
,
0
};
static
const
PRUnichar
valueW
[]
=
{
'v'
,
'a'
,
'l'
,
'u'
,
'e'
,
0
};
nsAString_InitDepend
(
&
name_str
,
paramW
);
nsres
=
nsIDOMHTMLElement_GetElementsByTagName
(
nselem
,
&
name_str
,
&
params
);
...
...
@@ -297,31 +300,25 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag)
break
;
}
nsres
=
nsIDOMNode_QueryInterface
(
nsnode
,
&
IID_nsIDOMHTML
ParamElement
,
(
void
**
)
&
nspara
m
);
nsres
=
nsIDOMNode_QueryInterface
(
nsnode
,
&
IID_nsIDOMHTML
Element
,
(
void
**
)
&
param_ele
m
);
nsIDOMNode_Release
(
nsnode
);
if
(
NS_FAILED
(
nsres
))
{
hres
=
E_FAIL
;
break
;
}
nsAString_Init
(
&
name_str
,
NULL
);
nsres
=
nsIDOMHTMLParamElement_GetName
(
nsparam
,
&
name_str
);
nsres
=
get_elem_attr_value
(
param_elem
,
nameW
,
&
name_str
,
&
name
);
if
(
NS_SUCCEEDED
(
nsres
))
{
nsAString_Init
(
&
value_str
,
NULL
);
nsres
=
nsIDOMHTMLParamElement_GetValue
(
nsparam
,
&
value_str
);
nsres
=
get_elem_attr_value
(
param_elem
,
valueW
,
&
value_str
,
&
value
);
if
(
NS_SUCCEEDED
(
nsres
))
{
const
PRUnichar
*
name
,
*
value
;
nsAString_GetData
(
&
name_str
,
&
name
);
nsAString_GetData
(
&
value_str
,
&
value
);
hres
=
add_prop
(
prop_bag
,
name
,
value
);
nsAString_Finish
(
&
value_str
);
}
nsAString_Finish
(
&
value_str
);
nsAString_Finish
(
&
name_str
);
}
nsAString_Finish
(
&
name_str
);
nsIDOMHTMLParamElement_Release
(
nsparam
);
nsIDOMHTMLElement_Release
(
param_elem
);
if
(
FAILED
(
hres
))
break
;
if
(
NS_FAILED
(
nsres
))
{
...
...
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