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
ec5d0d44
Commit
ec5d0d44
authored
Oct 18, 2017
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 18, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Call default event handles through event target vtbl.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
62c7dd05
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
2 deletions
+15
-2
htmldoc.c
dlls/mshtml/htmldoc.c
+1
-0
htmlelem.c
dlls/mshtml/htmlelem.c
+10
-0
htmlevent.c
dlls/mshtml/htmlevent.c
+3
-2
htmlevent.h
dlls/mshtml/htmlevent.h
+1
-0
No files found.
dlls/mshtml/htmldoc.c
View file @
ec5d0d44
...
...
@@ -5048,6 +5048,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = {
NULL
},
HTMLDocumentNode_bind_event
,
NULL
,
HTMLDocumentNode_get_cp_container
};
...
...
dlls/mshtml/htmlelem.c
View file @
ec5d0d44
...
...
@@ -5347,6 +5347,15 @@ static void HTMLElement_bind_event(DispatchEx *dispex, eventid_t eid)
}
}
static
HRESULT
HTMLElement_handle_event_default
(
DispatchEx
*
dispex
,
eventid_t
eid
,
nsIDOMEvent
*
nsevent
,
BOOL
*
prevent_default
)
{
HTMLElement
*
This
=
impl_from_DispatchEx
(
dispex
);
if
(
!
This
->
node
.
vtbl
->
handle_event
)
return
S_OK
;
return
This
->
node
.
vtbl
->
handle_event
(
&
This
->
node
,
eid
,
nsevent
,
prevent_default
);
}
static
ConnectionPointContainer
*
HTMLElement_get_cp_container
(
DispatchEx
*
dispex
)
{
HTMLElement
*
This
=
impl_from_DispatchEx
(
dispex
);
...
...
@@ -5385,6 +5394,7 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = {
HTMLElement_populate_props
},
HTMLElement_bind_event
,
HTMLElement_handle_event_default
,
HTMLElement_get_cp_container
};
...
...
dlls/mshtml/htmlevent.c
View file @
ec5d0d44
...
...
@@ -1137,8 +1137,9 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e
break
;
if
(
node
)
{
if
(
node
->
vtbl
->
handle_event
)
hres
=
node
->
vtbl
->
handle_event
(
node
,
eid
,
event_obj
?
event_obj
->
nsevent
:
NULL
,
&
prevent_default
);
const
event_target_vtbl_t
*
vtbl
=
dispex_get_vtbl
(
&
node
->
event_target
.
dispex
);
if
(
vtbl
&&
vtbl
->
handle_event_default
)
hres
=
vtbl
->
handle_event_default
(
&
node
->
event_target
.
dispex
,
eid
,
event_obj
?
event_obj
->
nsevent
:
NULL
,
&
prevent_default
);
node_release
(
node
);
if
(
FAILED
(
hres
)
||
prevent_default
||
(
event_obj
&&
event_obj
->
cancel_bubble
))
break
;
...
...
dlls/mshtml/htmlevent.h
View file @
ec5d0d44
...
...
@@ -83,6 +83,7 @@ void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN;
typedef
struct
{
dispex_static_data_vtbl_t
dispex_vtbl
;
void
(
*
bind_event
)(
DispatchEx
*
,
eventid_t
);
HRESULT
(
*
handle_event_default
)(
DispatchEx
*
,
eventid_t
,
nsIDOMEvent
*
,
BOOL
*
);
ConnectionPointContainer
*
(
*
get_cp_container
)(
DispatchEx
*
);
}
event_target_vtbl_t
;
...
...
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