wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Stefan Dösinger : wined3d: Don' t emulate clipplanes with ffp vp and fix a wrong if condition.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 85af0b2943825cf63666bc9a3eae214ca9a9cff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85af0b2943825cf63666bc9a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 22 16:25:37 2009 +0200 wined3d: Don't emulate clipplanes with ffp vp and fix a wrong if condition. b2f09fd20421d0a5e179b42332ca63bc5ac17d8a accidentally got the device->vs_clipping check wrong. The FFP replacement should emulate clipping if GL can't do this natively with vertex shaders, not the other way. Also don't emulate clipping if we're using fixed function vertex processing because (a) clipping is always supported by GL in this case, and (b), fragment.texcoord[7] is undefined. (Or in the worst case set to something bad by the app). --- dlls/wined3d/arb_program_shader.c | 3 +-- dlls/wined3d/utils.c | 15 +++++++++++---- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 710cf68..0e6b307 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5151,7 +5151,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi BOOL tempreg_used = FALSE, tfactor_used = FALSE; BOOL op_equal; const char *final_combiner_src = "ret"; - IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; /* Find out which textures are read */ for(stage = 0; stage < MAX_TEXTURES; stage++) { @@ -5242,7 +5241,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi srgb_sub_high, 0.0, 0.0, 0.0); } - if(ffp_clip_emul(stateblock) && device->vs_clipping) shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); + if(ffp_clip_emul(stateblock) && settings->emul_clipplanes) shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); /* Generate texture sampling instructions) */ for(stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3DTOP_DISABLE; stage++) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 82d5527..b501bba 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2091,6 +2091,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting unsigned int i; DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; + IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; for(i = 0; i < GL_LIMITS(texture_stages); i++) { IWineD3DBaseTextureImpl *texture; @@ -2144,8 +2145,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting carg2 = (args[cop] & ARG2) ? stateblock->textureState[i][WINED3DTSS_COLORARG2] : ARG_UNUSED; carg0 = (args[cop] & ARG0) ? stateblock->textureState[i][WINED3DTSS_COLORARG0] : ARG_UNUSED; - if(is_invalid_op(stateblock->wineD3DDevice, i, cop, - carg1, carg2, carg0)) { + if(is_invalid_op(device, i, cop, carg1, carg2, carg0)) { carg0 = ARG_UNUSED; carg2 = ARG_UNUSED; carg1 = WINED3DTA_CURRENT; @@ -2204,8 +2204,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting } } - if(is_invalid_op(stateblock->wineD3DDevice, i, aop, - aarg1, aarg2, aarg0)) { + if(is_invalid_op(device, i, aop, aarg1, aarg2, aarg0)) { aarg0 = ARG_UNUSED; aarg2 = ARG_UNUSED; aarg1 = WINED3DTA_CURRENT; @@ -2284,6 +2283,14 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting } else { settings->sRGB_write = 0; } + if(device->vs_clipping || !use_vs(stateblock)) { + /* No need to emulate clipplanes if GL supports native vertex shader clipping or if + * the fixed function vertex pipeline is used(which always supports clipplanes) + */ + settings->emul_clipplanes = 0; + } else { + settings->emul_clipplanes = 1; + } } #undef GLINFO_LOCATION diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3bbddd8..afef4af 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1378,8 +1378,9 @@ struct texture_stage_op struct ffp_frag_settings { struct texture_stage_op op[MAX_TEXTURES]; enum fogmode fog; - /* Use an int instead of a char to get dword alignment */ - unsigned int sRGB_write; + /* Use shorts instead of chars to get dword alignment */ + unsigned short sRGB_write; + unsigned short emul_clipplanes; }; struct ffp_frag_desc

1 0

