Jacek Caban : mshtml:
Fixed AsyncOpen implementation for channels without associated
document.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri May 25 14:43:28 CDT 2007
Module: wine
Branch: master
Commit: de2e9e13ce839d251f495afc8bc75685f2f47496
URL: http://source.winehq.org/git/wine.git/?a=commit;h=de2e9e13ce839d251f495afc8bc75685f2f47496
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu May 24 19:15:22 2007 +0200
mshtml: Fixed AsyncOpen implementation for channels without associated document.
---
dlls/mshtml/nsio.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index a47bb1d..601a300 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -647,7 +647,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
if(do_load_from_moniker_hack(This))
return WINE_NS_LOAD_FROM_MONIKER;
- }else if(container->doc) {
+ }else {
BOOL cont = before_async_open(This, container);
nsIWebBrowserChrome_Release(NSWBCHROME(container));
@@ -655,11 +655,11 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
TRACE("canceled\n");
return NS_ERROR_UNEXPECTED;
}
- }else {
- nsIWebBrowserChrome_Release(NSWBCHROME(container));
- return This->channel
- ? nsIChannel_AsyncOpen(This->channel, aListener, aContext)
- : NS_ERROR_UNEXPECTED;
+
+ if(!container->doc)
+ return This->channel
+ ? nsIChannel_AsyncOpen(This->channel, aListener, aContext)
+ : NS_ERROR_UNEXPECTED;
}
}
@@ -1567,7 +1567,7 @@ static nsresult NSAPI nsURI_SetNSContainer(nsIWineURI *iface, NSContainer *aCont
if(This->container) {
if(This->container == aContainer)
return NS_OK;
- WARN("Container already set: %p\n", This->container);
+ TRACE("Changing %p -> %p\n", This->container, aContainer);
nsIWebBrowserChrome_Release(NSWBCHROME(This->container));
}
More information about the wine-cvs
mailing list