Jacek Caban : mshtml: Get rid of no longer needed is_doc_uri from nsWineURI.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9c8162dba22442fdf1e12ceace88a955f43c37e9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9c8162dba22442fdf1e12ceac...

Author: Jacek Caban 
Date:   Fri Mar  8 13:49:19 2019 +0100

mshtml: Get rid of no longer needed is_doc_uri from nsWineURI.

Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard

---

dlls/mshtml/binding.h |  1 -
 dlls/mshtml/nsembed.c |  7 +------
 dlls/mshtml/nsio.c    | 31 +------------------------------
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h
index b7b6556..accf468 100644
--- a/dlls/mshtml/binding.h
+++ b/dlls/mshtml/binding.h
@@ -136,7 +136,6 @@ typedef struct {
 HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN;
 HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN;

-nsresult on_start_uri_open(NSContainer*,nsIURI*,cpp_bool*) DECLSPEC_HIDDEN;
 HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN;
 HRESULT create_doc_uri(IUri*,nsWineURI**) DECLSPEC_HIDDEN;
 HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsIInputStream*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN;
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 5f6c046..aa081ee 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -1612,7 +1612,6 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
     NSContainer *This = impl_from_nsIURIContentListener(iface);
     nsACString spec_str;
     const char *spec;
-    nsresult nsres;

nsACString_Init(&spec_str, NULL);
     nsIURI_GetSpec(aURI, &spec_str);
@@ -1622,11 +1621,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener

nsACString_Finish(&spec_str);

-    nsres = on_start_uri_open(This, aURI, _retval);
-    if(NS_FAILED(nsres))
-        return nsres;
-
-    return !*_retval && This->content_listener
+    return This->content_listener
         ? nsIURIContentListener_OnStartURIOpen(This->content_listener, aURI, _retval)
         : NS_OK;
 }
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 9bb1892..436f9bf 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -61,7 +61,6 @@ struct  nsWineURI {
     IUri *uri;
     IUriBuilder *uri_builder;
     char *origin_charset;
-    BOOL is_doc_uri;
     BOOL is_mutable;
     DWORD scheme;
 };
@@ -3376,17 +3375,7 @@ static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI *

HRESULT create_doc_uri(IUri *iuri, nsWineURI **ret)
 {
-    nsWineURI *uri;
-    nsresult nsres;
-
-    nsres = create_nsuri(iuri, NULL, &uri);
-    if(NS_FAILED(nsres))
-        return E_FAIL;
-
-    uri->is_doc_uri = TRUE;
-
-    *ret = uri;
-    return S_OK;
+    return create_nsuri(iuri, NULL, ret);
 }

static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret)
@@ -3873,24 +3862,6 @@ static const nsIIOServiceHookVtbl nsIOServiceHookVtbl = {

static nsIIOServiceHook nsIOServiceHook = { &nsIOServiceHookVtbl };

-nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_retval)
-{
-    nsWineURI *wine_uri;
-    nsresult nsres;
-
-    *_retval = FALSE;
-
-    nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri);
-    if(NS_FAILED(nsres)) {
-        WARN("Could not get nsWineURI: %08x\n", nsres);
-        return NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    wine_uri->is_doc_uri = TRUE;
-    nsIFileURL_Release(&wine_uri->nsIFileURL_iface);
-    return NS_OK;
-}
-
 void init_nsio(nsIComponentManager *component_manager)
 {
     nsIFactory *old_factory = NULL;