June 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Add a function to control use of NV_vp2 clipplanes.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: e64d48371fcacce83fb0c95b3179b00a81d2ad06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64d48371fcacce83fb0c95b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 22 22:23:28 2009 +0200 wined3d: Add a function to control use of NV_vp2 clipplanes. I find it helpful for debugging to have this controlled at a central place, without having to disable the entire GL extension or manually find all the places where GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION) controls clipplane use. It is useful for debugging the emulation code on NV cards and for debugging mac driver issues. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0e6b307..f0bedd9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -72,6 +72,12 @@ static inline BOOL ffp_clip_emul(IWineD3DStateBlockImpl *stateblock) return stateblock->lowest_disabled_stage < 7; } +/* Returns TRUE if result.clip from GL_NV_vertex_program2 should be used and FALSE otherwise */ +static inline BOOL use_nv_clip(const WineD3D_GL_Info *gl_info) +{ + return GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); +} + /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, * so upload them above that */ @@ -3502,7 +3508,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); - if(priv_ctx.target_version >= NV2) + if(use_nv_clip(gl_info) && priv_ctx.target_version >= NV2) { for(i = 0; i < num_clipplanes; i++) { @@ -3781,7 +3787,14 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW else { args->ps_signature = ~0; - args->boolclip.clip_control[0] = ffp_clip_emul(stateblock) ? GL_LIMITS(texture_stages) : 0; + if(dev->vs_clipping) + { + args->boolclip.clip_control[0] = 0; + } + else + { + args->boolclip.clip_control[0] = ffp_clip_emul(stateblock) ? GL_LIMITS(texture_stages) : 0; + } } if(args->boolclip.clip_control[0]) @@ -3809,7 +3822,7 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW /* Skip if unused or local */ int_skip = ~shader->baseShader.reg_maps.integer_constants | shader->baseShader.reg_maps.local_int_consts; - if(int_skip == 0xffff || GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) + if(int_skip == 0xffff || GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) /* This is about flow control, not clipping */ { memset(&args->loop_ctrl, 0, sizeof(args->loop_ctrl)); return; @@ -4164,7 +4177,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g pCaps->MaxPixelShaderConst = GL_LIMITS(pshader_constantsF); } - pCaps->VSClipping = GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); + pCaps->VSClipping = use_nv_clip(gl_info); } static BOOL shader_arb_color_fixup_supported(struct color_fixup_desc fixup)

1 0

Stefan Dösinger : wined3d: Find the clip texcoord before compiling.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 7ffd10da2850eada5634949ed2331cf2556ff33c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffd10da2850eada5634949ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 22 22:24:19 2009 +0200 wined3d: Find the clip texcoord before compiling. The best is to put this together with the rest of the shader_arb_priv initialization. --- dlls/wined3d/arb_program_shader.c | 93 +++++++++++++++++++------------------ 1 files changed, 47 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f0bedd9..bb53455 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3592,6 +3592,42 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, return ret; } +static void find_clip_texcoord(IWineD3DPixelShaderImpl *ps) +{ + struct arb_pshader_private *shader_priv = ps->backend_priv; + int i; + const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)ps->baseShader.device)->adapter->gl_info; + + /* See if we can use fragment.texcoord[7] for clipplane emulation + * + * Don't do this if it is not supported, or fragment.texcoord[7] is used + */ + if(ps->baseShader.reg_maps.shader_version.major < 3) + { + for(i = GL_LIMITS(texture_stages); i > 0; i--) + { + if(!ps->baseShader.reg_maps.texcoord[i - 1]) + { + shader_priv->clipplane_emulation = i; + return; + } + } + WARN("Did not find a free clip reg(2.0)\n"); + } + else + { + for(i = GL_LIMITS(texture_stages); i > 0; i--) + { + if(!(ps->baseShader.reg_maps.input_registers & (1 << (i - 1)))) + { + shader_priv->clipplane_emulation = i; + return; + } + } + WARN("Did not find a free clip reg(3.0)\n"); + } +} + /* GL locking is done by the caller */ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl *shader, const struct arb_ps_compile_args *args) { @@ -3603,9 +3639,20 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * GLuint ret; if(!shader->backend_priv) { + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) shader->baseShader.device; + struct shader_arb_priv *priv = device->shader_priv; + shader->backend_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*shader_data)); shader_data = shader->backend_priv; shader_data->clamp_consts = shader->baseShader.reg_maps.shader_version.major == 1; + + if(shader->baseShader.reg_maps.shader_version.major < 3) shader_data->input_signature_idx = ~0; + else shader_data->input_signature_idx = find_input_signature(priv, shader->input_signature); + + shader_data->has_signature_idx = TRUE; + TRACE("Shader got assigned input signature index %u\n", shader_data->input_signature_idx); + + if(!device->vs_clipping) find_clip_texcoord(shader); } shader_data = shader->backend_priv; @@ -3845,39 +3892,6 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW } } -static void find_clip_texcoord(IWineD3DPixelShaderImpl *ps, const WineD3D_GL_Info *gl_info) -{ - struct arb_pshader_private *shader_priv = ps->backend_priv; - int i; - - /* See if we can use fragment.texcoord[7] for clipplane emulation - * - * Don't do this if it is not supported, or fragment.texcoord[7] is used - */ - if(ps->baseShader.reg_maps.shader_version.major < 3) - { - for(i = GL_LIMITS(texture_stages); i > 0; i--) - { - if(!ps->baseShader.reg_maps.texcoord[i - 1]) - { - shader_priv->clipplane_emulation = i; - break; - } - } - } - else - { - for(i = GL_LIMITS(texture_stages); i > 0; i--) - { - if(!(ps->baseShader.reg_maps.input_registers & (1 << (i - 1)))) - { - shader_priv->clipplane_emulation = i; - break; - } - } - } -} - /* GL locking is done by the caller */ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -3889,7 +3903,6 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { if (usePS) { struct arb_ps_compile_args compile_args; struct arb_ps_compiled_shader *compiled; - struct arb_pshader_private *shader_priv; IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) This->stateBlock->pixelShader; TRACE("Using pixel shader %p\n", This->stateBlock->pixelShader); @@ -3898,18 +3911,6 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled; - shader_priv = ps->backend_priv; - if(!shader_priv->has_signature_idx) - { - if(ps->baseShader.reg_maps.shader_version.major < 3) shader_priv->input_signature_idx = ~0; - else shader_priv->input_signature_idx = find_input_signature(priv, ps->input_signature); - - shader_priv->has_signature_idx = TRUE; - TRACE("Shader got assigned input signature index %u\n", shader_priv->input_signature_idx); - - if(!This->vs_clipping) find_clip_texcoord(ps, gl_info); - } - /* Bind the fragment program */ GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id);");

