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
5caf8c31
Commit
5caf8c31
authored
Nov 14, 2010
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 15, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Correctly handle NULL nsdoc in IHTMLDocument2::get_location.
parent
c481fb4b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
htmldoc.c
dlls/mshtml/htmldoc.c
+5
-0
dom.c
dlls/mshtml/tests/dom.c
+6
-0
No files found.
dlls/mshtml/htmldoc.c
View file @
5caf8c31
...
...
@@ -565,6 +565,11 @@ static HRESULT WINAPI HTMLDocument_get_location(IHTMLDocument2 *iface, IHTMLLoca
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
if
(
!
This
->
doc_node
->
nsdoc
)
{
WARN
(
"NULL nsdoc
\n
"
);
return
E_UNEXPECTED
;
}
return
IHTMLWindow2_get_location
(
HTMLWINDOW2
(
This
->
window
),
p
);
}
...
...
dlls/mshtml/tests/dom.c
View file @
5caf8c31
...
...
@@ -6974,6 +6974,7 @@ static void test_docfrag(IHTMLDocument2 *doc)
{
IHTMLElement
*
div
,
*
body
,
*
br
;
IHTMLElementCollection
*
col
;
IHTMLLocation
*
location
;
IHTMLDocument2
*
frag
;
HRESULT
hres
;
...
...
@@ -6995,6 +6996,11 @@ static void test_docfrag(IHTMLDocument2 *doc)
ok
(
hres
==
S_OK
,
"get_body failed: %08x
\n
"
,
hres
);
ok
(
!
body
,
"body != NULL
\n
"
);
location
=
(
void
*
)
0xdeadbeef
;
hres
=
IHTMLDocument2_get_location
(
frag
,
&
location
);
ok
(
hres
==
E_UNEXPECTED
,
"get_location failed: %08x
\n
"
,
hres
);
ok
(
location
==
(
void
*
)
0xdeadbeef
,
"location changed
\n
"
);
br
=
test_create_elem
(
doc
,
"BR"
);
test_node_append_child
((
IUnknown
*
)
frag
,
(
IUnknown
*
)
br
);
IHTMLElement_Release
(
br
);
...
...
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