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
e5fe3bc0
Commit
e5fe3bc0
authored
Aug 23, 2022
by
Gabriel Ivăncescu
Committed by
Alexandre Julliard
Aug 23, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Handle S_FALSE from IUri methods when navigating.
Mostly by ignoring it, since no such Uri component exists. Signed-off-by:
Gabriel Ivăncescu
<
gabrielopcode@gmail.com
>
parent
d2daec40
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
navigate.c
dlls/mshtml/navigate.c
+9
-6
No files found.
dlls/mshtml/navigate.c
View file @
e5fe3bc0
...
@@ -2033,15 +2033,17 @@ static void navigate_javascript_proc(task_t *_task)
...
@@ -2033,15 +2033,17 @@ static void navigate_javascript_proc(task_t *_task)
{
{
navigate_javascript_task_t
*
task
=
(
navigate_javascript_task_t
*
)
_task
;
navigate_javascript_task_t
*
task
=
(
navigate_javascript_task_t
*
)
_task
;
HTMLOuterWindow
*
window
=
task
->
window
;
HTMLOuterWindow
*
window
=
task
->
window
;
BSTR
code
=
NULL
;
VARIANT
v
;
VARIANT
v
;
BSTR
code
;
HRESULT
hres
;
HRESULT
hres
;
task
->
window
->
readystate
=
READYSTATE_COMPLETE
;
task
->
window
->
readystate
=
READYSTATE_COMPLETE
;
hres
=
IUri_GetPath
(
task
->
uri
,
&
code
);
hres
=
IUri_GetPath
(
task
->
uri
,
&
code
);
if
(
FAILED
(
hres
))
if
(
hres
!=
S_OK
)
{
SysFreeString
(
code
);
return
;
return
;
}
hres
=
UrlUnescapeW
(
code
,
NULL
,
NULL
,
URL_UNESCAPE_INPLACE
);
hres
=
UrlUnescapeW
(
code
,
NULL
,
NULL
,
URL_UNESCAPE_INPLACE
);
if
(
FAILED
(
hres
))
{
if
(
FAILED
(
hres
))
{
...
@@ -2109,8 +2111,8 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri)
...
@@ -2109,8 +2111,8 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri)
{
{
nsIDOMLocation
*
nslocation
;
nsIDOMLocation
*
nslocation
;
nsAString
nsfrag_str
;
nsAString
nsfrag_str
;
BSTR
frag
=
NULL
;
WCHAR
*
selector
;
WCHAR
*
selector
;
BSTR
frag
;
nsresult
nsres
;
nsresult
nsres
;
HRESULT
hres
;
HRESULT
hres
;
static
const
WCHAR
selector_formatW
[]
=
L"a[id=
\"
%s
\"
]"
;
static
const
WCHAR
selector_formatW
[]
=
L"a[id=
\"
%s
\"
]"
;
...
@@ -2122,9 +2124,10 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri)
...
@@ -2122,9 +2124,10 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri)
return
E_FAIL
;
return
E_FAIL
;
hres
=
IUri_GetFragment
(
uri
,
&
frag
);
hres
=
IUri_GetFragment
(
uri
,
&
frag
);
if
(
FAILED
(
hres
))
{
if
(
hres
!=
S_OK
)
{
SysFreeString
(
frag
);
nsIDOMLocation_Release
(
nslocation
);
nsIDOMLocation_Release
(
nslocation
);
return
hres
;
return
FAILED
(
hres
)
?
hres
:
S_OK
;
}
}
nsAString_InitDepend
(
&
nsfrag_str
,
frag
);
nsAString_InitDepend
(
&
nsfrag_str
,
frag
);
...
@@ -2236,7 +2239,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC
...
@@ -2236,7 +2239,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC
prepare_for_binding
(
&
window
->
browser
->
doc
->
basedoc
,
mon
,
flags
);
prepare_for_binding
(
&
window
->
browser
->
doc
->
basedoc
,
mon
,
flags
);
hres
=
IUri_GetScheme
(
uri
,
&
scheme
);
hres
=
IUri_GetScheme
(
uri
,
&
scheme
);
if
(
SUCCEEDED
(
hres
)
&&
scheme
==
URL_SCHEME_JAVASCRIPT
)
{
if
(
hres
==
S_OK
&&
scheme
==
URL_SCHEME_JAVASCRIPT
)
{
navigate_javascript_task_t
*
task
;
navigate_javascript_task_t
*
task
;
IBindStatusCallback_Release
(
&
bsc
->
bsc
.
IBindStatusCallback_iface
);
IBindStatusCallback_Release
(
&
bsc
->
bsc
.
IBindStatusCallback_iface
);
...
...
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