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
203c47e6
Commit
203c47e6
authored
Feb 25, 2015
by
Jacek Caban
Committed by
Alexandre Julliard
Feb 25, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Correctly handle S_OK with NULL URL return from TranslateUrl.
parent
0200ee83
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
navigate.c
dlls/mshtml/navigate.c
+1
-1
htmldoc.c
dlls/mshtml/tests/htmldoc.c
+6
-0
No files found.
dlls/mshtml/navigate.c
View file @
203c47e6
...
...
@@ -2324,7 +2324,7 @@ static HRESULT translate_uri(HTMLOuterWindow *window, IUri *orig_uri, BSTR *ret_
hres
=
IDocHostUIHandler_TranslateUrl
(
window
->
doc_obj
->
hostui
,
0
,
display_uri
,
&
translated_url
);
if
(
hres
==
S_OK
)
{
if
(
hres
==
S_OK
&&
translated_url
)
{
TRACE
(
"%08x %s -> %s
\n
"
,
hres
,
debugstr_w
(
display_uri
),
debugstr_w
(
translated_url
));
SysFreeString
(
display_uri
);
hres
=
create_uri
(
translated_url
,
0
,
&
uri
);
...
...
dlls/mshtml/tests/htmldoc.c
View file @
203c47e6
...
...
@@ -2614,6 +2614,12 @@ static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, D
ok
(
ppchURLOut
!=
NULL
,
"ppchURLOut == NULL
\n
"
);
ok
(
!*
ppchURLOut
,
"*ppchURLOut = %p
\n
"
,
*
ppchURLOut
);
/* Not related to hash navigation, just return NULL and S_OK in some cases. */
if
(
loading_hash
)
{
*
ppchURLOut
=
NULL
;
return
S_OK
;
}
return
S_FALSE
;
}
...
...
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