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
73cca44b
Commit
73cca44b
authored
Mar 08, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use channel_bsc from URI for child documents as well.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
fc66d0ec
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
nsio.c
dlls/mshtml/nsio.c
+12
-10
No files found.
dlls/mshtml/nsio.c
View file @
73cca44b
...
...
@@ -1045,22 +1045,24 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
is_document_channel
=
!!
(
This
->
load_flags
&
LOAD_DOCUMENT_URI
);
if
(
is_document_channel
&&
window
==
window
->
doc_obj
->
basedoc
.
window
)
{
if
(
is_document_channel
)
{
if
(
This
->
uri
->
channel_bsc
)
{
channelbsc_set_channel
(
This
->
uri
->
channel_bsc
,
This
,
aListener
,
aContext
);
cancel
=
TRUE
;
}
if
(
window
->
doc_obj
->
mime
)
{
if
(
window
==
window
->
doc_obj
->
basedoc
.
window
)
{
if
(
!
This
->
uri
->
channel_bsc
)
{
/* top window navigation initiated by Gecko */
nsres
=
before_async_open
(
This
,
window
->
doc_obj
->
nscontainer
,
&
cancel
);
if
(
NS_SUCCEEDED
(
nsres
)
&&
cancel
)
{
TRACE
(
"canceled
\n
"
);
nsres
=
NS_BINDING_ABORTED
;
}
}
else
if
(
window
->
doc_obj
->
mime
)
{
heap_free
(
This
->
content_type
);
This
->
content_type
=
heap_strdupWtoA
(
window
->
doc_obj
->
mime
);
}
cancel
=
TRUE
;
}
else
{
nsres
=
before_async_open
(
This
,
window
->
doc_obj
->
nscontainer
,
&
cancel
);
if
(
NS_SUCCEEDED
(
nsres
)
&&
cancel
)
{
TRACE
(
"canceled
\n
"
);
nsres
=
NS_BINDING_ABORTED
;
}
}
}
...
...
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