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
be2128fd
Commit
be2128fd
authored
Jul 28, 2014
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 28, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLWindow2::navigate implementation.
parent
7c5d0789
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
htmlwindow.c
dlls/mshtml/htmlwindow.c
+4
-2
nav_test.html
dlls/mshtml/tests/nav_test.html
+17
-0
No files found.
dlls/mshtml/htmlwindow.c
View file @
be2128fd
...
...
@@ -1010,8 +1010,10 @@ static HRESULT WINAPI HTMLWindow2_get_window(IHTMLWindow2 *iface, IHTMLWindow2 *
static
HRESULT
WINAPI
HTMLWindow2_navigate
(
IHTMLWindow2
*
iface
,
BSTR
url
)
{
HTMLWindow
*
This
=
impl_from_IHTMLWindow2
(
iface
);
FIXME
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
url
));
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
url
));
return
navigate_url
(
This
->
outer_window
,
url
,
This
->
outer_window
->
uri
,
BINDING_NAVIGATED
);
}
static
HRESULT
WINAPI
HTMLWindow2_put_onfocus
(
IHTMLWindow2
*
iface
,
VARIANT
v
)
...
...
dlls/mshtml/tests/nav_test.html
View file @
be2128fd
...
...
@@ -18,6 +18,7 @@ function nav_back_test() {
}
iframe
.
onload
=
function
()
{
iframe
.
onload
=
null
;
var
href
=
iframe
.
contentWindow
.
location
.
href
;
ok
(
/.*blank2.html/
.
test
(
href
),
"Unexpected href "
+
href
);
next_test
();
...
...
@@ -27,8 +28,24 @@ function nav_back_test() {
subframe
.
src
=
"blank.html"
;
}
function
window_navigate_test
()
{
external
.
trace
(
"Runnint window.navigate() tests..."
);
var
iframe
=
document
.
getElementById
(
"testframe"
);
iframe
.
onload
=
function
()
{
iframe
.
onlod
=
null
;
var
href
=
iframe
.
contentWindow
.
location
.
href
;
ok
(
href
===
"about:blank"
,
"Unexpected href "
+
href
);
next_test
();
}
iframe
.
contentWindow
.
navigate
(
"about:blank"
);
}
var
tests
=
[
nav_back_test
,
window_navigate_test
,
function
()
{
external
.
reportSuccess
();
}
];
...
...
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