Hans Leidekker : ieframe: Never pass a NULL string pointer with DISPID_STATUSTEXTCHANGE.

[Alexandre Julliard]

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

Author: Hans Leidekker 
Date:   Fri Jul 17 12:36:07 2015 +0200

ieframe: Never pass a NULL string pointer with DISPID_STATUSTEXTCHANGE.

---

dlls/ieframe/navigate.c         | 2 +-
 dlls/ieframe/tests/webbrowser.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c
index 2eaf200..b1753a6 100644
--- a/dlls/ieframe/navigate.c
+++ b/dlls/ieframe/navigate.c
@@ -115,7 +115,7 @@ static void set_status_text(BindStatusCallback *This, ULONG statuscode, LPCWSTR
     }

V_VT(&arg) = VT_BSTR;
-    V_BSTR(&arg) = str ? SysAllocString(buffer) : NULL;
+    V_BSTR(&arg) = str ? SysAllocString(buffer) : SysAllocString(emptyW);
     TRACE("=> %s\n", debugstr_w(V_BSTR(&arg)));

call_sink(This->doc_host->cps.wbe2, DISPID_STATUSTEXTCHANGE, &dispparams);
diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c
index 4d3ab24..a70428f 100644
--- a/dlls/ieframe/tests/webbrowser.c
+++ b/dlls/ieframe/tests/webbrowser.c
@@ -833,6 +833,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe
         ok(pDispParams->cArgs == 1, "cArgs=%d, expected 1\n", pDispParams->cArgs);
         ok(V_VT(pDispParams->rgvarg) == VT_BSTR, "V_VT(pDispParams->rgvarg)=%d, expected VT_BSTR\n",
            V_VT(pDispParams->rgvarg));
+        ok(V_BSTR(pDispParams->rgvarg) != NULL, "V_BSTR(pDispParams->rgvarg) is NULL\n");
         /* TODO: Check text */
         break;