ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Jacek Caban 2017-07-25 15:30:44 +02:00 committed by Alexandre Julliard
parent fcd136e1a2
commit 3296a18c3e
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/mshtml/nsio.c
View File

@ -270,8 +270,8 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO
HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post_stream, HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post_stream,
nsChannelBSC *channelbsc, DWORD flags) nsChannelBSC *channelbsc, DWORD flags)
{ {
nsIDocShellLoadInfo *load_info = NULL;
nsIWebNavigation *web_navigation; nsIWebNavigation *web_navigation;
nsIDocShellLoadInfo *load_info;
nsIDocShell *doc_shell; nsIDocShell *doc_shell;
HTMLDocumentNode *doc; HTMLDocumentNode *doc;
nsresult nsres; nsresult nsres;
@ -289,16 +289,16 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post
return E_FAIL; 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);
if(post_stream) { if(post_stream) {
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_SetPostDataStream(load_info, post_stream); nsres = nsIDocShellLoadInfo_SetPostDataStream(load_info, post_stream);
assert(nsres == NS_OK); assert(nsres == NS_OK);
} }
@ -311,8 +311,7 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post
doc->skip_mutation_notif = FALSE; doc->skip_mutation_notif = FALSE;
uri->channel_bsc = NULL; uri->channel_bsc = NULL;
nsIDocShell_Release(doc_shell); nsIDocShell_Release(doc_shell);
if(load_info) nsIDocShellLoadInfo_Release(load_info);
nsIDocShellLoadInfo_Release(load_info);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
WARN("LoadURI failed: %08x\n", nsres); WARN("LoadURI failed: %08x\n", nsres);
return E_FAIL; return E_FAIL;