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
3296a18c
Commit
3296a18c
authored
Jul 25, 2017
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Always create load info object in load_nsuri.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
fcd136e1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
11 deletions
+10
-11
nsio.c
dlls/mshtml/nsio.c
+10
-11
No files found.
dlls/mshtml/nsio.c
View file @
3296a18c
...
...
@@ -270,8 +270,8 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO
HRESULT
load_nsuri
(
HTMLOuterWindow
*
window
,
nsWineURI
*
uri
,
nsIInputStream
*
post_stream
,
nsChannelBSC
*
channelbsc
,
DWORD
flags
)
{
nsIDocShellLoadInfo
*
load_info
=
NULL
;
nsIWebNavigation
*
web_navigation
;
nsIDocShellLoadInfo
*
load_info
;
nsIDocShell
*
doc_shell
;
HTMLDocumentNode
*
doc
;
nsresult
nsres
;
...
...
@@ -289,16 +289,16 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post
return
E_FAIL
;
}
if
(
post_stream
)
{
nsres
=
nsIDocShell_CreateLoadInfo
(
doc_shell
,
&
load_info
);
if
(
NS_FAILED
(
nsres
))
{
nsIDocShell_Release
(
doc_shell
);
return
E_FAIL
;
}
nsres
=
nsIDocShell_CreateLoadInfo
(
doc_shell
,
&
load_info
);
if
(
NS_FAILED
(
nsres
))
{
nsIDocShell_Release
(
doc_shell
);
return
E_FAIL
;
}
nsres
=
nsIDocShellLoadInfo_SetLoadType
(
load_info
,
(
flags
&
LOAD_FLAGS_BYPASS_CACHE
)
?
loadNormalBypassCache
:
loadNormal
);
assert
(
nsres
==
NS_OK
);
nsres
=
nsIDocShellLoadInfo_SetLoadType
(
load_info
,
(
flags
&
LOAD_FLAGS_BYPASS_CACHE
)
?
loadNormalBypassCache
:
loadNormal
);
assert
(
nsres
==
NS_OK
);
if
(
post_stream
)
{
nsres
=
nsIDocShellLoadInfo_SetPostDataStream
(
load_info
,
post_stream
);
assert
(
nsres
==
NS_OK
);
}
...
...
@@ -311,8 +311,7 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post
doc
->
skip_mutation_notif
=
FALSE
;
uri
->
channel_bsc
=
NULL
;
nsIDocShell_Release
(
doc_shell
);
if
(
load_info
)
nsIDocShellLoadInfo_Release
(
load_info
);
nsIDocShellLoadInfo_Release
(
load_info
);
if
(
NS_FAILED
(
nsres
))
{
WARN
(
"LoadURI failed: %08x
\n
"
,
nsres
);
return
E_FAIL
;
...
...
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