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
b472a1f3
Commit
b472a1f3
authored
Sep 25, 2014
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 25, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Don't share nsobject reference with nsnode.
parent
d2a97e73
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
5 deletions
+25
-5
htmlobject.c
dlls/mshtml/htmlobject.c
+25
-5
No files found.
dlls/mshtml/htmlobject.c
View file @
b472a1f3
...
...
@@ -704,6 +704,26 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid
return
invoke_plugin_prop
(
&
This
->
plugin_container
,
id
,
lcid
,
flags
,
params
,
res
,
ei
);
}
static
void
HTMLObjectElement_traverse
(
HTMLDOMNode
*
iface
,
nsCycleCollectionTraversalCallback
*
cb
)
{
HTMLObjectElement
*
This
=
impl_from_HTMLDOMNode
(
iface
);
if
(
This
->
nsobject
)
note_cc_edge
((
nsISupports
*
)
This
->
nsobject
,
"This->nsobject"
,
cb
);
}
static
void
HTMLObjectElement_unlink
(
HTMLDOMNode
*
iface
)
{
HTMLObjectElement
*
This
=
impl_from_HTMLDOMNode
(
iface
);
if
(
This
->
nsobject
)
{
nsIDOMHTMLObjectElement
*
nsobject
=
This
->
nsobject
;
This
->
nsobject
=
NULL
;
nsIDOMHTMLObjectElement_Release
(
nsobject
);
}
}
static
const
NodeImplVtbl
HTMLObjectElementImplVtbl
=
{
HTMLObjectElement_QI
,
HTMLObjectElement_destructor
,
...
...
@@ -718,7 +738,10 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = {
NULL
,
HTMLObjectElement_get_readystate
,
HTMLObjectElement_get_dispid
,
HTMLObjectElement_invoke
HTMLObjectElement_invoke
,
NULL
,
HTMLObjectElement_traverse
,
HTMLObjectElement_unlink
};
static
const
tid_t
HTMLObjectElement_iface_tids
[]
=
{
...
...
@@ -750,10 +773,7 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele
HTMLElement_Init
(
&
ret
->
plugin_container
.
element
,
doc
,
nselem
,
&
HTMLObjectElement_dispex
);
nsres
=
nsIDOMHTMLElement_QueryInterface
(
nselem
,
&
IID_nsIDOMHTMLObjectElement
,
(
void
**
)
&
ret
->
nsobject
);
/* Share nsobject reference with nsnode */
assert
(
nsres
==
NS_OK
&&
(
nsIDOMNode
*
)
ret
->
nsobject
==
ret
->
plugin_container
.
element
.
node
.
nsnode
);
nsIDOMNode_Release
(
ret
->
plugin_container
.
element
.
node
.
nsnode
);
assert
(
nsres
==
NS_OK
);
*
elem
=
&
ret
->
plugin_container
.
element
;
return
S_OK
;
...
...
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