Piotr Caban : jscript: Fixed Object.toLocaleString implementation.

[Alexandre Julliard]

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

Author: Piotr Caban 
Date:   Wed Aug 12 12:48:58 2009 +0200

jscript: Fixed Object.toLocaleString implementation.

---

dlls/jscript/dispex.c     |   17 +++++++++++++++++
 dlls/jscript/jscript.h    |    1 +
 dlls/jscript/object.c     |    5 ++++-
 dlls/jscript/tests/api.js |    8 ++++++++
 4 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 509fb50..12fcb3a 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -844,6 +844,23 @@ HRESULT jsdisp_call(DispatchEx *disp, DISPID id, LCID lcid, WORD flags, DISPPARA
     return invoke_prop_func(disp, disp, prop, lcid, flags, dp, retv, ei, caller);
 }

+HRESULT jsdisp_call_name(DispatchEx *disp, const WCHAR *name, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv,
+        jsexcept_t *ei, IServiceProvider *caller)
+{
+    dispex_prop_t *prop;
+    HRESULT hres;
+
+    hres = find_prop_name_prot(disp, name, TRUE, &prop);
+    if(FAILED(hres))
+        return hres;
+
+    memset(ei, 0, sizeof(*ei));
+    if(retv)
+        V_VT(retv) = VT_EMPTY;
+
+    return invoke_prop_func(disp, disp, prop, lcid, flags, dp, retv, ei, caller);
+}
+
 HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv,
         jsexcept_t *ei, IServiceProvider *caller)
 {
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index a585b4f..bd7e711 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -131,6 +131,7 @@ DispatchEx *iface_to_jsdisp(IUnknown*);
 HRESULT disp_call(IDispatch*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*);
 HRESULT jsdisp_call_value(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*);
 HRESULT jsdisp_call(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*);
+HRESULT jsdisp_call_name(DispatchEx*,const WCHAR*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*);
 HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*);
 HRESULT disp_propput(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*);
 HRESULT jsdisp_propget(DispatchEx*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*);
diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c
index 737230a..f5ce564 100644
--- a/dlls/jscript/object.c
+++ b/dlls/jscript/object.c
@@ -74,8 +74,11 @@ static HRESULT Object_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA
 static HRESULT Object_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
         VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
 {
+    DISPPARAMS params = {NULL, NULL, 0, 0};
+
     TRACE("\n");
-    return Object_toString(dispex, lcid, flags, dp, retv, ei, sp);
+
+    return jsdisp_call_name(dispex, toStringW, lcid, DISPATCH_METHOD, &params, retv, ei, sp);
 }

static HRESULT Object_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index 88df15a..f0719f5 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -77,6 +77,14 @@ ok(tmp.f() === "[object RegExp]", "tmp.f() = " + tmp.f());
 (tmp = new String).f = Object.prototype.toString;
 ok(tmp.f() === "[object String]", "tmp.f() = " + tmp.f());

+var obj = new Object();
+obj.toString = function (x) {
+    ok(arguments.length === 0, "arguments.length = " + arguments.length);
+    return "test";
+};
+ok((tmp = obj.toLocaleString()) === "test", "obj.toLocaleString() = " + tmp);
+ok((tmp = obj.toLocaleString(1)) === "test", "obj.toLocaleString(1) = " + tmp);
+
 ok("".length === 0, """.length = " + "".length);
 ok(getVT("".length) == "VT_I4", """.length = " + "".length);
 ok("abc".length === 3, ""abc".length = " + "abc".length);