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
b1fd8dae
Commit
b1fd8dae
authored
Nov 07, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 07, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Always use navigate_fragment for fragment-only navigation in navigate_uri.
parent
176f5409
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
binding.h
dlls/mshtml/binding.h
+1
-0
navigate.c
dlls/mshtml/navigate.c
+5
-1
nsio.c
dlls/mshtml/nsio.c
+2
-2
No files found.
dlls/mshtml/binding.h
View file @
b1fd8dae
...
@@ -164,6 +164,7 @@ HRESULT read_stream(BSCallback*,IStream*,void*,DWORD,DWORD*) DECLSPEC_HIDDEN;
...
@@ -164,6 +164,7 @@ HRESULT read_stream(BSCallback*,IStream*,void*,DWORD,DWORD*) DECLSPEC_HIDDEN;
HRESULT
create_relative_uri
(
HTMLOuterWindow
*
,
const
WCHAR
*
,
IUri
**
)
DECLSPEC_HIDDEN
;
HRESULT
create_relative_uri
(
HTMLOuterWindow
*
,
const
WCHAR
*
,
IUri
**
)
DECLSPEC_HIDDEN
;
HRESULT
create_uri
(
const
WCHAR
*
,
DWORD
,
IUri
**
)
DECLSPEC_HIDDEN
;
HRESULT
create_uri
(
const
WCHAR
*
,
DWORD
,
IUri
**
)
DECLSPEC_HIDDEN
;
IUri
*
get_uri_nofrag
(
IUri
*
)
DECLSPEC_HIDDEN
;
IUri
*
get_uri_nofrag
(
IUri
*
)
DECLSPEC_HIDDEN
;
BOOL
compare_uri_ignoring_frag
(
IUri
*
uri1
,
IUri
*
uri2
)
DECLSPEC_HIDDEN
;
void
set_current_mon
(
HTMLOuterWindow
*
,
IMoniker
*
,
DWORD
)
DECLSPEC_HIDDEN
;
void
set_current_mon
(
HTMLOuterWindow
*
,
IMoniker
*
,
DWORD
)
DECLSPEC_HIDDEN
;
void
set_current_uri
(
HTMLOuterWindow
*
,
IUri
*
)
DECLSPEC_HIDDEN
;
void
set_current_uri
(
HTMLOuterWindow
*
,
IUri
*
)
DECLSPEC_HIDDEN
;
dlls/mshtml/navigate.c
View file @
b1fd8dae
...
@@ -2449,6 +2449,7 @@ HRESULT hlink_frame_navigate(HTMLDocumentObj *doc, LPCWSTR url, nsChannel *nscha
...
@@ -2449,6 +2449,7 @@ HRESULT hlink_frame_navigate(HTMLDocumentObj *doc, LPCWSTR url, nsChannel *nscha
static
HRESULT
navigate_uri
(
HTMLOuterWindow
*
window
,
IUri
*
uri
,
const
WCHAR
*
display_uri
,
const
request_data_t
*
request_data
,
static
HRESULT
navigate_uri
(
HTMLOuterWindow
*
window
,
IUri
*
uri
,
const
WCHAR
*
display_uri
,
const
request_data_t
*
request_data
,
DWORD
flags
)
DWORD
flags
)
{
{
DWORD
post_data_len
=
request_data
?
request_data
->
post_data_len
:
0
;
nsWineURI
*
nsuri
;
nsWineURI
*
nsuri
;
HRESULT
hres
;
HRESULT
hres
;
...
@@ -2458,7 +2459,6 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis
...
@@ -2458,7 +2459,6 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis
return
E_UNEXPECTED
;
return
E_UNEXPECTED
;
if
(
window
->
browser
->
doc
->
webbrowser
)
{
if
(
window
->
browser
->
doc
->
webbrowser
)
{
DWORD
post_data_len
=
request_data
?
request_data
->
post_data_len
:
0
;
void
*
post_data
=
post_data_len
?
request_data
->
post_data
:
NULL
;
void
*
post_data
=
post_data_len
?
request_data
->
post_data
:
NULL
;
const
WCHAR
*
headers
=
request_data
?
request_data
->
headers
:
NULL
;
const
WCHAR
*
headers
=
request_data
?
request_data
->
headers
:
NULL
;
...
@@ -2485,6 +2485,10 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis
...
@@ -2485,6 +2485,10 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis
return
super_navigate
(
window
,
uri
,
flags
,
headers
,
post_data
,
post_data_len
);
return
super_navigate
(
window
,
uri
,
flags
,
headers
,
post_data
,
post_data_len
);
}
}
if
(
!
(
flags
&
BINDING_NOFRAG
)
&&
window
->
uri_nofrag
&&
!
post_data_len
&&
compare_uri_ignoring_frag
(
window
->
uri_nofrag
,
uri
))
return
navigate_fragment
(
window
,
uri
);
if
(
is_main_content_window
(
window
))
{
if
(
is_main_content_window
(
window
))
{
BOOL
cancel
;
BOOL
cancel
;
...
...
dlls/mshtml/nsio.c
View file @
b1fd8dae
...
@@ -115,7 +115,7 @@ IUri *get_uri_nofrag(IUri *uri)
...
@@ -115,7 +115,7 @@ IUri *get_uri_nofrag(IUri *uri)
return
ret
;
return
ret
;
}
}
static
BOOL
compare
_ignoring_frag
(
IUri
*
uri1
,
IUri
*
uri2
)
BOOL
compare_uri
_ignoring_frag
(
IUri
*
uri1
,
IUri
*
uri2
)
{
{
IUri
*
uri_nofrag1
,
*
uri_nofrag2
;
IUri
*
uri_nofrag1
,
*
uri_nofrag2
;
BOOL
ret
=
FALSE
;
BOOL
ret
=
FALSE
;
...
@@ -3029,7 +3029,7 @@ static nsresult NSAPI nsURI_EqualsExceptRef(nsIFileURL *iface, nsIURI *other, cp
...
@@ -3029,7 +3029,7 @@ static nsresult NSAPI nsURI_EqualsExceptRef(nsIFileURL *iface, nsIURI *other, cp
}
}
if
(
ensure_uri
(
This
)
&&
ensure_uri
(
other_obj
))
{
if
(
ensure_uri
(
This
)
&&
ensure_uri
(
other_obj
))
{
*
_retval
=
compare_ignoring_frag
(
This
->
uri
,
other_obj
->
uri
);
*
_retval
=
compare_
uri_
ignoring_frag
(
This
->
uri
,
other_obj
->
uri
);
nsres
=
NS_OK
;
nsres
=
NS_OK
;
}
else
{
}
else
{
nsres
=
NS_ERROR_UNEXPECTED
;
nsres
=
NS_ERROR_UNEXPECTED
;
...
...
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