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
2e91bf32
Commit
2e91bf32
authored
Feb 15, 2018
by
Jacek Caban
Committed by
Alexandre Julliard
Feb 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IDOMEvent::view property implementation.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ab210dd7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
3 deletions
+30
-3
htmlevent.c
dlls/mshtml/htmlevent.c
+25
-2
nsiface.idl
dlls/mshtml/nsiface.idl
+1
-1
events.js
dlls/mshtml/tests/events.js
+4
-0
No files found.
dlls/mshtml/htmlevent.c
View file @
2e91bf32
...
...
@@ -1175,8 +1175,25 @@ static HRESULT WINAPI DOMUIEvent_Invoke(IDOMUIEvent *iface, DISPID dispIdMember,
static
HRESULT
WINAPI
DOMUIEvent_get_view
(
IDOMUIEvent
*
iface
,
IHTMLWindow2
**
p
)
{
DOMEvent
*
This
=
impl_from_IDOMUIEvent
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
mozIDOMWindowProxy
*
moz_window
;
HTMLOuterWindow
*
view
=
NULL
;
nsresult
nsres
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
nsres
=
nsIDOMUIEvent_GetView
(
This
->
ui_event
,
&
moz_window
);
if
(
NS_FAILED
(
nsres
))
return
E_FAIL
;
if
(
moz_window
)
{
view
=
mozwindow_to_window
(
moz_window
);
mozIDOMWindowProxy_Release
(
moz_window
);
}
if
(
view
)
IHTMLWindow2_AddRef
((
*
p
=
&
view
->
base
.
inner_window
->
base
.
IHTMLWindow2_iface
));
else
*
p
=
NULL
;
return
S_OK
;
}
static
HRESULT
WINAPI
DOMUIEvent_get_detail
(
IDOMUIEvent
*
iface
,
LONG
*
p
)
...
...
@@ -1210,6 +1227,9 @@ static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARI
return
S_OK
;
}
if
(
view
)
FIXME
(
"view argument is not supported
\n
"
);
hres
=
IDOMEvent_initEvent
(
&
This
->
IDOMEvent_iface
,
type
,
can_bubble
,
cancelable
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
@@ -1463,6 +1483,9 @@ static HRESULT WINAPI DOMMouseEvent_initMouseEvent(IDOMMouseEvent *iface, BSTR t
return
S_OK
;
}
if
(
view
)
FIXME
(
"view argument is not supported
\n
"
);
hres
=
IDOMEvent_initEvent
(
&
This
->
IDOMEvent_iface
,
type
,
can_bubble
,
cancelable
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
dlls/mshtml/nsiface.idl
View file @
2e91bf32
...
...
@@ -3175,7 +3175,7 @@ interface nsIDOMUIEvent : nsISupports
nsresult
GetView
(
mozIDOMWindowProxy
**
aView
)
;
nsresult
GetDetail
(
int32_t
*
aDetail
)
;
nsresult
InitUIEvent
(
const
nsAString
*
typeArg
,
bool
canBubbleArg
,
bool
cancelableArg
,
mozIDOMWindow
Proxy
*
viewArg
,
int32_t
detailArg
)
;
mozIDOMWindow
*
viewArg
,
int32_t
detailArg
)
;
nsresult
GetLayerX
(
int32_t
*
aLayerX
)
;
nsresult
GetLayerY
(
int32_t
*
aLayerY
)
;
nsresult
GetPageX
(
int32_t
*
aPageX
)
;
...
...
dlls/mshtml/tests/events.js
View file @
2e91bf32
...
...
@@ -631,6 +631,8 @@ function test_mouse_event() {
ok
(
e
.
cancelable
===
true
,
"cancelable = "
+
e
.
cancelable
);
ok
(
e
.
bubbles
===
true
,
"bubbles = "
+
e
.
bubbles
);
ok
(
e
.
detail
===
1
,
"detail = "
+
e
.
detail
);
todo_wine
.
ok
(
e
.
view
===
window
,
"view != window"
);
ok
(
e
.
screenX
===
2
,
"screenX = "
+
e
.
screenX
);
ok
(
e
.
screenY
===
3
,
"screenY = "
+
e
.
screenY
);
ok
(
e
.
clientX
===
4
,
"clientX = "
+
e
.
clientX
);
...
...
@@ -700,6 +702,8 @@ function test_ui_event() {
ok
(
e
.
cancelable
===
true
,
"cancelable = "
+
e
.
cancelable
);
ok
(
e
.
bubbles
===
true
,
"bubbles = "
+
e
.
bubbles
);
ok
(
e
.
detail
===
3
,
"detail = "
+
e
.
detail
);
todo_wine
.
ok
(
e
.
view
===
window
,
"view != window"
);
next_test
();
}
...
...
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