October 2010 - Wine-Commits

Jeremy Newman : adding he
by Jeremy Newman Oct. 15, 2010

Oct. 15, 2010

Module: website Branch: master Commit: 7dcdc3fe5e4a28291414b9942b24da4f9415e090 URL: http://source.winehq.org/git/website.git/?a=commit;h=7dcdc3fe5e4a28291414b9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 15 09:33:35 2010 -0500 adding he --- include/winehq.conf.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index e46fc4d..1e1d6af 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -22,7 +22,7 @@ theme: winehq lang: en # available languages -(a)languages: en, de, es, fr, pl, pt +(a)languages: en, de, es, fr, he, pl, pt # default base URLS (if you run the site, in a subdir, set base_root) base_root:

1 0

Jeremy Newman : adding he to languages array
by Jeremy Newman Oct. 15, 2010

Oct. 15, 2010

Module: website Branch: master Commit: 6f11f1577987817638e1f95b55d195d64fa1e83d URL: http://source.winehq.org/git/website.git/?a=commit;h=6f11f1577987817638e1f9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 15 09:33:18 2010 -0500 adding he to languages array --- include/data.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/data.php b/include/data.php index c9a656b..fa78002 100644 --- a/include/data.php +++ b/include/data.php @@ -61,6 +61,10 @@ class data 'name' => 'Français', 'change' => 'Changez la langue' ), + 'he' => array( + 'name' => 'עברית', + 'change' => 'שנה שפה' + ), 'pl' => array( 'name' => 'Polski', 'change' => 'Zmień język'

1 0

Yaron Shahrabani : Foundation of the Hebrew website
by Jeremy Newman Oct. 15, 2010

Oct. 15, 2010

Module: website Branch: master Commit: 794972a9e998d9cd4aa1a7fd27e572c3ff227926 URL: http://source.winehq.org/git/website.git/?a=commit;h=794972a9e998d9cd4aa1a7… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Mon Oct 11 18:28:16 2010 +0200 Foundation of the Hebrew website --001636833e9643c2d2049259dadf Content-Type: text/plain; charset=UTF-8 Started some translation work, there is still much more RTLing work to do so we will settle for an LTR for now and I will handle it soon. Yaron Shahrabani <Hebrew translator> <div dir="ltr">Started some translation work, there is still much more RTLing work to do so we will settle for an LTR for now and I will handle it soon.<br clear="all"><div dir="ltr"><span style="font-size:large"><font color="#990000">Yaron</font><font color="#330000"> Shahrabani</font></span><blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <div><font color="#666666"><span style="font-size:x-small"><font color="#FF0000"><</font></span>Hebrew translator<span style="font-size:x-small"><font color="#FF0000">></font></span></font></div></blockquote></div> <br> </div> >From b9d6c6898e14f5c1869df835e01d7d00af379de6 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Mon, 11 Oct 2010 18:25:31 +0200 Subject: Hebrew website foundations --- templates/he/.cvsignore | 2 + templates/he/about.template | 27 + templates/he/acknowledgement.template | 195 ++++ templates/he/announce.template | 7 + templates/he/contributing.template | 333 +++++++ templates/he/cvs.template | 21 + templates/he/devel.template | 163 +++ templates/he/developer-cheatsheet.template | 569 +++++++++++ templates/he/documentation.template | 84 ++ templates/he/download.template | 192 ++++ templates/he/download/deb.template | 60 ++ templates/he/download/deblenny.template | 45 + templates/he/forums.template | 132 +++ templates/he/global/404.template | 18 + templates/he/global/themes/winehq/content.template | 82 ++ .../he/global/themes/winehq/content_nobox.template | 78 ++ .../he/global/themes/winehq/content_print.template | 19 + templates/he/help.template | 104 ++ templates/he/history.template | 260 +++++ templates/he/home.template | 105 ++ templates/he/interview.template | 8 + templates/he/irc.template | 19 + templates/he/lang.template | 37 + templates/he/license.template | 584 +++++++++++ templates/he/myths.template | 270 +++++ templates/he/news.template | 16 + templates/he/news_row.template | 5 + templates/he/resources.template | 131 +++ templates/he/search.template | 26 + templates/he/status.template | 132 +++ templates/he/status/changelog.template | 46 + templates/he/status/directx.template | 317 ++++++ templates/he/status/dlls.template | 918 +++++++++++++++++ templates/he/status/multimedia.template | 257 +++++ templates/he/status/porting.template | 1044 ++++++++++++++++++++ templates/he/status/todo.template | 287 ++++++ templates/he/status/ui.template | 493 +++++++++ templates/he/status/wine.template | 624 ++++++++++++ templates/he/why.template | 174 ++++ templates/he/wineconf.template | 68 ++ templates/he/wineconf/media.template | 33 + templates/he/wineconf/rsvp.template | 14 + templates/he/wineconf/rsvp_done.template | 5 + templates/he/wineconf/rsvp_form.template | 30 + templates/he/wineconf/survey.template | 14 + templates/he/wineconf/survey_done.template | 5 + templates/he/wineconf/survey_form.template | 103 ++ templates/he/wineconf/travel.template | 134 +++ templates/he/winelib.template | 450 +++++++++ templates/he/wwn.template | 9 + templates/he/wwn_content.template | 24 + templates/he/wwn_interview.template | 13 + 52 files changed, 8786 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=794972a9e998d9cd4a…

