diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 8803f7c53c7..e0e88e4ca27 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -160,11 +160,27 @@ static HRESULT Math_atan2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.8.2.6 */ static HRESULT Math_ceil(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)) { + FIXME("arg_cnt = 0\n"); + return E_NOTIMPL; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) + num_set_val(retv, ceil(num_val(&v))); + return S_OK; } static HRESULT Math_cos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -233,7 +249,6 @@ static HRESULT Math_max(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return S_OK; } - /* ECMA-262 3rd Edition 15.8.2.12 */ static HRESULT Math_min(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7796623f5e8..d590308b5d7 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -279,6 +279,21 @@ ok(tmp === 1, "Math.round(true) = " + tmp); tmp = Math.round(1.1, 3, 4); ok(tmp === 1, "Math.round(1.1, 3, 4) = " + tmp); +tmp = Math.ceil(0.5); +ok(tmp === 1, "Math.ceil(0.5) = " + tmp); + +tmp = Math.ceil(-0.5); +ok(tmp === 0, "Math.ceil(-0.5) = " + tmp); + +tmp = Math.ceil(1.1); +ok(tmp === 2, "Math.round(1.1) = " + tmp); + +tmp = Math.ceil(true); +ok(tmp === 1, "Math.ceil(true) = " + tmp); + +tmp = Math.ceil(1.1, 3, 4); +ok(tmp === 2, "Math.ceil(1.1, 3, 4) = " + tmp); + tmp = Math.abs(3); ok(tmp === 3, "Math.abs(3) = " + tmp);