Jacek Caban : mshtml: Report true scheme for about:blank URL.

Alexandre Julliard julliard at winehq.org
Thu Feb 21 07:42:25 CST 2008


Module: wine
Branch: master
Commit: 2f046e96235d5c8ae985f595a171932b2409a8ab
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2f046e96235d5c8ae985f595a171932b2409a8ab

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Feb 20 21:31:07 2008 +0100

mshtml: Report true scheme for about:blank URL.

---

 dlls/mshtml/nsio.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 89fe6ec..3517a27 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -48,6 +48,8 @@ static const IID NS_IOSERVICE_CID =
 
 static nsIIOService *nsio = NULL;
 
+static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0};
+
 typedef struct {
     const nsIWineURIVtbl *lpWineURIVtbl;
 
@@ -593,7 +595,7 @@ static BOOL do_load_from_moniker_hack(nsChannel *This)
         const char *scheme;
 
         nsACString_GetData(&scheme_str, &scheme);
-        ret = !strcmp(scheme, "wine");
+        ret = !strcmp(scheme, "wine") || !strcmp(scheme, "about");
     }
 
     nsACString_Finish(&scheme_str);
@@ -1264,7 +1266,7 @@ static nsresult NSAPI nsURI_GetScheme(nsIWineURI *iface, nsACString *aScheme)
 
     TRACE("(%p)->(%p)\n", This, aScheme);
 
-    if(This->use_wine_url) {
+    if(This->use_wine_url && strcmpW(This->wine_url, about_blankW)) {
         /*
          * For Gecko we set scheme to unknown so it won't be handled
          * as any special case.




More information about the wine-cvs mailing list