1 0

Matteo Bruni : d3dcompiler: Accept dot terminated float immediate values.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 7c47a9d1927b40978d753f598f931b9455d1e9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c47a9d1927b40978d753f598… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 13 22:27:14 2010 +0200 d3dcompiler: Accept dot terminated float immediate values. --- dlls/d3dcompiler_43/asmshader.l | 2 +- dlls/d3dcompiler_43/tests/asm.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.l b/dlls/d3dcompiler_43/asmshader.l index 0ba7e7a..5817344 100644 --- a/dlls/d3dcompiler_43/asmshader.l +++ b/dlls/d3dcompiler_43/asmshader.l @@ -98,7 +98,7 @@ NEWLINE (\n)|(\r\n) COMMA "," -IMMVAL \-?(([0-9]+)|([0-9]*\.[0-9]+))(f)? +IMMVAL \-?(([0-9]+\.?)|([0-9]*\.[0-9]+))(f)? ANY (.) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 08fff44..af5ad62 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -127,6 +127,12 @@ static void ps_1_1_test(void) { "mov_d4 r0, r1\n", {0xffff0101, 0x00000001, 0x8e0f0000, 0x80e40001, 0x0000ffff} }, + { /* shader 2 */ + "ps.1.1\n" + "def c2, 0, 0., 0, 0.\n", + {0xffff0101, 0x00000051, 0xa00f0002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0000ffff} + }, }; exec_tests("ps_1_1", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Matteo Bruni : d3dcompiler: Don' t store instruction length in DEF opcode in PS 1.x.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 422d57e2fc458e9ed5eb7e978459f52a37f53569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422d57e2fc458e9ed5eb7e978… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 13 22:19:03 2010 +0200 d3dcompiler: Don't store instruction length in DEF opcode in PS 1.x. --- dlls/d3dcompiler_43/bytecodewriter.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 5b22580..5ff1e2f 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -598,7 +598,7 @@ static void ps_1_x_header(struct bc_writer *This, const struct bwriter_shader *s /* Declare the shader type and version */ put_dword(buffer, This->version); - write_constF(shader, buffer, TRUE); + write_constF(shader, buffer, FALSE); } static void ps_1_4_header(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer) { @@ -619,7 +619,7 @@ static void ps_1_4_header(struct bc_writer *This, const struct bwriter_shader *s /* Declare the shader type and version */ put_dword(buffer, This->version); - write_constF(shader, buffer, TRUE); + write_constF(shader, buffer, FALSE); } static void end(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer) {

1 0

Aric Stewart : strmbase: Remove non-standard custom allocator logic from strmbase.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 60bf76db9aab827a17ec3692aacf58434f19b454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60bf76db9aab827a17ec3692a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 13 11:02:14 2010 -0500 strmbase: Remove non-standard custom allocator logic from strmbase. Implement function overrides for parser.c where a custom allocator was needed. --- dlls/qcap/vfwcapture.c | 4 ++- dlls/quartz/filesource.c | 4 ++- dlls/quartz/parser.c | 46 +++++++++++++++++++++++++++++++++++++--- dlls/quartz/parser.h | 3 ++ dlls/strmbase/pin.c | 51 ++++++++++++-------------------------------- dlls/strmbase/transform.c | 4 ++- include/wine/strmbase.h | 11 +++++---- 7 files changed, 74 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60bf76db9aab827a17ec3…

1 0

Henri Verbeet : d3d10core: Rename texture2d.c to texture.c.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 81c3f289a3c8768c9b98e859fc5749fc75538e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c3f289a3c8768c9b98e859f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:04:00 2010 +0200 d3d10core: Rename texture2d.c to texture.c. --- dlls/d3d10core/Makefile.in | 2 +- dlls/d3d10core/{texture2d.c => texture.c} | 0 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index 8a7239c..4557741 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -10,7 +10,7 @@ C_SRCS = \ inputlayout.c \ shader.c \ state.c \ - texture2d.c \ + texture.c \ utils.c \ view.c diff --git a/dlls/d3d10core/texture2d.c b/dlls/d3d10core/texture.c similarity index 100% rename from dlls/d3d10core/texture2d.c rename to dlls/d3d10core/texture.c

1 0

Henri Verbeet : wined3d: Recognize the SM4 sample_d opcode.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 4eb8fd79602039c2c2d7eed05dbbf734ea1f5239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb8fd79602039c2c2d7eed05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:03:58 2010 +0200 wined3d: Recognize the SM4 sample_d opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a34b506..2f70a57 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5000,6 +5000,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, + /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index facb686..fb7d02e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5058,6 +5058,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_RSQ */ shader_glsl_rsq, /* WINED3DSIH_SAMPLE */ NULL, + /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2e57e9f..e3451a5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -104,6 +104,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_RET */ "ret", /* WINED3DSIH_RSQ */ "rsq", /* WINED3DSIH_SAMPLE */ "sample", + /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", /* WINED3DSIH_SAMPLE_LOD */ "sample_l", /* WINED3DSIH_SETP */ "setp", /* WINED3DSIH_SGE */ "sge", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 47cece3..ef7af43 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -86,6 +86,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_SAMPLE = 0x45, WINED3D_SM4_OP_SAMPLE_LOD = 0x48, + WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UTOF = 0x56, }; @@ -165,6 +166,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, 1, 3}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, 1, 4}, + {WINED3D_SM4_OP_SAMPLE_GRAD,WINED3DSIH_SAMPLE_GRAD, 1, 5}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c648bd9..fc1fd08 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -473,6 +473,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_RET, WINED3DSIH_RSQ, WINED3DSIH_SAMPLE, + WINED3DSIH_SAMPLE_GRAD, WINED3DSIH_SAMPLE_LOD, WINED3DSIH_SETP, WINED3DSIH_SGE,

1 0

Jacek Caban : jscript: Don't lookup global variables on function invocation .
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 35968b97551f577d903a872163f3d1ea8f0abbb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35968b97551f577d903a87216… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 14 15:21:13 2010 +0200 jscript: Don't lookup global variables on function invocation. --- dlls/jscript/engine.c | 17 +++++++---------- dlls/jscript/engine.h | 11 +++-------- dlls/jscript/function.c | 4 ++-- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- dlls/jscript/tests/run.c | 6 ++++++ 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8e43f70..55ac3a6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -179,7 +179,7 @@ void scope_release(scope_chain_t *scope) } HRESULT create_exec_ctx(script_ctx_t *script_ctx, IDispatch *this_obj, jsdisp_t *var_disp, - scope_chain_t *scope, exec_ctx_t **ret) + scope_chain_t *scope, BOOL is_global, exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -188,6 +188,7 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, IDispatch *this_obj, jsdisp_t return E_OUTOFMEMORY; ctx->ref = 1; + ctx->is_global = is_global; if(this_obj) ctx->this_obj = this_obj; @@ -410,7 +411,7 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } -HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, exec_type_t exec_type, +HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, BOOL from_eval, jsexcept_t *ei, VARIANT *retv) { script_ctx_t *script = parser->script; @@ -447,7 +448,7 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so if(!name) return E_OUTOFMEMORY; - if(!lookup_global_members(parser->script, name, NULL)) + if(!ctx->is_global || !lookup_global_members(parser->script, name, NULL)) hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); SysFreeString(name); if(FAILED(hres)) @@ -489,14 +490,10 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so return hres; } - if(retv && (exec_type == EXECT_EVAL || rt.type == RT_RETURN)) - *retv = val; - else { - if (retv) { - VariantInit(retv); - } + if(!retv || (!from_eval && rt.type != RT_RETURN)) VariantClear(&val); - } + if(retv) + *retv = val; return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 1e7b041..c1997a1 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -102,6 +102,7 @@ struct _exec_ctx_t { scope_chain_t *scope_chain; jsdisp_t *var_disp; IDispatch *this_obj; + BOOL is_global; }; static inline void exec_addref(exec_ctx_t *ctx) @@ -109,15 +110,9 @@ static inline void exec_addref(exec_ctx_t *ctx) ctx->ref++; } -typedef enum { - EXECT_PROGRAM, - EXECT_FUNCTION, - EXECT_EVAL -} exec_type_t; - void exec_release(exec_ctx_t*); -HRESULT create_exec_ctx(script_ctx_t*,IDispatch*,jsdisp_t*,scope_chain_t*,exec_ctx_t**); -HRESULT exec_source(exec_ctx_t*,parser_ctx_t*,source_elements_t*,exec_type_t,jsexcept_t*,VARIANT*); +HRESULT create_exec_ctx(script_ctx_t*,IDispatch*,jsdisp_t*,scope_chain_t*,BOOL,exec_ctx_t**); +HRESULT exec_source(exec_ctx_t*,parser_ctx_t*,source_elements_t*,BOOL,jsexcept_t*,VARIANT*); typedef struct _statement_t statement_t; typedef struct _expression_t expression_t; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 2bcc918..0fd6cff 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -209,7 +209,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = scope_push(function->scope_chain, var_disp, &scope); if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, this_obj, var_disp, scope, &exec_ctx); + hres = create_exec_ctx(ctx, this_obj, var_disp, scope, FALSE, &exec_ctx); scope_release(scope); } jsdisp_release(var_disp); @@ -218,7 +218,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->parser, function->source, EXECT_FUNCTION, ei, retv); + hres = exec_source(exec_ctx, function->parser, function->source, FALSE, ei, retv); function->arguments = prev_args; jsdisp_release(arg_disp); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 21d9201..8655d8a 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -371,7 +371,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS return throw_syntax_error(ctx, ei, hres, NULL); } - hres = exec_source(ctx->exec_ctx, parser_ctx, parser_ctx->source, EXECT_EVAL, ei, retv); + hres = exec_source(ctx->exec_ctx, parser_ctx, parser_ctx->source, TRUE, ei, retv); parser_release(parser_ctx); return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 079db3d..ab56696 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -97,14 +97,14 @@ static HRESULT exec_global_code(JScript *This, parser_ctx_t *parser_ctx) jsexcept_t jsexcept; HRESULT hres; - hres = create_exec_ctx(This->ctx, NULL, This->ctx->global, NULL, &exec_ctx); + hres = create_exec_ctx(This->ctx, NULL, This->ctx->global, NULL, TRUE, &exec_ctx); if(FAILED(hres)) return hres; IActiveScriptSite_OnEnterScript(This->site); memset(&jsexcept, 0, sizeof(jsexcept)); - hres = exec_source(exec_ctx, parser_ctx, parser_ctx->source, EXECT_PROGRAM, &jsexcept, NULL); + hres = exec_source(exec_ctx, parser_ctx, parser_ctx->source, FALSE, &jsexcept, NULL); VariantClear(&jsexcept.var); exec_release(exec_ctx); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 5efdcfb..de4d872 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1214,11 +1214,17 @@ static void run_tests(void) parse_script_a("var testPropGet"); CHECK_CALLED(global_propget_d); + SET_EXPECT(global_propget_d); + parse_script_a("eval('var testPropGet;');"); + CHECK_CALLED(global_propget_d); + SET_EXPECT(global_notexists_d); parse_script_a("var notExists; notExists = 1;"); CHECK_CALLED(global_notexists_d); parse_script_a("function f() { var testPropGet; }"); + parse_script_a("(function () { var testPropGet; })();"); + parse_script_a("(function () { eval('var testPropGet;'); })();"); parse_script_a("ok((testObj instanceof Object) === false, 'testObj is instance of Object');");

1 0

Hans Leidekker : msi/tests: Move test coverage for standard actions to a separate module.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 8db3c0e358c54e0ebc3f7b4b7461296d046029e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db3c0e358c54e0ebc3f7b4b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 14 11:06:13 2010 +0200 msi/tests: Move test coverage for standard actions to a separate module. --- dlls/msi/tests/Makefile.in | 1 + dlls/msi/tests/action.c | 5846 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 4810 ------------------------------------ 3 files changed, 5847 insertions(+), 4810 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8db3c0e358c54e0ebc3f7…

1 0