Ken Sharp : gdiplus: Add GdipIsVisibleRegionPointI stub.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: e096b59ceb394096f31fc8c5f0a0fb9cc8b6c5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e096b59ceb394096f31fc8c5f… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Mon Jun 22 21:59:59 2009 +0100 gdiplus: Add GdipIsVisibleRegionPointI stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 03c9629..b93d5f6 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -432,7 +432,7 @@ @ stub GdipIsVisibleRect @ stub GdipIsVisibleRectI @ stub GdipIsVisibleRegionPoint -@ stub GdipIsVisibleRegionPointI +@ stdcall GdipIsVisibleRegionPointI(ptr long long ptr ptr) @ stub GdipIsVisibleRegionRect @ stub GdipIsVisibleRegionRectI @ stdcall GdipLoadImageFromFile(wstr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a9adac1..27cd6fb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3878,3 +3878,12 @@ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 FIXME("(%p %p %d %p %p %p %d %p): stub\n", graphics, text, length, font, brush, positions, flags, matrix); return NotImplemented; } + +/***************************************************************************** + * GdipIsVisibleRegionPointI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipIsVisibleRegionPointI(GpRegion *region, INT x, INT y, GpGraphics *graphics, BOOL *result) +{ + FIXME("(%p %d %d %p %p): stub\n", region, x, y, graphics, result); + return NotImplemented; +}

1 0

Alexandre Julliard : winebuild: Enforce header size alignment when outputting resources.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 2189b101de0449cbf19a155de73bb8d394065abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2189b101de0449cbf19a155de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 13:25:50 2009 +0200 winebuild: Enforce header size alignment when outputting resources. --- tools/winebuild/res32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 93d9c3c..0aaf2f0 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -577,7 +577,7 @@ void output_res_o_file( DLLSPEC *spec ) unsigned int header_size = get_resource_header_size( &spec->resources[i] ); put_dword( spec->resources[i].data_size ); - put_dword( header_size ); + put_dword( (header_size + 3) & ~3 ); put_string( &spec->resources[i].type ); put_string( &spec->resources[i].name ); if ((unsigned long)file_out_pos & 2) put_word( 0 );

1 0

Alexandre Julliard : configure: Add a check for broken 16-bit compile with Xcode 3.x.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: cc8eb6b775041f1e038ed7c24cc0ebb84764e283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8eb6b775041f1e038ed7c24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 13:04:49 2009 +0200 configure: Add a check for broken 16-bit compile with Xcode 3.x. --- configure | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 17 ++++++++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2ebe28a..2d40991 100755 --- a/configure +++ b/configure @@ -7403,6 +7403,77 @@ done enable_winequartz_drv=${enable_winequartz_drv:-yes} fi + if test "x$enable_win16" = "xyes" + then + { $as_echo "$as_me:$LINENO: checking whether 16-bit code can be built correctly" >&5 +$as_echo_n "checking whether 16-bit code can be built correctly... " >&6; } + if test "$cross_compiling" = yes; then + { $as_echo "$as_me:$LINENO: result: cross-compiling, assuming yes" >&5 +$as_echo "cross-compiling, assuming yes" >&6; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +asm(".text\n" + "bad:\tnop;nop\n" + "good:\tnop;nop\n\t" + ".globl _testfunc\n" + "_testfunc:\tcallw good"); + extern void testfunc(); +int +main () +{ +unsigned short *p = (unsigned short *)testfunc; + return p[0] != 0xe866 || p[1] != 0xfffa + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." >&5 +$as_echo "$as_me: error: Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." >&2;} + { (exit 1); exit 1; }; } +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + fi ;; *) DLLFLAGS="$DLLFLAGS -fPIC" diff --git a/configure.ac b/configure.ac index 3ef18dc..7f15375 100644 --- a/configure.ac +++ b/configure.ac @@ -609,6 +609,23 @@ case $host_os in AC_SUBST(CARBONLIB,"-framework Carbon") enable_winequartz_drv=${enable_winequartz_drv:-yes} fi + dnl Check for Xcode 3.x broken 16-bit support + if test "x$enable_win16" = "xyes" + then + AC_MSG_CHECKING([whether 16-bit code can be built correctly]) + AC_RUN_IFELSE(AC_LANG_PROGRAM([[asm(".text\n" + "bad:\tnop;nop\n" + "good:\tnop;nop\n\t" + ".globl _testfunc\n" + "_testfunc:\tcallw good"); + extern void testfunc();]], + [[unsigned short *p = (unsigned short *)testfunc; + return p[[0]] != 0xe866 || p[[1]] != 0xfffa]]), + AC_MSG_RESULT(yes), + [AC_MSG_RESULT(no) + AC_MSG_ERROR([Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support.])], + AC_MSG_RESULT([[cross-compiling, assuming yes]])) + fi ;; *) DLLFLAGS="$DLLFLAGS -fPIC"

1 0

Piotr Caban : jscript: Added Date_setFullYear and Date_setUTCFullYear implementation.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 27d8e22cbc43d997046a41543e30dafdb8b6f95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d8e22cbc43d997046a41543… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jun 22 20:42:15 2009 +0200 jscript: Added Date_setFullYear and Date_setUTCFullYear implementation. --- dlls/jscript/date.c | 104 +++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 2 + 2 files changed, 102 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index fe89989..e68b3e9 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1469,18 +1469,114 @@ static HRESULT Date_setUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } +/* ECMA-262 3rd Edition 15.9.5.40 */ static HRESULT Date_setFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, year, month, ddate; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = local_time(date->time, date); + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + year = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + month = num_val(&v); + } + else month = month_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + ddate = num_val(&v); + } + else ddate = date_from_time(t); + + t = make_date(make_day(year, month, ddate), time_within_day(t)); + date->time = time_clip(utc(t, date)); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } +/* ECMA-262 3rd Edition 15.9.5.41 */ static HRESULT Date_setUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, year, month, ddate; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = date->time; + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + year = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + month = num_val(&v); + } + else month = month_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + ddate = num_val(&v); + } + else ddate = date_from_time(t); + + t = make_date(make_day(year, month, ddate), time_within_day(t)); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } static HRESULT Date_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 6a7e830..985d230 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1019,6 +1019,8 @@ date.setUTCDate(32); ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); date.setUTCMonth(22, 37); ok(date.getTime() === 60987050010, "date.getTime() = " + date.getTime()); +date.setUTCFullYear(83, 21, 321); +ok(date.getTime() === -59464984149990, "date.getTime() = " + date.getTime()); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Piotr Caban : jscript: Added Date_setMonth and Date_setUTCMonth implementation.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 7301ad4f7200052f71cccd7c5404c6e6f2ad1d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7301ad4f7200052f71cccd7c5… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jun 22 20:42:00 2009 +0200 jscript: Added Date_setMonth and Date_setUTCMonth implementation. --- dlls/jscript/date.c | 90 +++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 2 + 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 89ec7b2..fe89989 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1373,18 +1373,100 @@ static HRESULT Date_setUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA return S_OK; } +/* ECMA-262 3rd Edition 15.9.5.38 */ static HRESULT Date_setMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, month, ddate; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = local_time(date->time, date); + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + month = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + ddate = num_val(&v); + } + else ddate = date_from_time(t); + + t = make_date(make_day(year_from_time(t), month, ddate), + time_within_day(t)); + date->time = time_clip(utc(t, date)); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } +/* ECMA-262 3rd Edition 15.9.5.39 */ static HRESULT Date_setUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, month, ddate; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = date->time; + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + month = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + ddate = num_val(&v); + } + else ddate = date_from_time(t); + + t = make_date(make_day(year_from_time(t), month, ddate), + time_within_day(t)); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } static HRESULT Date_setFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 36eb85b..6a7e830 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1017,6 +1017,8 @@ date.setUTCHours(20); ok(date.getUTCHours() === 20, "date.getUTCHours() = " + date.getUTCHours()); date.setUTCDate(32); ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); +date.setUTCMonth(22, 37); +ok(date.getTime() === 60987050010, "date.getTime() = " + date.getTime()); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Piotr Caban : jscript: Added Date_setDate and Date_setUTCDate implementation.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 233ded05b7bcf3a5176e0403e8d14be96974f761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233ded05b7bcf3a5176e0403e… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jun 22 20:41:50 2009 +0200 jscript: Added Date_setDate and Date_setUTCDate implementation. --- dlls/jscript/date.c | 80 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 16 ++++---- 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 4c377eb..89ec7b2 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -98,6 +98,18 @@ static inline DOUBLE day(DOUBLE time) return floor(time / MS_PER_DAY); } +/* ECMA-262 3rd Edition 15.9.1.2 */ +static inline DOUBLE time_within_day(DOUBLE time) +{ + DOUBLE ret; + + ret = fmod(time, MS_PER_DAY); + if(ret < 0) + ret += MS_PER_DAY; + + return ret; +} + /* ECMA-262 3rd Edition 15.9.1.3 */ static inline DOUBLE days_in_year(DOUBLE year) { @@ -1289,16 +1301,76 @@ static HRESULT Date_setUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPP static HRESULT Date_setDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + 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; + + date = (DateInstance*)dispex; + t = local_time(date->time, date); + t = make_date(make_day(year_from_time(t), month_from_time(t), + num_val(&v)), time_within_day(t)); + date->time = time_clip(utc(t, date)); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.37 */ static HRESULT Date_setUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + 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; + + date = (DateInstance*)dispex; + t = date->time; + t = make_date(make_day(year_from_time(t), month_from_time(t), + num_val(&v)), time_within_day(t)); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } static HRESULT Date_setMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a865e9f..36eb85b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1001,22 +1001,22 @@ ok(isNaN(date.getUTCMilliseconds()), "date.getUTCMilliseconds() is not NaN"); ok(isNaN(date.setMilliseconds(0)), "date.setMilliseconds() is not NaN"); date.setTime(0); -date.setMilliseconds(-10, 2); +date.setUTCMilliseconds(-10, 2); ok(date.getUTCMilliseconds() === 990, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); date.setUTCMilliseconds(10); ok(date.getUTCMilliseconds() === 10, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); -date.setSeconds(-10); +date.setUTCSeconds(-10); ok(date.getUTCSeconds() === 50, "date.getUTCSeconds() = " + date.getUTCSeconds()); -ok(date.setSeconds(10) === date.setUTCSeconds(10), "date.setUTCSeconds(10) !== date.setUTCSeconds(10)"); -date.setMinutes(-10); +date.setUTCMinutes(-10); ok(date.getUTCMinutes() === 50, "date.getUTCMinutes() = " + date.getUTCMinutes()); -ok(date.setMinutes(10) === date.setUTCMinutes(10), "date.setUTCMinutes(10) !== date.setUTCMinutes(10)"); date.setUTCHours(-10); ok(date.getUTCHours() === 14, "date.getUTCHours() = " + date.getUTCHours()); date.setUTCHours(-123); -ok(date.getTime() === -614989990, "date.getTime() = " + date.getTime()); -date.setHours(20); -ok(date.getHours() === 20, "date.getHours() = " + date.getHours()); +ok(date.getTime() === -612549990, "date.getTime() = " + date.getTime()); +date.setUTCHours(20); +ok(date.getUTCHours() === 20, "date.getUTCHours() = " + date.getUTCHours()); +date.setUTCDate(32); +ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Piotr Caban : jscript: Fix Date_setHours implementation.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: e19ca2b9467730204fccfa2d8e03d0172ccce269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19ca2b9467730204fccfa2d8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jun 22 20:41:40 2009 +0200 jscript: Fix Date_setHours implementation. --- dlls/jscript/date.c | 69 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 09944c2..4c377eb 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1166,6 +1166,7 @@ static HRESULT Date_setHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA VARIANT v; HRESULT hres; DateInstance *date; + DOUBLE t, hour, min, sec, ms; TRACE("\n"); @@ -1180,14 +1181,40 @@ static HRESULT Date_setHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } + date = (DateInstance*)dispex; + t = local_time(date->time, date); + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) return hres; + hour = num_val(&v); - date = (DateInstance*)dispex; - date->time = time_clip(date->time - - (hour_from_time(date->time - date->bias*MS_PER_MINUTE) - - num_val(&v))*MS_PER_HOUR); + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + min = num_val(&v); + } + else min = min_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + sec = num_val(&v); + } + else sec = sec_from_time(t); + + if(arg_cnt(dp) > 3) { + hres = to_number(dispex->ctx, get_arg(dp, 3), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour, min, sec, ms)); + date->time = time_clip(utc(t, date)); if(retv) num_set_val(retv, date->time); @@ -1202,6 +1229,7 @@ static HRESULT Date_setUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPP VARIANT v; HRESULT hres; DateInstance *date; + DOUBLE t, hour, min, sec, ms; TRACE("\n"); @@ -1216,13 +1244,40 @@ static HRESULT Date_setUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } + date = (DateInstance*)dispex; + t = date->time; + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) return hres; + hour = num_val(&v); - date = (DateInstance*)dispex; - date->time = time_clip(date->time - - (hour_from_time(date->time) - num_val(&v))*MS_PER_HOUR); + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + min = num_val(&v); + } + else min = min_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + sec = num_val(&v); + } + else sec = sec_from_time(t); + + if(arg_cnt(dp) > 3) { + hres = to_number(dispex->ctx, get_arg(dp, 3), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour, min, sec, ms)); + date->time = time_clip(t); if(retv) num_set_val(retv, date->time);

