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
8d1dc99e
Commit
8d1dc99e
authored
Oct 11, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 11, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLIFrameElement3::get_contentDocument implementation.
parent
c9e5181f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
2 deletions
+26
-2
htmliframe.c
dlls/mshtml/htmliframe.c
+13
-2
dom.c
dlls/mshtml/tests/dom.c
+13
-0
No files found.
dlls/mshtml/htmliframe.c
View file @
8d1dc99e
...
...
@@ -318,8 +318,19 @@ static HRESULT WINAPI HTMLIFrameElement3_Invoke(IHTMLIFrameElement3 *iface, DISP
static
HRESULT
WINAPI
HTMLIFrameElement3_get_contentDocument
(
IHTMLIFrameElement3
*
iface
,
IDispatch
**
p
)
{
HTMLIFrame
*
This
=
impl_from_IHTMLIFrameElement3
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
IHTMLDocument2
*
doc
;
HRESULT
hres
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
if
(
!
This
->
framebase
.
content_window
)
{
*
p
=
NULL
;
return
S_OK
;
}
hres
=
IHTMLWindow2_get_document
(
&
This
->
framebase
.
content_window
->
base
.
IHTMLWindow2_iface
,
&
doc
);
*
p
=
(
IDispatch
*
)
doc
;
return
hres
;
}
static
HRESULT
WINAPI
HTMLIFrameElement3_put_src
(
IHTMLIFrameElement3
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/tests/dom.c
View file @
8d1dc99e
...
...
@@ -5082,6 +5082,7 @@ static void test_frame_doc(IUnknown *frame_elem, BOOL iframe)
static
void
test_iframe_elem
(
IHTMLElement
*
elem
)
{
IHTMLDocument2
*
content_doc
,
*
owner_doc
;
IHTMLIFrameElement3
*
iframe3
;
IHTMLElementCollection
*
col
;
IHTMLWindow2
*
content_window
;
IHTMLElement
*
body
;
...
...
@@ -5108,6 +5109,18 @@ static void test_iframe_elem(IHTMLElement *elem)
content_doc
=
get_window_doc
(
content_window
);
IHTMLWindow2_Release
(
content_window
);
hres
=
IHTMLElement_QueryInterface
(
elem
,
&
IID_IHTMLIFrameElement3
,
(
void
**
)
&
iframe3
);
if
(
SUCCEEDED
(
hres
))
{
hres
=
IHTMLIFrameElement3_get_contentDocument
(
iframe3
,
&
disp
);
ok
(
hres
==
S_OK
,
"get_contentDocument failed: %08x
\n
"
,
hres
);
ok
(
iface_cmp
((
IUnknown
*
)
content_doc
,
(
IUnknown
*
)
disp
),
"content_doc != disp
\n
"
);
IDispatch_Release
(
disp
);
IHTMLIFrameElement3_Release
(
iframe3
);
}
else
{
win_skip
(
"IHTMLIFrameElement3 not supported
\n
"
);
}
str
=
a2bstr
(
"text/html"
);
V_VT
(
&
errv
)
=
VT_ERROR
;
disp
=
NULL
;
...
...
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