[PATCH v2 6/6] mshtml: Handle S_FALSE return values from IUri methods.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/main.c       | 6 ++++--
 dlls/mshtml/persist.c    | 3 ++-
 dlls/mshtml/pluginhost.c | 3 ++-
 dlls/mshtml/script.c     | 8 +++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index 1a64bdb9b7d..26c689ea016 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -215,7 +215,7 @@ compat_mode_t get_max_compat_mode(IUri *uri)
 {
     compat_config_t *iter;
     size_t len, iter_len;
-    BSTR host;
+    BSTR host = NULL;
     HRESULT hres;

static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT;
@@ -224,8 +224,10 @@ compat_mode_t get_max_compat_mode(IUri *uri)
     if(!uri)
         return global_max_compat_mode;
     hres = IUri_GetHost(uri, &host);
-    if(FAILED(hres))
+    if(hres != S_OK) {
+        SysFreeString(host);
         return global_max_compat_mode;
+    }
     len = SysStringLen(host);

LIST_FOR_EACH_ENTRY(iter, &compat_config, compat_config_t, entry) {
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 73f255e753d..49e78ecfbc2 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -1176,7 +1176,8 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L
         if (FAILED(hres))
             return hres;

-        ShellExecuteW(NULL, L"open", uri, NULL, NULL, SW_SHOW);
+        if(hres == S_OK)
+            ShellExecuteW(NULL, L"open", uri, NULL, NULL, SW_SHOW);
         SysFreeString(uri);
         return S_OK;
     }
diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c
index 043f9bad3a0..aea9efa1995 100644
--- a/dlls/mshtml/pluginhost.c
+++ b/dlls/mshtml/pluginhost.c
@@ -2571,7 +2571,8 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem)

hres = IUri_GetDisplayUri(uri, &display_uri);
         if(SUCCEEDED(hres)) {
-            install_codebase(display_uri);
+            if(hres == S_OK)
+                install_codebase(display_uri);
             SysFreeString(display_uri);
         }
     }
diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c
index 769ca72db6f..e7e84ab2366 100644
--- a/dlls/mshtml/script.c
+++ b/dlls/mshtml/script.c
@@ -1123,7 +1123,7 @@ HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src, BOOL async

hres = IUri_GetScheme(uri, &bsc->scheme);
     IUri_Release(uri);
-    if(FAILED(hres))
+    if(hres != S_OK)
         bsc->scheme = URL_SCHEME_UNKNOWN;

IHTMLScriptElement_AddRef(&script_elem->IHTMLScriptElement_iface);
@@ -1707,13 +1707,15 @@ static BOOL is_jscript_available(void)

static BOOL use_gecko_script(IUri *uri)
 {
-    BSTR display_uri;
+    BSTR display_uri = NULL;
     DWORD zone;
     HRESULT hres;

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

hres = IInternetSecurityManager_MapUrlToZone(get_security_manager(), display_uri, &zone, 0);
     if(FAILED(hres)) {