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
2678126f
Commit
2678126f
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 load_flags instead of is_doc_uri in nsChannel implementation.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a1e117b7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
nsio.c
dlls/mshtml/nsio.c
+6
-4
No files found.
dlls/mshtml/nsio.c
View file @
2678126f
...
@@ -806,7 +806,7 @@ static nsresult NSAPI nsChannel_GetContentType(nsIHttpChannel *iface, nsACString
...
@@ -806,7 +806,7 @@ static nsresult NSAPI nsChannel_GetContentType(nsIHttpChannel *iface, nsACString
return
S_OK
;
return
S_OK
;
}
}
if
(
This
->
uri
->
is_doc_uri
)
{
if
(
This
->
load_flags
&
LOAD_DOCUMENT_URI
)
{
WARN
(
"Document channel with no MIME set. Assuming text/html
\n
"
);
WARN
(
"Document channel with no MIME set. Assuming text/html
\n
"
);
nsACString_SetData
(
aContentType
,
"text/html"
);
nsACString_SetData
(
aContentType
,
"text/html"
);
return
S_OK
;
return
S_OK
;
...
@@ -1074,6 +1074,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
...
@@ -1074,6 +1074,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
{
{
nsChannel
*
This
=
impl_from_nsIHttpChannel
(
iface
);
nsChannel
*
This
=
impl_from_nsIHttpChannel
(
iface
);
HTMLOuterWindow
*
window
=
NULL
;
HTMLOuterWindow
*
window
=
NULL
;
BOOL
is_document_channel
;
BOOL
cancel
=
FALSE
;
BOOL
cancel
=
FALSE
;
nsresult
nsres
=
NS_OK
;
nsresult
nsres
=
NS_OK
;
...
@@ -1095,7 +1096,8 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
...
@@ -1095,7 +1096,8 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
}
}
}
}
if
(
This
->
uri
->
is_doc_uri
)
{
is_document_channel
=
!!
(
This
->
load_flags
&
LOAD_DOCUMENT_URI
);
if
(
is_document_channel
)
{
window
=
get_channel_window
(
This
);
window
=
get_channel_window
(
This
);
if
(
window
)
if
(
window
)
set_uri_window
(
This
->
uri
,
window
);
set_uri_window
(
This
->
uri
,
window
);
...
@@ -1121,7 +1123,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
...
@@ -1121,7 +1123,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
return
NS_ERROR_UNEXPECTED
;
return
NS_ERROR_UNEXPECTED
;
}
}
if
(
This
->
uri
->
is_doc_uri
&&
window
==
window
->
doc_obj
->
basedoc
.
window
)
{
if
(
is_document_channel
&&
window
==
window
->
doc_obj
->
basedoc
.
window
)
{
if
(
This
->
uri
->
channel_bsc
)
{
if
(
This
->
uri
->
channel_bsc
)
{
channelbsc_set_channel
(
This
->
uri
->
channel_bsc
,
This
,
aListener
,
aContext
);
channelbsc_set_channel
(
This
->
uri
->
channel_bsc
,
This
,
aListener
,
aContext
);
...
@@ -1141,7 +1143,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
...
@@ -1141,7 +1143,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
}
}
if
(
!
cancel
)
if
(
!
cancel
)
nsres
=
async_open
(
This
,
window
,
This
->
uri
->
is_doc_uri
,
aListener
,
aContext
);
nsres
=
async_open
(
This
,
window
,
is_document_channel
,
aListener
,
aContext
);
if
(
NS_SUCCEEDED
(
nsres
)
&&
This
->
load_group
)
{
if
(
NS_SUCCEEDED
(
nsres
)
&&
This
->
load_group
)
{
nsres
=
nsILoadGroup_AddRequest
(
This
->
load_group
,
(
nsIRequest
*
)
&
This
->
nsIHttpChannel_iface
,
nsres
=
nsILoadGroup_AddRequest
(
This
->
load_group
,
(
nsIRequest
*
)
&
This
->
nsIHttpChannel_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