Piotr Caban : jscript: Added implementation of Math_log.
Alexandre Julliard
julliard at winehq.org
Wed May 27 09:26:52 CDT 2009
Module: wine
Branch: master
Commit: f57f3aa2f430d2e4e0f984a6be619c797be71423
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57f3aa2f430d2e4e0f984a6be619c797be71423
Author: Piotr Caban <piotr.caban at gmail.com>
Date: Wed May 27 01:09:56 2009 +0200
jscript: Added implementation of Math_log.
---
dlls/jscript/math.c | 20 ++++++++++++++++++--
dlls/jscript/tests/api.js | 24 ++++++++++++++++++++++++
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c
index 0253111..9b41385 100644
--- a/dlls/jscript/math.c
+++ b/dlls/jscript/math.c
@@ -337,8 +337,24 @@ static HRESULT Math_floor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS
static HRESULT Math_log(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{
- FIXME("\n");
- return E_NOTIMPL;
+ VARIANT v;
+ HRESULT hres;
+
+ TRACE("\n");
+
+ if(!arg_cnt(dp)) {
+ if(retv)
+ num_set_nan(retv);
+ return S_OK;
+ }
+
+ hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v);
+ if(FAILED(hres))
+ return hres;
+
+ if(retv)
+ num_set_val(retv, log(num_val(&v)));
+ return S_OK;
}
/* ECMA-262 3rd Edition 15.8.2.11 */
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index 8c2065e..d810ff0 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -794,6 +794,30 @@ ok(tmp === Infinity, "Math.exp(Infinity) = " + tmp);
tmp = Math.exp(-Infinity);
ok(tmp === 0, "Math.exp(-Infinity) = " + tmp);
+tmp = Math.log(1);
+ok(Math.floor(tmp*100) === 0, "Math.log(1) = " + tmp);
+
+tmp = Math.log(-1);
+ok(isNaN(tmp), "Math.log(-1) is not NaN");
+
+tmp = Math.log(true);
+ok(Math.floor(tmp*100) === 0, "Math.log(true) = " + tmp);
+
+tmp = Math.log(1, 1);
+ok(Math.floor(tmp*100) === 0, "Math.log(1, 1) = " + tmp);
+
+tmp = Math.log();
+ok(isNaN(tmp), "Math.log() is not NaN");
+
+tmp = Math.log(NaN);
+ok(isNaN(tmp), "Math.log(NaN) is not NaN");
+
+tmp = Math.log(Infinity);
+ok(tmp === Infinity, "Math.log(Infinity) = " + tmp);
+
+tmp = Math.log(-Infinity);
+ok(isNaN(tmp), "Math.log(-Infinity) is not NaN");
+
var func = function (a) {
var a = 1;
if(a) return;
More information about the wine-cvs
mailing list