May 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernel32/tests: Run file tests in the temp directory if we don' t have access to the drive root.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 9ccc9bd6a957c9f3bafc336387901ba4eff6a8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccc9bd6a957c9f3bafc33638… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 12:47:33 2009 +0200 kernel32/tests: Run file tests in the temp directory if we don't have access to the drive root. --- dlls/kernel32/tests/file.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 86ad4e5..2328d37 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1376,7 +1376,12 @@ static void test_FindFirstFileA(void) /* try FindFirstFileA on "C:\foo\" */ SetLastError( 0xdeadbeaf ); - GetTempFileNameA( buffer, "foo", 0, nonexistent ); + if (!GetTempFileNameA( buffer, "foo", 0, nonexistent ) && GetLastError() == ERROR_ACCESS_DENIED) + { + char tmp[MAX_PATH]; + GetTempPathA( sizeof(tmp), tmp ); + GetTempFileNameA( tmp, "foo", 0, nonexistent ); + } DeleteFileA( nonexistent ); strcpy(buffer2, nonexistent); strcat(buffer2, "\\");

1 0

Stefan Dösinger : wined3d: sincos for vertex shaders.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 64926223504cf03b5872a8545154bb6b32ae6473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64926223504cf03b5872a8545… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 12 20:11:50 2009 +0200 wined3d: sincos for vertex shaders. SCS is unfortunately a fragment program only instruction. If we have the NV extensions we can use SIN and COS. Otherwise we have to approximate sine and cosine with a taylor series. Luckily we're provided with the necessary constants by the application. --- dlls/d3d9/tests/visual.c | 77 ++++++++++++++++++++++++++++++ dlls/wined3d/arb_program_shader.c | 95 +++++++++++++++++++++++++++++++++++-- 2 files changed, 167 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64926223504cf03b5872a…

1 0

Stefan Dösinger : wined3d: Work around an ARBFP vs GLSL bug in Mac OS.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 0629585c2401fd41cc8610a2f841a4db2fdeade6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0629585c2401fd41cc8610a2f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 11:40:44 2009 +0200 wined3d: Work around an ARBFP vs GLSL bug in Mac OS. --- dlls/wined3d/context.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8fb075d..ba1e100 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -946,6 +946,24 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ...\n"); } } + if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + /* MacOS(radeon X1600 at least, but most likely others too) refuses to draw if GLSL and ARBFP are + * enabled, but the currently bound arbfp program is 0. Enabling ARBFP with prog 0 is invalid, but + * GLSL should bypass this. This causes problems in programs that never use the fixed function pipeline, + * because the ARBFP extension is enabled by the ARBFP pipeline at context creation, but no program + * is ever assigned. + * + * So make sure a program is assigned to each context. The first real ARBFP use will set a different + * program and the dummy program is destroyed when the context is destroyed. + */ + const char *dummy_program = + "!!ARBfp1.0\n" + "MOV result.color, fragment.color.primary;\n" + "END\n"; + GL_EXTCALL(glGenProgramsARB(1, &ret->dummy_arbfp_prog)); + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, ret->dummy_arbfp_prog)); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dummy_program), dummy_program)); + } for(s = 0; s < GL_LIMITS(point_sprite_units); s++) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); @@ -1065,6 +1083,9 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { TRACE("Destroy dst FBO %d\n", context->dst_fbo); context_destroy_fbo(This, &context->dst_fbo); } + if(context->dummy_arbfp_prog) { + GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); + } LEAVE_GL(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f136dd8..1698504 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1234,6 +1234,7 @@ struct WineD3DContext { GLint gl_fog_source; GLfloat fog_coord_value; GLfloat color[4], fogstart, fogend, fogcolor[4]; + GLuint dummy_arbfp_prog; }; typedef enum ContextUsage {

1 0

Stefan Dösinger : wined3d: Implement DSX in ARB.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 7fc4279cb8d9fe3bb11a5b737a92f4cafc8c96ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc4279cb8d9fe3bb11a5b737… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 8 18:17:58 2009 +0200 wined3d: Implement DSX in ARB. DSY is not that easy because we have to deal with the inverted coordinate system in onscreen(!) rendering - see GLSL dsy. --- dlls/wined3d/arb_program_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7e3abdf..a0cb635 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1039,6 +1039,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_SUB: instruction = "SUB"; break; case WINED3DSIH_MOVA:instruction = "ARR"; break; case WINED3DSIH_SGN: instruction = "SSG"; break; + case WINED3DSIH_DSX: instruction = "DDX"; break; default: instruction = ""; FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; @@ -2354,7 +2355,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DP3 */ shader_hw_map2gl, /* WINED3DSIH_DP4 */ shader_hw_map2gl, /* WINED3DSIH_DST */ shader_hw_map2gl, - /* WINED3DSIH_DSX */ NULL, + /* WINED3DSIH_DSX */ shader_hw_map2gl, /* WINED3DSIH_DSY */ NULL, /* WINED3DSIH_ELSE */ NULL, /* WINED3DSIH_ENDIF */ NULL,

1 0

