wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Paul Vriens : kernel32: Use Polish translations.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: a15282371b9e7b751c3bdba759a3b7598410b13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15282371b9e7b751c3bdba75… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon May 25 10:09:14 2009 +0200 kernel32: Use Polish translations. --- dlls/kernel32/kernel.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel.rc b/dlls/kernel32/kernel.rc index 29df694..30d1dca 100644 --- a/dlls/kernel32/kernel.rc +++ b/dlls/kernel32/kernel.rc @@ -24,5 +24,6 @@ #include "nls/winerr_kor.mc.rc" #include "nls/winerr_nld.mc.rc" #include "nls/winerr_nor.mc.rc" +#include "nls/winerr_plk.mc.rc" #include "version.rc"

1 0

Henri Verbeet : wined3d: Fix debug_d3dusagequery() to handle combinations of flags.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 6a9212a1b221b0d440e3ad492cc815f2ef79dd6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9212a1b221b0d440e3ad492… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 25 09:17:22 2009 +0200 wined3d: Fix debug_d3dusagequery() to handle combinations of flags. --- dlls/wined3d/utils.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8a9f7e0..cce4920 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -934,9 +934,12 @@ const char *debug_d3dusage(DWORD usage) return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } -const char* debug_d3dusagequery(DWORD usagequery) { - switch (usagequery & WINED3DUSAGE_QUERY_MASK) { -#define WINED3DUSAGEQUERY_TO_STR(u) case u: return #u +const char *debug_d3dusagequery(DWORD usagequery) +{ + char buf[238]; + + buf[0] = '\0'; +#define WINED3DUSAGEQUERY_TO_STR(u) if (usagequery & u) { strcat(buf, " | "#u); usagequery &= ~u; } WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_FILTER); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING); @@ -945,11 +948,9 @@ const char* debug_d3dusagequery(DWORD usagequery) { WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); #undef WINED3DUSAGEQUERY_TO_STR - case 0: return "none"; - default: - FIXME("Unrecognized %u Usage Query!\n", usagequery); - return "unrecognized"; - } + if (usagequery) FIXME("Unrecognized usage query flag(s) %#x\n", usagequery); + + return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method) {

1 0

Henri Verbeet : wined3d: Fix debug_d3dusage() to handle combinations of flags.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 7c2e91c59255d6d811c4893cbe9dfd8b8ebe0eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2e91c59255d6d811c4893cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 25 09:17:22 2009 +0200 wined3d: Fix debug_d3dusage() to handle combinations of flags. --- dlls/wined3d/utils.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 09f76fd..8a9f7e0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -911,9 +911,12 @@ const char* debug_d3ddevicetype(WINED3DDEVTYPE devtype) { } } -const char* debug_d3dusage(DWORD usage) { - switch (usage & WINED3DUSAGE_MASK) { -#define WINED3DUSAGE_TO_STR(u) case u: return #u +const char *debug_d3dusage(DWORD usage) +{ + char buf[284]; + + buf[0] = '\0'; +#define WINED3DUSAGE_TO_STR(u) if (usage & u) { strcat(buf, " | "#u); usage &= ~u; } WINED3DUSAGE_TO_STR(WINED3DUSAGE_RENDERTARGET); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DEPTHSTENCIL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY); @@ -926,11 +929,9 @@ const char* debug_d3dusage(DWORD usage) { WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); #undef WINED3DUSAGE_TO_STR - case 0: return "none"; - default: - FIXME("Unrecognized %u Usage!\n", usage); - return "unrecognized"; - } + if (usage) FIXME("Unrecognized usage flag(s) %#x\n", usage); + + return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } const char* debug_d3dusagequery(DWORD usagequery) {

1 0

Henri Verbeet : wined3d: Remove some apparently leftover debug code.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: f347374470861c5c1e81d055d4b8db2200d057ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f347374470861c5c1e81d055d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 25 09:17:22 2009 +0200 wined3d: Remove some apparently leftover debug code. --- dlls/wined3d/drawprim.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e655b1c..c92659f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -925,13 +925,11 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, if(i == -1) { LEAVE_GL(); ERR("Feedback failed. Expected %d elements back\n", buffer_size); - Sleep(10000); HeapFree(GetProcessHeap(), 0, feedbuffer); return WINED3DERR_DRIVERINTERNALERROR; } else if(i != buffer_size) { LEAVE_GL(); ERR("Unexpected amount of elements returned. Expected %d, got %d\n", buffer_size, i); - Sleep(10000); HeapFree(GetProcessHeap(), 0, feedbuffer); return WINED3DERR_DRIVERINTERNALERROR; } else {

1 0

Henri Verbeet : wined3d: Remove some unnecessary forward declarations.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 85107d81f450aac52c8b24ea4716eac0aa07ca10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85107d81f450aac52c8b24ea4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 25 09:17:21 2009 +0200 wined3d: Remove some unnecessary forward declarations. --- dlls/wined3d/surface.c | 143 +++++++++++++++++++++++++++--------------------- 1 files changed, 80 insertions(+), 63 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8fc0d28..d65105d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -34,10 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info -static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); -static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert); -static void surface_remove_pbo(IWineD3DSurfaceImpl *This); - static void surface_force_reload(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -1819,6 +1815,86 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ return WINED3D_OK; } +static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey) +{ + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + IWineD3DPaletteImpl *pal = This->palette; + BOOL index_in_alpha = FALSE; + unsigned int i; + + /* Old games like StarCraft, C&C, Red Alert and others use P8 render targets. + * Reading back the RGB output each lockrect (each frame as they lock the whole screen) + * is slow. Further RGB->P8 conversion is not possible because palettes can have + * duplicate entries. Store the color key in the unused alpha component to speed the + * download up and to make conversion unneeded. */ + index_in_alpha = primary_render_target_is_p8(device); + + if (!pal) + { + UINT dxVersion = ((IWineD3DImpl *)device->wineD3D)->dxVersion; + + /* In DirectDraw the palette is a property of the surface, there are no such things as device palettes. */ + if (dxVersion <= 7) + { + ERR("This code should never get entered for DirectDraw!, expect problems\n"); + if (index_in_alpha) + { + /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if + * there's no palette at this time. */ + for (i = 0; i < 256; i++) table[i][3] = i; + } + } + else + { + /* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8, + * alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device + * capability flag is present (wine does advertise this capability) */ + for (i = 0; i < 256; ++i) + { + table[i][0] = device->palettes[device->currentPalette][i].peRed; + table[i][1] = device->palettes[device->currentPalette][i].peGreen; + table[i][2] = device->palettes[device->currentPalette][i].peBlue; + table[i][3] = device->palettes[device->currentPalette][i].peFlags; + } + } + } + else + { + TRACE("Using surface palette %p\n", pal); + /* Get the surface's palette */ + for (i = 0; i < 256; ++i) + { + table[i][0] = pal->palents[i].peRed; + table[i][1] = pal->palents[i].peGreen; + table[i][2] = pal->palents[i].peBlue; + + /* When index_in_alpha is set the palette index is stored in the + * alpha component. In case of a readback we can then read + * GL_ALPHA. Color keying is handled in BltOverride using a + * GL_ALPHA_TEST using GL_NOT_EQUAL. In case of index_in_alpha the + * color key itself is passed to glAlphaFunc in other cases the + * alpha component of pixels that should be masked away is set to 0. */ + if (index_in_alpha) + { + table[i][3] = i; + } + else if (colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) + && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) + { + table[i][3] = 0x00; + } + else if(pal->Flags & WINEDDPCAPS_ALPHA) + { + table[i][3] = pal->palents[i].peFlags; + } + else + { + table[i][3] = 0xFF; + } + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *This) { @@ -2190,65 +2266,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI return WINED3D_OK; } -static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey) { - IWineD3DPaletteImpl* pal = This->palette; - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - BOOL index_in_alpha = FALSE; - int dxVersion = ( (IWineD3DImpl *) device->wineD3D)->dxVersion; - unsigned int i; - - /* Old games like StarCraft, C&C, Red Alert and others use P8 render targets. - * Reading back the RGB output each lockrect (each frame as they lock the whole screen) - * is slow. Further RGB->P8 conversion is not possible because palettes can have - * duplicate entries. Store the color key in the unused alpha component to speed the - * download up and to make conversion unneeded. */ - index_in_alpha = primary_render_target_is_p8(device); - - if (pal == NULL) { - /* In DirectDraw the palette is a property of the surface, there are no such things as device palettes. */ - if(dxVersion <= 7) { - ERR("This code should never get entered for DirectDraw!, expect problems\n"); - if(index_in_alpha) { - /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if - there's no palette at this time. */ - for (i = 0; i < 256; i++) table[i][3] = i; - } - } else { - /* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8, - alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device - capability flag is present (wine does advertise this capability) */ - for (i = 0; i < 256; i++) { - table[i][0] = device->palettes[device->currentPalette][i].peRed; - table[i][1] = device->palettes[device->currentPalette][i].peGreen; - table[i][2] = device->palettes[device->currentPalette][i].peBlue; - table[i][3] = device->palettes[device->currentPalette][i].peFlags; - } - } - } else { - TRACE("Using surface palette %p\n", pal); - /* Get the surface's palette */ - for (i = 0; i < 256; i++) { - table[i][0] = pal->palents[i].peRed; - table[i][1] = pal->palents[i].peGreen; - table[i][2] = pal->palents[i].peBlue; - - /* When index_in_alpha is the palette index is stored in the alpha component. In case of a readback - we can then read GL_ALPHA. Color keying is handled in BltOverride using a GL_ALPHA_TEST using GL_NOT_EQUAL. - In case of index_in_alpha the color key itself is passed to glAlphaFunc in other cases the alpha component - of pixels that should be masked away is set to 0. */ - if(index_in_alpha) { - table[i][3] = i; - } else if(colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { - table[i][3] = 0x00; - } else if(pal->Flags & WINEDDPCAPS_ALPHA) { - table[i][3] = pal->palents[i].peFlags; - } else { - table[i][3] = 0xFF; - } - } - } -} - /* This function is used in case of 8bit paletted textures to upload the palette. It supports GL_EXT_paletted_texture and GL_ARB_fragment_program, support for other extensions like ATI_fragment_shaders is possible.

1 0

Henri Verbeet : secur32: Initialize cbBuffer to 0 for NULL buffers.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: a1465ba45ff918b79c02c1d5ba14b0a51ccae4c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1465ba45ff918b79c02c1d5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 25 09:17:21 2009 +0200 secur32: Initialize cbBuffer to 0 for NULL buffers. This prevents schan_resize_current_buffer() from thinking there's a buffer. --- dlls/secur32/schannel.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index fbf2a62..8f127e6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -619,7 +619,11 @@ static int schan_init_sec_ctx_get_next_buffer(const struct schan_transport *t, s idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_EMPTY); if (idx != -1) s->desc->pBuffers[idx].BufferType = SECBUFFER_TOKEN; } - if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer) s->allow_buffer_resize = TRUE; + if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer) + { + s->desc->pBuffers[idx].cbBuffer = 0; + s->allow_buffer_resize = TRUE; + } } return idx; }

1 0

Piotr Caban : jscript: Added Math_LN10 implementation and tests.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 1ef80d5cd20c08a72bec1cc297951c862f176573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef80d5cd20c08a72bec1cc29… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun May 24 21:06:50 2009 +0200 jscript: Added Math_LN10 implementation and tests. --- dlls/jscript/math.c | 4 ++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 99bd9f5..8f3cb03 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -105,8 +105,8 @@ static HRESULT Math_LN2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static HRESULT Math_LN10(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_LN10, flags, retv); } /* ECMA-262 3rd Edition 15.8.1.6 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a202fbd..9976bb2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -708,6 +708,11 @@ ok(Math.floor(Math.LN2*100) === 69, "Math.LN2 = " + Math.LN2); Math.LN2 = "test"; ok(Math.floor(Math.LN2*100) === 69, "modified Math.LN2 = " + Math.LN2); +ok(typeof(Math.LN10) === "number", "typeof(Math.LN10) = " + typeof(Math.LN10)); +ok(Math.floor(Math.LN10*100) === 230, "Math.LN10 = " + Math.LN10); +Math.LN10 = "test"; +ok(Math.floor(Math.LN10*100) === 230, "modified Math.LN10 = " + Math.LN10); + ok(typeof(Math.SQRT2) === "number", "typeof(Math.SQRT2) = " + typeof(Math.SQRT2)); ok(Math.floor(Math.SQRT2*100) === 141, "Math.SQRT2 = " + Math.SQRT2); Math.SQRT2 = "test";

1 0

Piotr Caban : jscript: Added Math_acos implementation and tests.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: b050c20638db462c67cf95b9cbef8b5a2482b6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b050c20638db462c67cf95b9c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon May 25 00:03:06 2009 +0200 jscript: Added Math_acos implementation and tests. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index f7cf3d1..99bd9f5 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -160,8 +160,22 @@ static HRESULT Math_abs(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static HRESULT Math_acos(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, acos(num_val(&v))); + return S_OK; } static HRESULT Math_asin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 71517cb..a202fbd 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -626,6 +626,39 @@ tmp = Math.random(100); ok(typeof(tmp) == "number", "typeof(tmp) = " + typeof(tmp)); ok(0 <= tmp && tmp <= 1, "Math.random(100) = " + tmp); +tmp = Math.acos(0); +ok(Math.floor(tmp*100) === 157, "Math.acos(0) = " + tmp); + +tmp = Math.acos(1); +ok(Math.floor(tmp*100) === 0, "Math.acos(1) = " + tmp); + +tmp = Math.acos(-1); +ok(Math.floor(tmp*100) === 314, "Math.acos(-1) = " + tmp); + +tmp = Math.acos(Math.PI/4, 2); +ok(Math.floor(tmp*100) === 66, "Math.acos(Math.PI/4, 2) = " + tmp); + +tmp = Math.acos(true); +ok(Math.floor(tmp*100) === 0, "Math.acos(true) = " + tmp); + +tmp = Math.acos(false); +ok(Math.floor(tmp*100) === 157, "Math.acos(false) = " + tmp); + +tmp = Math.acos(1.1); +ok(isNaN(tmp), "Math.acos(1.1) is not NaN"); + +tmp = Math.acos(); +ok(isNaN(tmp), "Math.acos() is not NaN"); + +tmp = Math.acos(NaN); +ok(isNaN(tmp), "Math.acos(NaN) is not NaN"); + +tmp = Math.acos(Infinity); +ok(isNaN(tmp), "Math.acos(Infinity) is not NaN"); + +tmp = Math.acos(-Infinity); +ok(isNaN(tmp), "Math.acos(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Piotr Caban : jscript: Added Math_SQRT1_2 implementations and tests.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: e4bc0def3be95a95d006da8dcb4a03d98966824f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4bc0def3be95a95d006da8dc… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun May 24 21:07:22 2009 +0200 jscript: Added Math_SQRT1_2 implementations and tests. --- dlls/jscript/math.c | 4 ++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 1157fed..f7cf3d1 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -127,8 +127,8 @@ static HRESULT Math_SQRT2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT Math_SQRT1_2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_SQRT1_2, flags, retv); } /* ECMA-262 3rd Edition 15.8.2.12 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a4dd9f5..71517cb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -680,4 +680,9 @@ ok(Math.floor(Math.SQRT2*100) === 141, "Math.SQRT2 = " + Math.SQRT2); Math.SQRT2 = "test"; ok(Math.floor(Math.SQRT2*100) === 141, "modified Math.SQRT2 = " + Math.SQRT2); +ok(typeof(Math.SQRT1_2) === "number", "typeof(Math.SQRT1_2) = " + typeof(Math.SQRT1_2)); +ok(Math.floor(Math.SQRT1_2*100) === 70, "Math.SQRT1_2 = " + Math.SQRT1_2); +Math.SQRT1_2 = "test"; +ok(Math.floor(Math.SQRT1_2*100) === 70, "modified Math.SQRT1_2 = " + Math.SQRT1_2); + reportSuccess();

1 0

Piotr Caban : jscript: Added Math_SQRT2 implementation and tests.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 27f327aebc64e4e95c90e91c4625500b74a08174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f327aebc64e4e95c90e91c4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun May 24 21:06:23 2009 +0200 jscript: Added Math_SQRT2 implementation and tests. --- dlls/jscript/math.c | 4 ++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index ac487d1..1157fed 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -120,8 +120,8 @@ static HRESULT Math_PI(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp static HRESULT Math_SQRT2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_SQRT2, flags, retv); } static HRESULT Math_SQRT1_2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 30f2017..a4dd9f5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -675,4 +675,9 @@ ok(Math.floor(Math.LN2*100) === 69, "Math.LN2 = " + Math.LN2); Math.LN2 = "test"; ok(Math.floor(Math.LN2*100) === 69, "modified Math.LN2 = " + Math.LN2); +ok(typeof(Math.SQRT2) === "number", "typeof(Math.SQRT2) = " + typeof(Math.SQRT2)); +ok(Math.floor(Math.SQRT2*100) === 141, "Math.SQRT2 = " + Math.SQRT2); +Math.SQRT2 = "test"; +ok(Math.floor(Math.SQRT2*100) === 141, "modified Math.SQRT2 = " + Math.SQRT2); + reportSuccess();

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009