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
b7e50ee9
Commit
b7e50ee9
authored
Feb 12, 2018
by
Jacek Caban
Committed by
Alexandre Julliard
Feb 12, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement in pluginhost.c.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5bc2d76b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
pluginhost.c
dlls/mshtml/pluginhost.c
+6
-6
No files found.
dlls/mshtml/pluginhost.c
View file @
b7e50ee9
...
...
@@ -1660,7 +1660,7 @@ static BOOL parse_classid(const PRUnichar *classid, CLSID *clsid)
return
SUCCEEDED
(
hres
);
}
static
BOOL
get_elem_clsid
(
nsIDOM
HTML
Element
*
elem
,
CLSID
*
clsid
)
static
BOOL
get_elem_clsid
(
nsIDOMElement
*
elem
,
CLSID
*
clsid
)
{
const
PRUnichar
*
val
;
nsAString
val_str
;
...
...
@@ -1669,7 +1669,7 @@ static BOOL get_elem_clsid(nsIDOMHTMLElement *elem, CLSID *clsid)
static
const
PRUnichar
classidW
[]
=
{
'c'
,
'l'
,
'a'
,
's'
,
's'
,
'i'
,
'd'
,
0
};
nsres
=
get_elem_attr_value
(
(
nsIDOMElement
*
)
elem
,
classidW
,
&
val_str
,
&
val
);
nsres
=
get_elem_attr_value
(
elem
,
classidW
,
&
val_str
,
&
val
);
if
(
NS_SUCCEEDED
(
nsres
))
{
if
(
*
val
)
ret
=
parse_classid
(
val
,
clsid
);
...
...
@@ -1895,7 +1895,7 @@ static void install_codebase(const WCHAR *url)
WARN
(
"FAILED: %08x
\n
"
,
hres
);
}
static
void
check_codebase
(
HTMLInnerWindow
*
window
,
nsIDOM
HTML
Element
*
nselem
)
static
void
check_codebase
(
HTMLInnerWindow
*
window
,
nsIDOMElement
*
nselem
)
{
BOOL
is_on_list
=
FALSE
;
install_entry_t
*
iter
;
...
...
@@ -1907,7 +1907,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem)
static
const
PRUnichar
codebaseW
[]
=
{
'c'
,
'o'
,
'd'
,
'e'
,
'b'
,
'a'
,
's'
,
'e'
,
0
};
nsres
=
get_elem_attr_value
(
(
nsIDOMElement
*
)
nselem
,
codebaseW
,
&
val_str
,
&
val
);
nsres
=
get_elem_attr_value
(
nselem
,
codebaseW
,
&
val_str
,
&
val
);
if
(
NS_SUCCEEDED
(
nsres
))
{
if
(
*
val
)
{
hres
=
CoInternetCombineUrlEx
(
window
->
base
.
outer_window
->
uri
,
val
,
0
,
&
uri
,
0
);
...
...
@@ -1958,7 +1958,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem)
IUri_Release
(
uri
);
}
static
IUnknown
*
create_activex_object
(
HTMLDocumentNode
*
doc
,
nsIDOM
HTML
Element
*
nselem
,
CLSID
*
clsid
)
static
IUnknown
*
create_activex_object
(
HTMLDocumentNode
*
doc
,
nsIDOMElement
*
nselem
,
CLSID
*
clsid
)
{
IClassFactoryEx
*
cfex
;
IClassFactory
*
cf
;
...
...
@@ -2069,7 +2069,7 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, HTMLPluginContainer *container
assert
(
!
container
->
plugin_host
);
unk
=
create_activex_object
(
doc
,
container
->
element
.
nselem
,
&
clsid
);
unk
=
create_activex_object
(
doc
,
container
->
element
.
dom_element
,
&
clsid
);
if
(
!
unk
)
return
E_FAIL
;
...
...
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