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
99937172
Commit
99937172
authored
Nov 24, 2009
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 29, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Return content document in get_document for frame elements.
parent
7c64ab1e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
3 deletions
+44
-3
htmlelem.c
dlls/mshtml/htmlelem.c
+3
-1
htmlframebase.c
dlls/mshtml/htmlframebase.c
+20
-1
htmliframe.c
dlls/mshtml/htmliframe.c
+20
-1
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-0
No files found.
dlls/mshtml/htmlelem.c
View file @
99937172
...
...
@@ -569,9 +569,11 @@ static HRESULT WINAPI HTMLElement_get_document(IHTMLElement *iface, IDispatch **
if
(
!
p
)
return
E_POINTER
;
if
(
This
->
node
.
vtbl
->
get_document
)
return
This
->
node
.
vtbl
->
get_document
(
&
This
->
node
,
p
);
*
p
=
(
IDispatch
*
)
HTMLDOC
(
&
This
->
node
.
doc
->
basedoc
);
IDispatch_AddRef
(
*
p
);
return
S_OK
;
}
...
...
dlls/mshtml/htmlframebase.c
View file @
99937172
...
...
@@ -443,11 +443,30 @@ static void HTMLFrameElement_destructor(HTMLDOMNode *iface)
HTMLFrameBase_destructor
(
&
This
->
framebase
);
}
static
HRESULT
HTMLFrameElement_get_document
(
HTMLDOMNode
*
iface
,
IDispatch
**
p
)
{
HTMLFrameElement
*
This
=
HTMLFRAME_NODE_THIS
(
iface
);
if
(
!
This
->
framebase
.
content_window
||
!
This
->
framebase
.
content_window
->
doc
)
{
*
p
=
NULL
;
return
S_OK
;
}
*
p
=
(
IDispatch
*
)
HTMLDOC
(
&
This
->
framebase
.
content_window
->
doc
->
basedoc
);
IDispatch_AddRef
(
*
p
);
return
S_OK
;
}
#undef HTMLFRAME_NODE_THIS
static
const
NodeImplVtbl
HTMLFrameElementImplVtbl
=
{
HTMLFrameElement_QI
,
HTMLFrameElement_destructor
HTMLFrameElement_destructor
,
NULL
,
NULL
,
NULL
,
NULL
,
HTMLFrameElement_get_document
};
HTMLElement
*
HTMLFrameElement_Create
(
HTMLDocumentNode
*
doc
,
nsIDOMHTMLElement
*
nselem
,
HTMLWindow
*
content_window
)
...
...
dlls/mshtml/htmliframe.c
View file @
99937172
...
...
@@ -58,11 +58,30 @@ static void HTMLIFrame_destructor(HTMLDOMNode *iface)
HTMLFrameBase_destructor
(
&
This
->
framebase
);
}
static
HRESULT
HTMLIFrame_get_document
(
HTMLDOMNode
*
iface
,
IDispatch
**
p
)
{
HTMLIFrame
*
This
=
HTMLIFRAME_NODE_THIS
(
iface
);
if
(
!
This
->
framebase
.
content_window
||
!
This
->
framebase
.
content_window
->
doc
)
{
*
p
=
NULL
;
return
S_OK
;
}
*
p
=
(
IDispatch
*
)
HTMLDOC
(
&
This
->
framebase
.
content_window
->
doc
->
basedoc
);
IDispatch_AddRef
(
*
p
);
return
S_OK
;
}
#undef HTMLIFRAME_NODE_THIS
static
const
NodeImplVtbl
HTMLIFrameImplVtbl
=
{
HTMLIFrame_QI
,
HTMLIFrame_destructor
HTMLIFrame_destructor
,
NULL
,
NULL
,
NULL
,
NULL
,
HTMLIFrame_get_document
};
static
const
tid_t
HTMLIFrame_iface_tids
[]
=
{
...
...
dlls/mshtml/mshtml_private.h
View file @
99937172
...
...
@@ -445,6 +445,7 @@ typedef struct {
HRESULT
(
*
call_event
)(
HTMLDOMNode
*
,
DWORD
,
BOOL
*
);
HRESULT
(
*
put_disabled
)(
HTMLDOMNode
*
,
VARIANT_BOOL
);
HRESULT
(
*
get_disabled
)(
HTMLDOMNode
*
,
VARIANT_BOOL
*
);
HRESULT
(
*
get_document
)(
HTMLDOMNode
*
,
IDispatch
**
);
}
NodeImplVtbl
;
struct
HTMLDOMNode
{
...
...
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