1 0

Piotr Caban : jscript: Fix Date_setMinutes implementation.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: ece2654ef98711daaf8760e05555f2181789aad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece2654ef98711daaf8760e05… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jun 22 20:41:28 2009 +0200 jscript: Fix Date_setMinutes implementation. --- dlls/jscript/date.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 70c9db6..09944c2 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1054,6 +1054,7 @@ static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA VARIANT v; HRESULT hres; DateInstance *date; + DOUBLE t, min, sec, ms; TRACE("\n"); @@ -1068,12 +1069,33 @@ static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA return S_OK; } + date = (DateInstance*)dispex; + t = local_time(date->time, date); + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) return hres; + min = num_val(&v); - date = (DateInstance*)dispex; - date->time = time_clip(date->time - (min_from_time(date->time) - num_val(&v))*MS_PER_MINUTE); + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + sec = num_val(&v); + } + else sec = sec_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour_from_time(t), + min, sec, ms)); + date->time = time_clip(utc(t, date)); if(retv) num_set_val(retv, date->time); @@ -1085,7 +1107,56 @@ static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA static HRESULT Date_setUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - return Date_setMinutes(dispex, lcid, flags, dp, retv, ei, caller); + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, min, sec, ms; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = date->time; + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + min = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + sec = num_val(&v); + } + else sec = sec_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour_from_time(t), + min, sec, ms)); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.35 */

