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
9240ed58
Commit
9240ed58
authored
Mar 21, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use get_parentWindow for IHTMLDocument2::get_Script implementation.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
51e6cbdb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
htmldoc.c
dlls/mshtml/htmldoc.c
+3
-3
dom.c
dlls/mshtml/tests/dom.c
+4
-0
No files found.
dlls/mshtml/htmldoc.c
View file @
9240ed58
...
...
@@ -213,12 +213,12 @@ static HRESULT WINAPI HTMLDocument_Invoke(IHTMLDocument2 *iface, DISPID dispIdMe
static
HRESULT
WINAPI
HTMLDocument_get_Script
(
IHTMLDocument2
*
iface
,
IDispatch
**
p
)
{
HTMLDocument
*
This
=
impl_from_IHTMLDocument2
(
iface
);
HRESULT
hres
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
*
p
=
(
IDispatch
*
)
&
This
->
window
->
base
.
IHTMLWindow2_iface
;
IDispatch_AddRef
(
*
p
);
return
S_OK
;
hres
=
IHTMLDocument7_get_parentWindow
(
&
This
->
IHTMLDocument7_iface
,
(
IHTMLWindow2
**
)
p
);
return
hres
==
S_OK
&&
!*
p
?
E_PENDING
:
hres
;
}
static
HRESULT
WINAPI
HTMLDocument_get_all
(
IHTMLDocument2
*
iface
,
IHTMLElementCollection
**
p
)
...
...
dlls/mshtml/tests/dom.c
View file @
9240ed58
...
...
@@ -6925,6 +6925,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc)
IHTMLDocument7
*
new_document
;
IHTMLLocation
*
location
;
IHTMLWindow2
*
window
;
IDispatch
*
disp
;
str
=
a2bstr
(
"test"
);
hres
=
IHTMLDOMImplementation2_createHTMLDocument
(
dom_implementation2
,
str
,
&
new_document
);
...
...
@@ -6947,6 +6948,9 @@ static void test_dom_implementation(IHTMLDocument2 *doc)
hres
=
IHTMLDocument2_get_parentWindow
(
new_document2
,
&
window
);
ok
(
hres
==
E_FAIL
,
"get_parentWindow returned: %08x
\n
"
,
hres
);
hres
=
IHTMLDocument2_get_Script
(
new_document2
,
&
disp
);
ok
(
hres
==
E_PENDING
,
"get_Script returned: %08x
\n
"
,
hres
);
hres
=
IHTMLDocument2_get_location
(
new_document2
,
&
location
);
ok
(
hres
==
E_UNEXPECTED
,
"get_location returned: %08x
\n
"
,
hres
);
...
...
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