Piotr Caban : jscript: Fix integer/double parsing.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 063df731ac7b1795786ec447b5b325a043fc44d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063df731ac7b1795786ec447b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 01:10:49 2009 +0200 jscript: Fix integer/double parsing. --- dlls/jscript/lex.c | 26 ++++++++++++++++++++------ dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 68bfef8..c066397 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -17,6 +17,7 @@ */ #include <math.h> +#include <limits.h> #include "jscript.h" #include "activscp.h" @@ -374,13 +375,19 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li { double d, tmp = 1.0; - if(ctx->ptr == ctx->end || !isdigitW(*ctx->ptr)) { - ERR("No digit after point\n"); + if(ctx->ptr == ctx->end || (!isdigitW(*ctx->ptr) && + *ctx->ptr!='.' && *ctx->ptr!='e' && *ctx->ptr!='E')) { + ERR("Illegal character\n"); return 0; } d = int_part; while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) + d = d*10 + *(ctx->ptr++) - '0'; + + if(*ctx->ptr == '.') ctx->ptr++; + + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) d += (tmp /= 10.0)*(*ctx->ptr++ - '0'); if(ctx->ptr < ctx->end && (*ctx->ptr == 'e' || *ctx->ptr == 'E')) { @@ -458,13 +465,20 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) } while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - l = l*10 + *(ctx->ptr++)-'0'; + { + d = l*10 + *(ctx->ptr)-'0'; + + /* Check for integer overflow */ + if (l > INT_MAX/10 || d < 0) + return parse_double_literal(ctx, l, literal); + + l = d; + ctx->ptr++; + } if(ctx->ptr < ctx->end) { - if(*ctx->ptr == '.') { - ctx->ptr++; + if(*ctx->ptr == '.' || *ctx->ptr == 'e' || *ctx->ptr == 'E') return parse_double_literal(ctx, l, literal); - } if(is_identifier_char(*ctx->ptr)) { WARN("unexpected identifier char\n"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 0d68f37..c4f0194 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -33,6 +33,8 @@ ok(true === true, "true === true is false"); ok(null === null, "null === null is false"); ok(undefined === undefined, "undefined === undefined is false"); ok(!(undefined === null), "!(undefined === null) is false"); +ok(1E0 === 1, "1E0 === 1 is false"); +ok(1000000*1000000 === 1000000000000, "1000000*1000000 === 1000000000000 is false"); ok(1 !== 2, "1 !== 2 is false"); ok(null !== undefined, "null !== undefined is false");

1 0

