Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
6270a46d
Commit
6270a46d
authored
17 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mshtml: Pass HTMLDOMNode pointer to its destructor.
parent
829cafc6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/mshtml/htmlelem.c
+14
-14
14 additions, 14 deletions
dlls/mshtml/htmlelem.c
dlls/mshtml/htmlnode.c
+1
-1
1 addition, 1 deletion
dlls/mshtml/htmlnode.c
dlls/mshtml/mshtml_private.h
+3
-2
3 additions, 2 deletions
dlls/mshtml/mshtml_private.h
with
18 additions
and
17 deletions
dlls/mshtml/htmlelem.c
+
14
−
14
View file @
6270a46d
...
...
@@ -58,7 +58,7 @@ static void elem_vector_add(elem_vector *buf, HTMLElement *elem)
#define HTMLELEM_THIS(iface) DEFINE_THIS(HTMLElement, HTMLElement, iface)
#define HTMLELEM_NODE_THIS(
node) (
(HTMLElement
*)
node)
#define HTMLELEM_NODE_THIS(
iface) DEFINE_THIS2
(HTMLElement
,
node
, iface
)
static
HRESULT
WINAPI
HTMLElement_QueryInterface
(
IHTMLElement
*
iface
,
REFIID
riid
,
void
**
ppv
)
...
...
@@ -1140,19 +1140,6 @@ static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p)
return
HTMLElementCollection_Create
((
IUnknown
*
)
HTMLELEM
(
This
),
buf
.
buf
,
buf
.
len
,
p
);
}
static
void
HTMLElement_destructor
(
IUnknown
*
iface
)
{
HTMLElement
*
This
=
HTMLELEM_THIS
(
iface
);
if
(
This
->
destructor
)
This
->
destructor
(
This
->
impl
);
if
(
This
->
nselem
)
nsIDOMHTMLElement_Release
(
This
->
nselem
);
mshtml_free
(
This
);
}
#undef HTMLELEM_THIS
static
const
IHTMLElementVtbl
HTMLElementVtbl
=
{
...
...
@@ -1278,6 +1265,19 @@ HRESULT HTMLElement_QI(HTMLElement *This, REFIID riid, void **ppv)
return
HTMLDOMNode_QI
(
&
This
->
node
,
riid
,
ppv
);
}
static
void
HTMLElement_destructor
(
HTMLDOMNode
*
iface
)
{
HTMLElement
*
This
=
HTMLELEM_NODE_THIS
(
iface
);
if
(
This
->
destructor
)
This
->
destructor
(
This
->
impl
);
if
(
This
->
nselem
)
nsIDOMHTMLElement_Release
(
This
->
nselem
);
mshtml_free
(
This
);
}
HTMLElement
*
HTMLElement_Create
(
nsIDOMNode
*
nsnode
)
{
nsIDOMHTMLElement
*
nselem
;
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/htmlnode.c
+
1
−
1
View file @
6270a46d
...
...
@@ -395,7 +395,7 @@ void release_nodes(HTMLDocument *This)
next
=
iter
->
next
;
nsIDOMNode_Release
(
iter
->
nsnode
);
if
(
iter
->
destructor
)
iter
->
destructor
(
iter
->
impl
.
unk
);
iter
->
destructor
(
iter
);
else
mshtml_free
(
iter
);
}
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/mshtml_private.h
+
3
−
2
View file @
6270a46d
...
...
@@ -253,7 +253,7 @@ struct BSCallback {
struct
HTMLDOMNode
{
const
IHTMLDOMNodeVtbl
*
lpHTMLDOMNodeVtbl
;
void
(
*
destructor
)(
IUnknown
*
);
void
(
*
destructor
)(
HTMLDOMNode
*
);
union
{
IUnknown
*
unk
;
...
...
@@ -335,7 +335,8 @@ typedef struct {
#define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl)
#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl)))
#define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc)))
#define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface)
HRESULT
HTMLDocument_Create
(
IUnknown
*
,
REFIID
,
void
**
);
HRESULT
HTMLLoadOptions_Create
(
IUnknown
*
,
REFIID
,
void
**
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment