Jacek Caban : mshtml: Fix loading pages in containers without
document.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Dec 14 07:03:44 CST 2006
Module: wine
Branch: master
Commit: d8a761c0ab5a93c6bc822a5c56c1f5e5ecbc44c4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a761c0ab5a93c6bc822a5c56c1f5e5ecbc44c4
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Dec 14 00:20:34 2006 +0100
mshtml: Fix loading pages in containers without document.
---
dlls/mshtml/nsio.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 3c4b04e..122b599 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -636,7 +636,7 @@ static nsresult NSAPI nsChannel_AsyncOpe
return WINE_NS_LOAD_FROM_MONIKER;
}
- }else {
+ }else if(container->doc) {
BOOL cont = before_async_open(This, container);
nsIWebBrowserChrome_Release(NSWBCHROME(container));
@@ -644,6 +644,11 @@ static nsresult NSAPI nsChannel_AsyncOpe
TRACE("canceled\n");
return NS_ERROR_UNEXPECTED;
}
+ }else {
+ nsIWebBrowserChrome_Release(NSWBCHROME(container));
+ return This->channel
+ ? nsIChannel_AsyncOpen(This->channel, aListener, aContext)
+ : NS_ERROR_UNEXPECTED;
}
}
More information about the wine-cvs
mailing list