Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
1508eb48
Commit
1508eb48
authored
Dec 01, 2017
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use IDOMEvent for IHTMLEventObj::get_type implementation.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
dc5aefce
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
8 deletions
+3
-8
htmlevent.c
dlls/mshtml/htmlevent.c
+3
-8
No files found.
dlls/mshtml/htmlevent.c
View file @
1508eb48
...
...
@@ -296,7 +296,6 @@ typedef struct {
LONG
ref
;
const
event_info_t
*
type
;
DOMEvent
*
event
;
VARIANT
return_value
;
}
HTMLEventObj
;
...
...
@@ -613,13 +612,12 @@ static HRESULT WINAPI HTMLEventObj_get_type(IHTMLEventObj *iface, BSTR *p)
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
if
(
!
This
->
type
)
{
if
(
!
This
->
event
)
{
*
p
=
NULL
;
return
S_OK
;
}
*
p
=
SysAllocString
(
This
->
type
->
name
);
return
*
p
?
S_OK
:
E_OUTOFMEMORY
;
return
IDOMEvent_get_type
(
&
This
->
event
->
IDOMEvent_iface
,
p
);
}
static
HRESULT
WINAPI
HTMLEventObj_get_qualifier
(
IHTMLEventObj
*
iface
,
BSTR
*
p
)
...
...
@@ -1568,10 +1566,8 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event)
if
(
!
event
->
event_obj
&&
!
event
->
no_event_obj
)
{
event_obj_ref
=
alloc_event_obj
(
event
);
if
(
event_obj_ref
)
{
event_obj_ref
->
type
=
event_info
+
event
->
event_id
;
if
(
event_obj_ref
)
event
->
event_obj
=
&
event_obj_ref
->
IHTMLEventObj_iface
;
}
}
target_vtbl
=
dispex_get_vtbl
(
&
event_target
->
dispex
);
...
...
@@ -1671,7 +1667,6 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va
return
E_OUTOFMEMORY
;
}
event_obj
->
type
=
event_info
+
eid
;
if
(
!
event_obj
->
event
)
hres
=
create_document_event
(
node
->
doc
,
eid
,
&
event_obj
->
event
);
...
...
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