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
da01d8ac
Commit
da01d8ac
authored
15 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
15 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mshtml: Moved removing event target to separated function.
parent
8629433f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/mshtml/htmlevent.c
+14
-7
14 additions, 7 deletions
dlls/mshtml/htmlevent.c
with
14 additions
and
7 deletions
dlls/mshtml/htmlevent.c
+
14
−
7
View file @
da01d8ac
...
...
@@ -1043,11 +1043,24 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid)
return
S_OK
;
}
static
HRESULT
remove_event_handler
(
event_target_t
**
event_target
,
eventid_t
eid
)
{
if
(
*
event_target
&&
(
*
event_target
)
->
event_table
[
eid
]
->
handler_prop
)
{
IDispatch_Release
((
*
event_target
)
->
event_table
[
eid
]
->
handler_prop
);
(
*
event_target
)
->
event_table
[
eid
]
->
handler_prop
=
NULL
;
}
return
S_OK
;
}
static
HRESULT
set_event_handler_disp
(
event_target_t
**
event_target_ptr
,
HTMLDocumentNode
*
doc
,
eventid_t
eid
,
IDispatch
*
disp
)
{
event_target_t
*
event_target
;
if
(
!
disp
)
return
remove_event_handler
(
event_target_ptr
,
eid
);
event_target
=
get_event_target
(
event_target_ptr
);
if
(
!
event_target
)
return
E_OUTOFMEMORY
;
...
...
@@ -1059,8 +1072,6 @@ static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDoc
IDispatch_Release
(
event_target
->
event_table
[
eid
]
->
handler_prop
);
event_target
->
event_table
[
eid
]
->
handler_prop
=
disp
;
if
(
!
disp
)
return
S_OK
;
IDispatch_AddRef
(
disp
);
return
ensure_nsevent_handler
(
doc
,
eid
);
...
...
@@ -1070,11 +1081,7 @@ HRESULT set_event_handler(event_target_t **event_target, HTMLDocumentNode *doc,
{
switch
(
V_VT
(
var
))
{
case
VT_NULL
:
if
(
*
event_target
&&
(
*
event_target
)
->
event_table
[
eid
]
&&
(
*
event_target
)
->
event_table
[
eid
]
->
handler_prop
)
{
IDispatch_Release
((
*
event_target
)
->
event_table
[
eid
]
->
handler_prop
);
(
*
event_target
)
->
event_table
[
eid
]
->
handler_prop
=
NULL
;
}
break
;
return
remove_event_handler
(
event_target
,
eid
);
case
VT_DISPATCH
:
return
set_event_handler_disp
(
event_target
,
doc
,
eid
,
V_DISPATCH
(
var
));
...
...
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