1 0

Stefan Dösinger : wined3d: Use a local parameter for the position fixup.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 444b7ac7e56672be2951cd09173eb673a4c2c127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444b7ac7e56672be2951cd091… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 22 16:35:05 2009 +0200 wined3d: Use a local parameter for the position fixup. I don't like that I have to do this because the posFixup is in all vertex programs, so its at the same position and could be loaded globally. Unfortunately, there are only 256 env parameters usually, which makes it impossible for any shader to use c256, even if it does not use indirect addressing, and so we can't claim 256 constant support. --- dlls/wined3d/arb_program_shader.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bb53455..3e28f3e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -158,6 +158,7 @@ struct arb_vs_compiled_shader GLuint prgId; UINT int_consts[MAX_CONST_I]; char num_int_consts; + UINT pos_fixup; }; struct recorded_instruction @@ -419,14 +420,16 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl) { IWineD3DStateBlockImpl* stateBlock; - const WineD3D_GL_Info *gl_info; + const WineD3D_GL_Info *gl_info = &deviceImpl->adapter->gl_info; unsigned char i; struct shader_arb_priv *priv = deviceImpl->shader_priv; const struct arb_vs_compiled_shader *gl_shader = priv->compiled_vprog; + /* Upload the position fixup */ + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->pos_fixup, deviceImpl->posFixup)); + if(gl_shader->num_int_consts == 0) return; - gl_info = &deviceImpl->adapter->gl_info; stateBlock = deviceImpl->stateBlock; for(i = 0; i < MAX_CONST_I; i++) @@ -471,9 +474,6 @@ static void shader_arb_load_constants( stateBlock->vertexShaderConstantF, deviceImpl->activeContext->vshader_const_dirty); - /* Upload the position fixup */ - GL_EXTCALL(glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, ARB_SHADER_PRIVCONST_POS, deviceImpl->posFixup)); - shader_arb_vs_local_constants(deviceImpl); } @@ -581,7 +581,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s { if(ctx->target_version >= NV2) *num_clipplanes = GL_LIMITS(clipplanes); else *num_clipplanes = min(GL_LIMITS(clipplanes), 4); - max_constantsF = GL_LIMITS(vshader_constantsF) - 1; + max_constantsF = GL_LIMITS(vshader_constantsF); } } @@ -3455,7 +3455,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, } /* We need a constant to fixup the final position */ - shader_addline(buffer, "PARAM posFixup = program.env[%d];\n", ARB_SHADER_PRIVCONST_POS); + shader_addline(buffer, "PARAM posFixup = program.local[%u];\n", next_local); + compiled->pos_fixup = next_local++; /* Initialize output parameters. GL_ARB_vertex_program does not require special initialization values * for output parameters. D3D in theory does not do that either, but some applications depend on a @@ -4154,7 +4155,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); } - pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF) - 1; + pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF); } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) {

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

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_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: 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: 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_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

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