Piotr Caban : jscript: Add Error_message implementation.
Alexandre Julliard
julliard at winehq.org
Tue Jul 21 09:34:04 CDT 2009
Module: wine
Branch: master
Commit: f17b1f6334d2412b8c1d90fd6697a1c921d20fd5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17b1f6334d2412b8c1d90fd6697a1c921d20fd5
Author: Piotr Caban <piotr.caban at gmail.com>
Date: Mon Jul 20 18:17:54 2009 +0200
jscript: Add Error_message implementation.
---
dlls/jscript/error.c | 15 +++++++++++++--
dlls/jscript/tests/api.js | 7 +++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c
index 40228d4..4ae52cf 100644
--- a/dlls/jscript/error.c
+++ b/dlls/jscript/error.c
@@ -39,8 +39,19 @@ static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','
static HRESULT Error_message(DispatchEx *dispex, LCID lcid, WORD flags,
DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{
- FIXME("\n");
- return E_NOTIMPL;
+ ErrorInstance *This = (ErrorInstance*)dispex;
+
+ TRACE("\n");
+
+ switch(flags) {
+ case DISPATCH_PROPERTYGET:
+ return VariantCopy(retv, &This->message);
+ case DISPATCH_PROPERTYPUT:
+ return VariantCopy(&This->message, get_arg(dp, 0));
+ default:
+ FIXME("unimplemented flags %x\n", flags);
+ return E_NOTIMPL;
+ }
}
static HRESULT Error_toString(DispatchEx *dispex, LCID lcid, WORD flags,
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index a82931e..f2387b5 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -1252,9 +1252,14 @@ err = new Error();
ok(err.valueOf === Object.prototype.valueOf, "err.valueOf !== Object.prototype.valueOf");
ok(Error.prototype.name === "Error", "Error.prototype.name = " + Error.prototype.name);
ok(err.name === "Error", "err.name = " + err.name);
+EvalError.prototype.message = "test";
err = new EvalError();
ok(EvalError.prototype.name === "EvalError", "EvalError.prototype.name = " + EvalError.prototype.name);
ok(err.name === "EvalError", "err.name = " + err.name);
+ok(err.toString === Error.prototype.toString, "err.toString !== Error.prototype.toString");
+ok(err.message === "", "err.message != ''");
+err.message = date;
+ok(err.message === date, "err.message != date");
err = new RangeError();
ok(RangeError.prototype.name === "RangeError", "RangeError.prototype.name = " + RangeError.prototype.name);
ok(err.name === "RangeError", "err.name = " + err.name);
@@ -1270,5 +1275,7 @@ ok(err.name === "TypeError", "err.name = " + err.name);
err = new URIError();
ok(URIError.prototype.name === "URIError", "URIError.prototype.name = " + URIError.prototype.name);
ok(err.name === "URIError", "err.name = " + err.name);
+err = new Error("message");
+ok(err.message === "message", "err.message !== 'message'");
reportSuccess();
More information about the wine-cvs
mailing list