Louis Lenders : d3d9/tests: Add simple test to show that QualityLevels is not zero, when we call CheckDeviceMultiSampleType with D3DMULTISAMPLE_NONE.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: f9b9f73991d5ac5e8db5a27f7c4ed9c69459cc3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b9f73991d5ac5e8db5a27f7… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue May 26 21:47:50 2009 +0000 d3d9/tests: Add simple test to show that QualityLevels is not zero, when we call CheckDeviceMultiSampleType with D3DMULTISAMPLE_NONE. --- dlls/d3d9/tests/device.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e4ab592..22f4234 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -136,6 +136,56 @@ static void test_mipmap_levels(void) DestroyWindow( hwnd ); } +static void test_checkdevicemultisampletype(void) +{ + + HRESULT hr; + HWND hwnd = NULL; + + IDirect3D9 *pD3d = NULL; + IDirect3DDevice9 *pDevice = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + DWORD qualityLevels; + + pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); + ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); + hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!pD3d || !hwnd) goto cleanup; + + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "Failed to create IDirect3D9Device (%08x)\n", hr); + if (FAILED(hr)) { + skip("failed to create a d3d device\n"); + goto cleanup; + } + + qualityLevels = 0; + + hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, + D3DMULTISAMPLE_NONE, &qualityLevels); + ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); + todo_wine ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); + + hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, FALSE, + D3DMULTISAMPLE_NONE, &qualityLevels); + ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); + todo_wine ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); + +cleanup: + if (pD3d) IUnknown_Release( pD3d ); + if (pDevice) IUnknown_Release( pDevice ); + DestroyWindow( hwnd ); +} + static void test_swapchain(void) { HRESULT hr; @@ -2230,6 +2280,7 @@ START_TEST(device) test_swapchain(); test_refcount(); test_mipmap_levels(); + test_checkdevicemultisampletype(); test_cursor(); test_reset(); test_scene();

1 0

Piotr Caban : jscript: Added Math_sin implementation.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: a67672f9eef88160007f28fcd4d1ff1b1483f6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67672f9eef88160007f28fcd… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 01:10:10 2009 +0200 jscript: Added Math_sin implementation. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 9b41385..9804c36 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -501,8 +501,22 @@ static HRESULT Math_round(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT Math_sin(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, sin(num_val(&v))); + return S_OK; } static HRESULT Math_sqrt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d810ff0..a5d9286 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -818,6 +818,36 @@ ok(tmp === Infinity, "Math.log(Infinity) = " + tmp); tmp = Math.log(-Infinity); ok(isNaN(tmp), "Math.log(-Infinity) is not NaN"); +tmp = Math.sin(0); +ok(tmp === 0, "Math.sin(0) = " + tmp); + +tmp = Math.sin(Math.PI/2); +ok(tmp === 1, "Math.sin(Math.PI/2) = " + tmp); + +tmp = Math.sin(-Math.PI/2); +ok(tmp === -1, "Math.sin(-Math.PI/2) = " + tmp); + +tmp = Math.sin(Math.PI/3, 2); +ok(Math.floor(tmp*100) === 86, "Math.sin(Math.PI/3, 2) = " + tmp); + +tmp = Math.sin(true); +ok(Math.floor(tmp*100) === 84, "Math.sin(true) = " + tmp); + +tmp = Math.sin(false); +ok(tmp === 0, "Math.sin(false) = " + tmp); + +tmp = Math.sin(); +ok(isNaN(tmp), "Math.sin() is not NaN"); + +tmp = Math.sin(NaN); +ok(isNaN(tmp), "Math.sin(NaN) is not NaN"); + +tmp = Math.sin(Infinity); +ok(isNaN(tmp), "Math.sin(Infinity) is not NaN"); + +tmp = Math.sin(-Infinity); +ok(isNaN(tmp), "Math.sin(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Piotr Caban : jscript: Added implementation of Math_sqrt.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 8c609c9f50bf7f961bdfe07a8e8a0b57bdcd703d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c609c9f50bf7f961bdfe07a8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 01:10:25 2009 +0200 jscript: Added implementation of Math_sqrt. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 9804c36..2928a97 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -522,8 +522,22 @@ static HRESULT Math_sin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static HRESULT Math_sqrt(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, sqrt(num_val(&v))); + return S_OK; } static HRESULT Math_tan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a5d9286..54fc2a1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -848,6 +848,36 @@ ok(isNaN(tmp), "Math.sin(Infinity) is not NaN"); tmp = Math.sin(-Infinity); ok(isNaN(tmp), "Math.sin(-Infinity) is not NaN"); +tmp = Math.sqrt(0); +ok(tmp === 0, "Math.sqrt(0) = " + tmp); + +tmp = Math.sqrt(4); +ok(tmp === 2, "Math.sqrt(4) = " + tmp); + +tmp = Math.sqrt(-1); +ok(isNaN(tmp), "Math.sqrt(-1) is not NaN"); + +tmp = Math.sqrt(2, 2); +ok(Math.floor(tmp*100) === 141, "Math.sqrt(2, 2) = " + tmp); + +tmp = Math.sqrt(true); +ok(tmp === 1, "Math.sqrt(true) = " + tmp); + +tmp = Math.sqrt(false); +ok(tmp === 0, "Math.sqrt(false) = " + tmp); + +tmp = Math.sqrt(); +ok(isNaN(tmp), "Math.sqrt() is not NaN"); + +tmp = Math.sqrt(NaN); +ok(isNaN(tmp), "Math.sqrt(NaN) is not NaN"); + +tmp = Math.sqrt(Infinity); +ok(tmp === Infinity, "Math.sqrt(Infinity) = " + tmp); + +tmp = Math.sqrt(-Infinity); +ok(isNaN(tmp), "Math.sqrt(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Piotr Caban : jscript: Added Math_tan implementation.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: f2c1095a8054b7a8fb1f34cb11cc8fff97e3cef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c1095a8054b7a8fb1f34cb1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 01:10:36 2009 +0200 jscript: Added Math_tan implementation. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 27 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 2928a97..1969ff7 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -543,8 +543,22 @@ static HRESULT Math_sqrt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * static HRESULT Math_tan(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, tan(num_val(&v))); + return S_OK; } static const builtin_prop_t Math_props[] = { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 54fc2a1..c1da8c8 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -878,6 +878,33 @@ ok(tmp === Infinity, "Math.sqrt(Infinity) = " + tmp); tmp = Math.sqrt(-Infinity); ok(isNaN(tmp), "Math.sqrt(-Infinity) is not NaN"); +tmp = Math.tan(0); +ok(tmp === 0, "Math.tan(0) = " + tmp); + +tmp = Math.tan(Math.PI); +ok(Math.floor(tmp*100) === -1, "Math.tan(Math.PI) = " + tmp); + +tmp = Math.tan(2, 2); +ok(Math.floor(tmp*100) === -219, "Math.tan(2, 2) = " + tmp); + +tmp = Math.tan(true); +ok(Math.floor(tmp*100) === 155, "Math.tan(true) = " + tmp); + +tmp = Math.tan(false); +ok(tmp === 0, "Math.tan(false) = " + tmp); + +tmp = Math.tan(); +ok(isNaN(tmp), "Math.tan() is not NaN"); + +tmp = Math.tan(NaN); +ok(isNaN(tmp), "Math.tan(NaN) is not NaN"); + +tmp = Math.tan(Infinity); +ok(isNaN(tmp), "Math.tan(Infinity) is not NaN"); + +tmp = Math.tan(-Infinity); +ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Piotr Caban : jscript: Added implementation of Math_log.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: f57f3aa2f430d2e4e0f984a6be619c797be71423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57f3aa2f430d2e4e0f984a6b… Author: Piotr Caban <piotr.caban(a)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;

1 0