Jacek Caban : jscript: Fixed to_primitive for null dispatch.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Fri Sep 11 18:47:50 2009 +0200

jscript: Fixed to_primitive for null dispatch.

---

 dlls/jscript/jsutils.c     |    5 +++++
 dlls/jscript/tests/lang.js |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c
index 5d56661..a51518c 100644
--- a/dlls/jscript/jsutils.c
+++ b/dlls/jscript/jsutils.c
@@ -198,6 +198,11 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret
         static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0};
         static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0};
 
+        if(!V_DISPATCH(v)) {
+            V_VT(ret) = VT_NULL;
+            break;
+        }
+
         jsdisp = iface_to_jsdisp((IUnknown*)V_DISPATCH(v));
         if(!jsdisp) {
             V_VT(ret) = VT_EMPTY;
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 342f3e9..08caa73 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -942,6 +942,7 @@ ok(nullDisp == null, "nullDisp == null");
 ok(getVT(true && nullDisp) === "VT_DISPATCH",
    "getVT(0 && nullDisp) = " + getVT(true && nullDisp));
 ok(!nullDisp === true, "!nullDisp = " + !nullDisp);
+ok(String(nullDisp) === "null", "String(nullDisp) = " + String(nullDisp));
 
 function do_test() {}
 function nosemicolon() {} nosemicolon();