1 0

Piotr Caban : jscript: Fix Date_setSeconds implementation.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: bbfab68bb84a63dc9cc69d3b996e11d40a96f4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfab68bb84a63dc9cc69d3b9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jun 22 20:41:11 2009 +0200 jscript: Fix Date_setSeconds implementation. --- dlls/jscript/date.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index ab279c0..70c9db6 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -958,6 +958,7 @@ static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA VARIANT v; HRESULT hres; DateInstance *date; + DOUBLE t, sec, ms; TRACE("\n"); @@ -972,12 +973,25 @@ static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA return S_OK; } + date = (DateInstance*)dispex; + t = local_time(date->time, date); + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) return hres; + sec = num_val(&v); - date = (DateInstance*)dispex; - date->time = time_clip(date->time - (sec_from_time(date->time) - num_val(&v))*1000.0); + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour_from_time(t), + min_from_time(t), sec, ms)); + date->time = time_clip(utc(t, date)); if(retv) num_set_val(retv, date->time); @@ -989,7 +1003,48 @@ static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA static HRESULT Date_setUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - return Date_setSeconds(dispex, lcid, flags, dp, retv, ei, caller); + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, sec, ms; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = date->time; + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + sec = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour_from_time(t), + min_from_time(t), sec, ms)); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.33 */

1 0

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 June 2009