[PATCH v2 5/6] mshtml: Handle S_FALSE from IUri methods in the NSAPI interfaces.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Mostly by setting such strings to NULL, because the component does not exist.

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/nsio.c | 54 ++++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index f1859e2a383..ac003491959 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -168,6 +168,11 @@ static nsresult return_wstr_nsacstr(nsACString *ret_str, const WCHAR *str, int l

TRACE("returning %s\n", debugstr_wn(str, len));

+    if(!str) {
+        nsACString_SetData(ret_str, NULL);
+        return NS_OK;
+    }
+
     if(!*str) {
         nsACString_SetData(ret_str, "");
         return NS_OK;
@@ -236,7 +241,7 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, BSTR url)
 static nsresult before_async_open(nsChannel *channel, GeckoBrowser *container, BOOL *cancel)
 {
     HTMLDocumentObj *doc = container->doc;
-    BSTR display_uri;
+    BSTR display_uri = NULL;
     HRESULT hres;

if(!doc->client) {
@@ -245,8 +250,10 @@ static nsresult before_async_open(nsChannel *channel, GeckoBrowser *container, B
     }

hres = IUri_GetDisplayUri(channel->uri->uri, &display_uri);
-    if(FAILED(hres))
+    if(hres != S_OK) {
+        SysFreeString(display_uri);
         return NS_ERROR_FAILURE;
+    }

if(doc->hostui) {
         OLECHAR *new_url;
@@ -1255,10 +1262,10 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI
         return NS_ERROR_UNEXPECTED;
     }

-    if(!ensure_uri(This->uri) || FAILED(IUri_GetScheme(This->uri->uri, &channel_scheme)))
+    if(!ensure_uri(This->uri) || IUri_GetScheme(This->uri->uri, &channel_scheme) != S_OK)
         channel_scheme = INTERNET_SCHEME_UNKNOWN;

-    if(FAILED(IUri_GetScheme(referrer->uri, &referrer_scheme)))
+    if(IUri_GetScheme(referrer->uri, &referrer_scheme) != S_OK)
         referrer_scheme = INTERNET_SCHEME_UNKNOWN;

if(referrer_scheme == INTERNET_SCHEME_HTTPS && channel_scheme != INTERNET_SCHEME_HTTPS) {
@@ -1269,7 +1276,8 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI

hres = IUri_GetDisplayUri(referrer->uri, &referrer_uri);
     if(SUCCEEDED(hres)) {
-        set_http_header(&This->request_headers, refererW, ARRAY_SIZE(refererW), referrer_uri, SysStringLen(referrer_uri));
+        if(hres == S_OK)
+            set_http_header(&This->request_headers, refererW, ARRAY_SIZE(refererW), referrer_uri, SysStringLen(referrer_uri));
         SysFreeString(referrer_uri);
     }

@@ -2291,9 +2299,9 @@ static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *r
         return NS_ERROR_UNEXPECTED;
     }

-    vala = heap_strdupWtoU(val);
+    vala = heap_strdupWtoU(hres == S_OK ? val : NULL);
     SysFreeString(val);
-    if(!vala)
+    if(hres == S_OK && !vala)
         return NS_ERROR_OUT_OF_MEMORY;

TRACE("ret %s\n", debugstr_a(vala));
@@ -2652,7 +2660,7 @@ static nsresult NSAPI nsURI_SetPassword(nsIFileURL *iface, const nsACString *aPa
 static nsresult NSAPI nsURI_GetHostPort(nsIFileURL *iface, nsACString *aHostPort)
 {
     nsWineURI *This = impl_from_nsIFileURL(iface);
-    const WCHAR *ptr;
+    const WCHAR *ptr = NULL;
     char *vala;
     BSTR val;
     HRESULT hres;
@@ -2668,13 +2676,14 @@ static nsresult NSAPI nsURI_GetHostPort(nsIFileURL *iface, nsACString *aHostPort
         return NS_ERROR_UNEXPECTED;
     }

-    ptr = wcschr(val, '@');
-    if(!ptr)
-        ptr = val;
-
+    if(hres == S_OK) {
+        ptr = wcschr(val, '@');
+        if(!ptr)
+            ptr = val;
+    }
     vala = heap_strdupWtoU(ptr);
     SysFreeString(val);
-    if(!vala)
+    if(hres == S_OK && !vala)
         return NS_ERROR_OUT_OF_MEMORY;

TRACE("ret %s\n", debugstr_a(vala));
@@ -2846,8 +2855,12 @@ static nsresult NSAPI nsURI_SchemeIs(nsIFileURL *iface, const char *scheme, cpp_
     if(FAILED(hres))
         return NS_ERROR_UNEXPECTED;

-    MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, ARRAY_SIZE(buf));
-    *_retval = !wcscmp(scheme_name, buf);
+    if(hres != S_OK)
+        *_retval = FALSE;
+    else {
+        MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, ARRAY_SIZE(buf));
+        *_retval = !wcscmp(scheme_name, buf);
+    }
     SysFreeString(scheme_name);
     return NS_OK;
 }
@@ -2904,9 +2917,9 @@ static nsresult NSAPI nsURI_Resolve(nsIFileURL *iface, const nsACString *aRelati
     if(FAILED(hres))
         return NS_ERROR_FAILURE;

-    reta = heap_strdupWtoU(ret);
+    reta = heap_strdupWtoU(hres == S_OK ? ret : NULL);
     SysFreeString(ret);
-    if(!reta)
+    if(hres == S_OK && !reta)
         return NS_ERROR_OUT_OF_MEMORY;

TRACE("returning %s\n", debugstr_a(reta));
@@ -3167,6 +3180,11 @@ static nsresult get_uri_path(nsWineURI *This, BSTR *path, const WCHAR **file, co
     hres = IUri_GetPath(This->uri, path);
     if(FAILED(hres))
         return NS_ERROR_FAILURE;
+    if(hres != S_OK) {
+        SysFreeString(*path);
+        *ext = *file = *path = NULL;
+        return NS_OK;
+    }

for(ptr = *path + SysStringLen(*path)-1; ptr > *path && *ptr != '/' && *ptr != '\'; ptr--);
     if(*ptr == '/' || *ptr == '\')
@@ -3458,7 +3476,7 @@ static nsresult create_nsuri(IUri *iuri, nsWineURI **_retval)
     ret->uri = iuri;

hres = IUri_GetScheme(iuri, &ret->scheme);
-    if(FAILED(hres))
+    if(hres != S_OK)
         ret->scheme = URL_SCHEME_UNKNOWN;

TRACE("retval=%p\n", ret);