Module: wine Branch: master Commit: 892be572cbf3724b92e6a4d2545b6fd0f94d258c URL: https://source.winehq.org/git/wine.git/?a=commit;h=892be572cbf3724b92e6a4d25...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Mar 14 14:13:06 2019 +0100
mshtml: Access document object via browser object in nsIChannel::AsyncOpen.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mshtml/nsio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7a1d204..9b9e575 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1063,17 +1063,17 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen cancel = TRUE; }
- if(window == window->doc_obj->basedoc.window) { + if(is_main_content_window(window)) { if(!This->uri->channel_bsc) { /* top window navigation initiated by Gecko */ - nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); + nsres = before_async_open(This, window->browser, &cancel); if(NS_SUCCEEDED(nsres) && cancel) { TRACE("canceled\n"); nsres = NS_BINDING_ABORTED; } - }else if(window->doc_obj->mime) { + }else if(window->browser->doc->mime) { heap_free(This->content_type); - This->content_type = heap_strdupWtoA(window->doc_obj->mime); + This->content_type = heap_strdupWtoA(window->browser->doc->mime); } } }