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
7a8f0994
Commit
7a8f0994
authored
Jun 27, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 28, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Share nsobject reference with nsnode.
parent
f2b32208
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
htmlobject.c
dlls/mshtml/htmlobject.c
+6
-8
No files found.
dlls/mshtml/htmlobject.c
View file @
7a8f0994
...
...
@@ -17,6 +17,7 @@
*/
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
...
...
@@ -571,8 +572,6 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface)
if
(
This
->
plugin_container
.
plugin_host
)
detach_plugin_host
(
This
->
plugin_container
.
plugin_host
);
if
(
This
->
nsobject
)
nsIDOMHTMLObjectElement_Release
(
This
->
nsobject
);
HTMLElement_destructor
(
&
This
->
plugin_container
.
element
.
node
);
}
...
...
@@ -646,14 +645,13 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele
ret
->
IHTMLObjectElement2_iface
.
lpVtbl
=
&
HTMLObjectElement2Vtbl
;
ret
->
plugin_container
.
element
.
node
.
vtbl
=
&
HTMLObjectElementImplVtbl
;
HTMLElement_Init
(
&
ret
->
plugin_container
.
element
,
doc
,
nselem
,
&
HTMLObjectElement_dispex
);
nsres
=
nsIDOMHTMLElement_QueryInterface
(
nselem
,
&
IID_nsIDOMHTMLObjectElement
,
(
void
**
)
&
ret
->
nsobject
);
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"Could not get nsIDOMHTMLObjectElement iface: %08x
\n
"
,
nsres
);
heap_free
(
ret
);
return
E_FAIL
;
}
HTMLElement_Init
(
&
ret
->
plugin_container
.
element
,
doc
,
nselem
,
&
HTMLObjectElement_dispex
);
/* 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
);
*
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